ConfigLMM 0.3.0 → 0.5.0

data/Plugins/Apps/OpenTelemetry/OpenTelemetry.lmm.rb

@@ -0,0 +1,154 @@
+require 'yaml'
+require 'uri'
+require 'addressable/idna'
+
+module ConfigLMM
+    module LMM
+        class OpenTelemetry < Framework::Plugin
+
+            PACKAGE_NAME = 'otelcol-contrib'
+            SERVICE_NAME = :'otelcol-contrib'
+
+            def actionOtelCollectorDeploy(id, target, activeState, context, options)
+                self.withConnection(target['Location'], target) do |connection|
+                    Linux.withConnection(connection) do |linuxConnection|
+                        linuxConnection.ensurePackage(PACKAGE_NAME, options)
+                        linuxConnection.ensureServiceAutoStart(SERVICE_NAME, options)
+
+                        linuxConnection.createDirs(options, '/var/lib/otelcol/file_storage')
+                        linuxConnection.setUserGroup('/var/lib/otelcol/file_storage', 'otelcol-contrib', 'otelcol-contrib', options)
+                        linuxConnection.exec("usermod -a -G systemd-journal otelcol-contrib", false, options)
+
+                        config = YAML.load_file(__dir__ + '/Config/config.yaml')
+                        configureEnvironment(config, target['Environment'])
+                        configureServices(config, target['Services'], linuxConnection, options)
+                        configureReceivers(config, target['Receivers'])
+                        configureProcessors(config, target['Processors'])
+                        configureExporters(config, target['Exporters'])
+                        configFile = options['output'] + '/config.yaml'
+                        File.write(configFile, config.to_yaml)
+
+                        linuxConnection.upload(configFile, '/etc/otelcol-contrib/', options)
+
+                        linuxConnection.restartService(SERVICE_NAME, options)
+                    end
+                end
+            end
+
+            def cleanup(configs, state, context, options)
+                cleanupType(:OtelCollector, configs, state, context, options) do |item, id, state, context, options, connection|
+                    Linux.withConnection(connection) do |linuxConnection|
+
+                      linuxConnection.stopService(SERVICE_NAME, options)
+                      linuxConnection.disableService(SERVICE_NAME, options)
+                      linuxConnection.removePackage(PACKAGE_NAME, options)
+
+                        state.item(id)['Status'] = State::STATUS_DELETED unless options[:dry]
+
+                        if options[:destroy]
+                            linuxConnection.rm('/etc/otelcol-contrib', options[:dry])
+                            state.item(id)['Status'] = State::STATUS_DESTROYED unless options[:dry]
+                        end
+                    end
+                end
+            end
+
+            private
+
+            def configureEnvironment(config, environment)
+                return unless environment
+                environmentNameAttr = config['processors']['resource']['attributes'].find { |attrs| attrs['key'] == 'deployment.environment.name' }
+                environmentNameAttr['value'] = environment
+                # This is deprecated but SigNoz still uses it
+                environmentNameAttr = config['processors']['resource']['attributes'].find { |attrs| attrs['key'] == 'deployment.environment' }
+                environmentNameAttr['value'] = environment
+            end
+
+            def configureServices(config, services, linuxConnection, options)
+                services.to_h.each do |name, settings|
+                    if name == 'nginx'
+                        linuxConnection.exec("usermod -a -G nginx otelcol-contrib", false, options)
+                        receiverName = 'filelog/nginx'
+                        config['receivers'][receiverName] = config['receiverTemplate'][receiverName]
+                        config['service']['pipelines']['logs']['receivers'] << receiverName
+                    elsif name == 'php'
+                        settings['Users'].to_a.each do |user|
+                            linuxConnection.exec("usermod -a -G #{user} otelcol-contrib", false, options)
+                        end
+                        receiverName = 'filelog/php'
+                        config['receivers'][receiverName] = config['receiverTemplate'][receiverName]
+                        config['service']['pipelines']['logs']['receivers'] << receiverName
+                        receiverName = 'filelog/php_json'
+                        config['receivers'][receiverName] = config['receiverTemplate'][receiverName]
+                        config['service']['pipelines']['logs']['receivers'] << receiverName
+                    elsif name == 'postgresql' || name == 'postgres'
+                        linuxConnection.exec("usermod -a -G postgres otelcol-contrib", false, options)
+                        receiverName = 'filelog/postgresql_json'
+                        config['receivers'][receiverName] = config['receiverTemplate'][receiverName]
+                        config['service']['pipelines']['logs']['receivers'] << receiverName
+                    end
+                end
+                config.delete('receiverTemplate')
+            end
+
+            def configureReceivers(config, receivers)
+                return unless receivers
+                config['receivers'] = self.class.mergeConfig(config['receivers'], receivers)
+                config['receivers'].each do |name, data|
+                    types = []
+                    receiverType = name.split('/').first
+                    if receiverType == 'jaeger' || receiverType == 'zipkin'
+                        types << 'traces'
+                    elsif receiverType == 'prometheus' || receiverType == 'hostmetrics'
+                        types << 'metrics'
+                    elsif receiverType == 'journald' || receiverType == 'filelog'
+                        types << 'logs'
+                    else
+                        types = ['traces', 'metrics', 'logs']
+                    end
+
+                    if types.include?('traces')
+                        config['service']['pipelines']['traces']['receivers'] << name unless config['service']['pipelines']['traces']['receivers'].include?(name)
+                    end
+                    if types.include?('metrics')
+                        config['service']['pipelines']['metrics']['receivers'] << name unless config['service']['pipelines']['metrics']['receivers'].include?(name)
+                    end
+                    if types.include?('logs')
+                        config['service']['pipelines']['logs']['receivers'] << name unless config['service']['pipelines']['logs']['receivers'].include?(name)
+                    end
+                end
+            end
+
+            def configureProcessors(config, processors)
+                return unless processors
+                config['processors'] = self.class.mergeConfig(config['processors'], processors)
+            end
+
+            def configureExporters(config, exporters)
+                return unless exporters
+                config['exporters'] = self.class.mergeConfig(config['exporters'], exporters)
+                config['exporters'].each do |name, data|
+                    types = ['traces', 'metrics', 'logs']
+                    if types.include?('traces')
+                        config['service']['pipelines']['traces']['exporters'] << name unless config['service']['pipelines']['traces']['exporters'].include?(name)
+                    end
+                    if types.include?('metrics')
+                        config['service']['pipelines']['metrics']['exporters'] << name unless config['service']['pipelines']['metrics']['exporters'].include?(name)
+                    end
+                    if types.include?('logs')
+                        config['service']['pipelines']['logs']['exporters'] << name unless config['service']['pipelines']['logs']['exporters'].include?(name)
+                    end
+                    if data['endpoint']
+                        data['endpoint'] = Addressable::IDNA.to_ascii(data['endpoint'])
+                        config['exporters'][name] = data
+                    end
+                end
+            end
+
+            def self.mergeConfig(defaultConfig, targetConfig)
+                return defaultConfig unless targetConfig
+                defaultConfig.merge(targetConfig) { |key, a_val, b_val| a_val.merge(b_val) }
+            end
+        end
+    end
+end

data/Plugins/Apps/OpenVidu/Ingress.container

@@ -0,0 +1,23 @@
+
+[Unit]
+Description=LiveKit Ingress container
+After=local-fs.target
+
+[Container]
+ContainerName=Ingress
+Image=docker.io/livekit/ingress:latest
+EnvironmentFile=/var/lib/openvidu/.config/containers/systemd/OpenVidu.env
+Network=slirp4netns:allow_host_loopback=true
+PublishPort=127.0.0.1:1935:1935
+PublishPort=127.0.0.1:8085:8085
+PublishPort=127.0.0.1:7895:7895/udp
+UserNS=keep-id:uid=1000,gid=1000
+Volume=/var/lib/openvidu/ingress.yaml:/etc/ingress.yaml
+LogDriver=journald
+AutoUpdate=registry
+
+[Service]
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target default.target

data/Plugins/Apps/{GitLab/GitLab.conf.erb → OpenVidu/OpenVidu.conf.erb}

@@ -16,11 +16,16 @@ server {
 
     server_name <%= config['Domain'] %>;
 
-    access_log  /var/log/nginx/gitlab.access.log;
-    error_log   /var/log/nginx/gitlab.error.log;
+    <% if config['CertName'] %>
+        ssl_certificate "/etc/letsencrypt/live/<%= config['CertName'] %>/fullchain.pem";
+        ssl_certificate_key "/etc/letsencrypt/live/<%= config['CertName'] %>/privkey.pem";
+        ssl_trusted_certificate "/etc/letsencrypt/live/<%= config['CertName'] %>/chain.pem";
+    <% end %>
 
+    # Proxy site
     location / {
-        proxy_pass http://127.0.0.1:18100;
+        proxy_pass http://127.0.0.1:7880;
         include config-lmm/proxy.conf;
     }
+
 }

data/Plugins/Apps/OpenVidu/OpenVidu.container

@@ -0,0 +1,21 @@
+
+[Unit]
+Description=OpenVidu container
+After=local-fs.target
+
+[Container]
+ContainerName=OpenVidu
+Image=docker.io/openvidu/openvidu-server:main
+Exec=--config /etc/livekit.yaml --bind=$BindIP
+EnvironmentFile=/var/lib/openvidu/.config/containers/systemd/OpenVidu.env
+Network=host
+UserNS=keep-id:uid=1000,gid=1000
+Volume=/var/lib/openvidu/livekit.yaml:/etc/livekit.yaml
+LogDriver=journald
+AutoUpdate=registry
+
+[Service]
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target default.target

data/Plugins/Apps/OpenVidu/OpenVidu.lmm.rb

@@ -0,0 +1,94 @@
+
+module ConfigLMM
+    module LMM
+        class OpenVidu < Framework::NginxApp
+
+            USER = 'openvidu'
+            HOME_DIR = '/var/lib/openvidu'
+            HOST_IP = '10.0.2.2'
+
+            def actionOpenViduDeploy(id, target, activeState, context, options)
+                raise Framework::PluginProcessError.new('Domain field must be set!') unless target['Domain']
+                raise Framework::PluginProcessError.new('CallDomain field must be set!') unless target['CallDomain']
+
+                if target['Location'] && target['Location'] != '@me'
+                    uri = Addressable::URI.parse(target['Location'])
+                    raise Framework::PluginProcessError.new("#{id}: Unknown Protocol: #{uri.scheme}!") if uri.scheme != 'ssh'
+
+                    self.class.sshStart(uri) do |ssh|
+
+                        distroInfo = Framework::LinuxApp.currentDistroInfo(ssh)
+                        Framework::LinuxApp.configurePodmanServiceOverSSH(USER, HOME_DIR, 'OpenVidu', distroInfo, ssh)
+
+                        secretKey = SecureRandom.alphanumeric(40)
+                        bindIp = target['BindIP']
+                        bindIp = '127.0.0.1' unless bindIp
+
+                        path = Framework::LinuxApp::SYSTEMD_CONTAINERS_PATH.gsub('~', HOME_DIR)
+                        self.class.exec("echo 'INGRESS_CONFIG_FILE=/etc/ingress.yaml' > #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'LIVEKIT_URL=wss://#{target['Domain']}' >> #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'LIVEKIT_API_KEY=Main' >> #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'LIVEKIT_API_SECRET=#{secretKey}' >> #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'CALL_PRIVATE_ACCESS=true' >> #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'CALL_USER=guest' >> #{path}/OpenVidu.env", ssh)
+                        callSecret = SecureRandom.alphanumeric(20)
+                        prompt.say("OpenVidu Call guest password: #{callSecret}", :color => :magenta)
+                        self.class.exec("echo 'CALL_SECRET=#{callSecret}' >> #{path}/OpenVidu.env", ssh)
+                        self.class.exec("echo 'CALL_ADMIN_USER=admin' >> #{path}/OpenVidu.env", ssh)
+                        callAdminSecret = SecureRandom.alphanumeric(20)
+                        prompt.say("OpenVidu Call admin password: #{callAdminSecret}", :color => :magenta)
+                        self.class.exec("echo 'CALL_ADMIN_SECRET=#{callAdminSecret}' >> #{path}/OpenVidu.env", ssh)
+
+                        ssh.scp.upload!(__dir__ + '/livekit.yaml', HOME_DIR)
+                        ssh.scp.upload!(__dir__ + '/ingress.yaml', HOME_DIR)
+
+                        self.class.exec("sed -i 's|$SECRET|#{secretKey}|'  #{HOME_DIR}/livekit.yaml", ssh)
+
+                        if target['Valkey']
+                            self.class.exec("sed -i 's|10.0.2.2|#{target['Valkey']['Host']}|'  #{HOME_DIR}/ingress.yaml", ssh) if target['Valkey']['Host']
+
+                            if target['Valkey']['SecretId']
+                                valkeyPassword = context.secrets.load(target['Valkey']['SecretId'], 'VALKEY_PASSWORD')
+                                if valkeyPassword
+                                    self.class.exec("sed -i 's|password:|password: #{valkeyPassword}|'  #{HOME_DIR}/ingress.yaml", ssh)
+                                end
+                            end
+                        end
+
+                        self.class.exec("chown #{USER}:#{USER} #{path}/OpenVidu.env #{HOME_DIR}/livekit.yaml #{HOME_DIR}/ingress.yaml", ssh)
+                        self.class.exec("chmod 600 #{path}/OpenVidu.env #{HOME_DIR}/livekit.yaml #{HOME_DIR}/ingress.yaml", ssh)
+
+                        ssh.scp.upload!(__dir__ + '/OpenVidu.container', path)
+                        ssh.scp.upload!(__dir__ + '/OpenViduCall.container', path)
+                        ssh.scp.upload!(__dir__ + '/Ingress.container', path)
+
+                        self.class.exec("sed -i 's|$BindIP|#{bindIp}|'  #{path}/OpenVidu.container", ssh)
+
+                        Framework::LinuxApp.firewallAddPortOverSSH('7881/tcp', ssh)
+                        Framework::LinuxApp.firewallAddPortOverSSH('7900-7999/udp', ssh)
+                        Framework::LinuxApp.firewallAddPortOverSSH('45000-55000/udp', ssh)
+
+                        self.class.exec("systemctl --user --machine=#{USER}@ daemon-reload", ssh)
+                        self.class.exec("systemctl --user --machine=#{USER}@ restart OpenVidu", ssh)
+                        self.class.exec("systemctl --user --machine=#{USER}@ restart OpenViduCall", ssh)
+                        self.class.exec("systemctl --user --machine=#{USER}@ restart Ingress", ssh)
+
+                        Framework::LinuxApp.ensurePackages([NGINX_PACKAGE], ssh)
+                        Framework::LinuxApp.ensureServiceAutoStartOverSSH(NGINX_PACKAGE, ssh)
+                        self.class.prepareNginxConfig(target, ssh)
+                        target['CallDomain'] = Addressable::IDNA.to_ascii(target['CallDomain'])
+                        self.writeNginxConfig(__dir__, 'OpenVidu', id, target, state, context, options)
+                        self.writeNginxConfig(__dir__, 'OpenViduCall', id, target, state, context, options)
+                        self.deployNginxConfig(id, target, activeState, context, options)
+                        Framework::LinuxApp.startServiceOverSSH(NGINX_PACKAGE, ssh)
+
+                    end
+                else
+                    # TODO
+                end
+            end
+
+        end
+    end
+end
+

data/Plugins/Apps/OpenVidu/OpenViduCall.conf.erb

@@ -0,0 +1,32 @@
+
+server {
+    <% if config['NginxVersion'] >= 1.25 %>
+        listen 443 ssl;
+        listen [::]:443 ssl;
+        http2 on;
+        http3 on;
+        quic_retry on;
+        add_header Alt-Svc 'h3=":443"; ma=86400';
+    <% else %>
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+    <% end %>
+
+    include config-lmm/ssl.conf;
+
+    server_name <%= config['CallDomain'] %>;
+
+    <% if config['CallCertName'] %>
+        ssl_certificate "/etc/letsencrypt/live/<%= config['CallCertName'] %>/fullchain.pem";
+        ssl_certificate_key "/etc/letsencrypt/live/<%= config['CallCertName'] %>/privkey.pem";
+        ssl_trusted_certificate "/etc/letsencrypt/live/<%= config['CallCertName'] %>/chain.pem";
+    <% end %>
+
+    # Proxy site
+    location / {
+        proxy_pass http://127.0.0.1:6080;
+        include config-lmm/proxy.conf;
+    }
+
+}
+

data/Plugins/Apps/OpenVidu/OpenViduCall.container

@@ -0,0 +1,20 @@
+
+
+[Unit]
+Description=OpenVidu Call container
+After=local-fs.target
+
+[Container]
+ContainerName=OpenViduCall
+Image=docker.io/openvidu/openvidu-call:main
+EnvironmentFile=/var/lib/openvidu/.config/containers/systemd/OpenVidu.env
+PublishPort=127.0.0.1:6080:6080
+UserNS=keep-id:uid=1000,gid=1000
+LogDriver=journald
+AutoUpdate=registry
+
+[Service]
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target default.target

data/Plugins/Apps/OpenVidu/ingress.yaml

@@ -0,0 +1,10 @@
+redis:
+    address: 10.0.2.2:6379
+    username: ""
+    password:
+
+cpu_cost:
+    rtmp_cpu_cost: 2
+    whip_cpu_cost: 2
+    whip_bypass_transcoding_cpu_cost: 0.1
+    url_cpu_cost: 2

data/Plugins/Apps/OpenVidu/livekit.yaml

@@ -0,0 +1,13 @@
+keys:
+    Main: $SECRET
+
+rtc:
+    tcp_port: 7881
+    port_range_start: 7900
+    port_range_end: 7999
+
+turn:
+    enabled: true
+    udp_port: 3478
+    relay_range_start: 45000
+    relay_range_end: 55000

data/Plugins/Apps/PHP-FPM/Connection.rb

@@ -0,0 +1,91 @@
+
+
+module ConfigLMM
+    module LMM
+        class PHPFPMConnection
+
+            attr_reader :connection
+
+            def initialize(connection)
+                @connection = connection
+            end
+
+            def phpConfig
+                if @connection.distroName == Linux::SUSE_NAME
+                    '/etc/php8/fpm/php.ini'
+                else
+                    '/etc/php/php.ini'
+                end
+            end
+
+            def configFileDir
+                if @connection.distroName == Linux::SUSE_NAME
+                    '/etc/php8/fpm/'
+                else
+                    '/etc/php/'
+                end
+            end
+
+            def configDir
+                if @connection.distroName == Linux::SUSE_NAME
+                    '/etc/php8/fpm/php-fpm.d/'
+                else
+                    '/etc/php/php-fpm.d/'
+                end
+            end
+
+            def webappsDir
+                if @connection.distroName == Linux::SUSE_NAME
+                    '/srv/www/htdocs/'
+                else
+                    '/usr/share/webapps/'
+                end
+            end
+
+            def enableExtension(name, options = {})
+                phpFile = self.phpConfig
+                if @connection.fileContains?(phpFile, "extension=#{name}", options)
+                    @connection.fileReplace(phpFile, "^;extension=#{name}", "extension=#{name}", options)
+                else
+                    @connection.fileReplace(phpFile, 'extension=zip', "extension=zip\\nextension=#{name}", { **options, escape: false })
+                    #self.sshExec!(ssh, "sed -i 's|extension=zip|extension=zip\\nextension=#{name}|' #{phpFile}")
+                end
+            end
+
+            def writeConfig(name, target, configLines)
+                target['PHP-FPM'] ||= {}
+
+                configLines << "[#{name}]\n"
+                configLines << "user = #{target['User']}\n"
+                configLines << "group = #{target['User']}\n"
+                if target['Listen']
+                    configLines << "listen = #{target['Listen']}\n"
+                else
+                    configLines << "listen = /run/php-fpm/#{name}.sock\n"
+                    configLines << "listen.owner = #{target['User']}\n"
+                    group = 'http'
+                    group = 'nginx' if @connection.distroName == Linux::SUSE_NAME
+                    configLines << "listen.group = #{group}\n"
+                end
+                configLines << "pm = dynamic\n"
+                configLines << "pm.max_children = 10\n"
+                configLines << "pm.min_spare_servers = 1\n"
+                configLines << "pm.max_spare_servers = 3\n"
+                configLines << "pm.start_servers = 2\n"
+
+                configLines << 'access.format = \'{"time_iso8601":"%{%Y-%m-%dT%H:%M:%S%z}T","time_received":"%{%Y-%m-%dT%H:%M:%S%z}t","pool":"%n","remote_addr":"%R","remote_user":"%u","method":"%m","host":"%{HTTP_HOST}e","uri":"%r","query_string":"%q","request":"%m %{REQUEST_URI}e %{SERVER_PROTOCOL}e","status":%s,"request_uri":"%{REQUEST_URI}e","server_protocol":"%{SERVER_PROTOCOL}e","body_bytes_sent":%l,"request_time":%d,"request_filename":"%f","http_x_forwarded_for":"%{HTTP_X_FORWARDED_FOR}e","http_x_real_ip":"%{HTTP_X_REAL_IP}e","http_referer":"%{HTTP_REFERER}e","http_user_agent":"%{HTTP_USER_AGENT}e","http_accept_language":"%{HTTP_ACCEPT_LANGUAGE}e","request_id":"%{HTTP_X_REQUEST_ID}e","content_type":"%{Content-Type}o","upstream_http_etag":"%{ETag}o","upstream_http_last_modified":"%{Last-Modified}o","cpu_time":%C,"memory":%M,"ppid":%P,"pid":%p}\'' + "\n"
+                configLines << "access.log = /var/log/php/$pool.access.json\n"
+                if target['PHP-FPM']['chdir']
+                    configLines << "chdir = #{target['PHP-FPM']['chdir']}\n"
+                else
+                    configLines << "chdir = #{self.webappsDir}$pool\n"
+                end
+                configLines << "php_admin_value[error_log] = /var/log/php/$pool.errors.log\n"
+                configLines << "php_admin_flag[log_errors] = on\n"
+                configLines << "php_admin_value[memory_limit] = 1G\n"
+                configLines << "php_admin_value[mail.log] = /var/log/php/$pool.mail.log\n"
+            end
+
+        end
+    end
+end

data/Plugins/Apps/PHP-FPM/PHP-FPM.lmm.rb

@@ -1,4 +1,6 @@
 
+require_relative 'Connection'
+
 module ConfigLMM
     module LMM
         class PHP_FPM < Framework::LinuxApp
@@ -6,6 +8,17 @@ module ConfigLMM
             PHPFPM_PACKAGE = 'PHP-FPM'
             PHPFPM_SERVICE = 'php-fpm'
 
+            def self.deploy(linuxConnection, options)
+                linuxConnection.ensurePackage(PHP_FPM::PHPFPM_PACKAGE, options)
+                linuxConnection.ensureServiceAutoStart(PHP_FPM::PHPFPM_SERVICE, options)
+
+                dir = self.configFileDir(linuxConnection.distroInfo)
+                if !linuxConnection.filePresent?(dir + 'php-fpm.conf', { **options, 'dry': false })
+                    linuxConnection.exec("cp #{dir}php-fpm.conf.default #{dir}php-fpm.conf", false, options)
+                end
+            end
+
+            # DEPRECATED
             def self.writeConfig(name, target, distroInfo, configLines)
                 target['PHP-FPM'] ||= {}
 
@@ -18,15 +31,17 @@ module ConfigLMM
                     configLines << "listen = /run/php-fpm/#{name}.sock\n"
                     configLines << "listen.owner = #{target['User']}\n"
                     group = 'http'
-                    group = 'nginx' if distroInfo['Name'] == 'openSUSE Leap'
+                    group = 'nginx' if distroInfo['Name'] == Linux::SUSE_NAME
                     configLines << "listen.group = #{group}\n"
                 end
                 configLines << "pm = dynamic\n"
-                configLines << "pm.max_children = 5\n"
+                configLines << "pm.max_children = 10\n"
                 configLines << "pm.min_spare_servers = 1\n"
                 configLines << "pm.max_spare_servers = 3\n"
                 configLines << "pm.start_servers = 2\n"
-                configLines << "access.log = /var/log/php/$pool.access.log\n"
+
+                configLines << 'access.format = \'{"time_iso8601":"%{%Y-%m-%dT%H:%M:%S%z}T","time_received":"%{%Y-%m-%dT%H:%M:%S%z}t","pool":"%n","remote_addr":"%R","remote_user":"%u","method":"%m","host":"%{HTTP_HOST}e","uri":"%r","query_string":"%q","request":"%m %{REQUEST_URI}e %{SERVER_PROTOCOL}e","status":%s,"request_uri":"%{REQUEST_URI}e","server_protocol":"%{SERVER_PROTOCOL}e","body_bytes_sent":%l,"request_time":%d,"request_filename":"%f","http_x_forwarded_for":"%{HTTP_X_FORWARDED_FOR}e","http_x_real_ip":"%{HTTP_X_REAL_IP}e","http_referer":"%{HTTP_REFERER}e","http_user_agent":"%{HTTP_USER_AGENT}e","http_accept_language":"%{HTTP_ACCEPT_LANGUAGE}e","request_id":"%{HTTP_X_REQUEST_ID}e","content_type":"%{Content-Type}o","upstream_http_etag":"%{ETag}o","upstream_http_last_modified":"%{Last-Modified}o","cpu_time":%C,"memory":%M,"ppid":%P,"pid":%p}\'' + "\n"
+                configLines << "access.log = /var/log/php/$pool.access.json\n"
                 if target['PHP-FPM']['chdir']
                     configLines << "chdir = #{target['PHP-FPM']['chdir']}\n"
                 else
@@ -38,6 +53,7 @@ module ConfigLMM
                 configLines << "php_admin_value[mail.log] = /var/log/php/$pool.mail.log\n"
             end
 
+            # DEPRECATED
             def self.phpConfig(distroInfo)
                 if distroInfo['Name'] == 'openSUSE Leap'
                     '/etc/php8/fpm/php.ini'
@@ -46,19 +62,23 @@ module ConfigLMM
                 end
             end
 
+            # DEPRECATED
             def self.peclInstallOverSSH(name, ssh)
                 self.sshExec!(ssh, "printf \"\\n\" | pecl install #{name}", true)
             end
 
+            # DEPRECATED
             def self.enableExtensionOverSSH(name, distroInfo, ssh)
                 phpFile = self.phpConfig(distroInfo)
-                if self.remoteFileContains?(phpFile, "extension=#{name}", ssh)
+                contains = IO::SSH.exec!(ssh, "grep 'extension=#{name}' #{phpFile}", true).strip.empty?
+                if contains
                     self.sshExec!(ssh, "sed -i 's|^;extension=#{name}|extension=#{name}|' #{phpFile}")
                 else
                     self.sshExec!(ssh, "sed -i 's|extension=zip|extension=zip\\nextension=#{name}|' #{phpFile}")
                 end
             end
 
+            # DEPRECATED
             def self.configFileDir(distroInfo)
                 if distroInfo['Name'] == 'openSUSE Leap'
                     '/etc/php8/fpm/'
@@ -67,6 +87,7 @@ module ConfigLMM
                 end
             end
 
+            # DEPRECATED
             def self.configDir(distroInfo)
                 if distroInfo['Name'] == 'openSUSE Leap'
                     '/etc/php8/fpm/php-fpm.d/'
@@ -75,6 +96,7 @@ module ConfigLMM
                 end
             end
 
+            # DEPRECATED
             def self.webappsDir(distroInfo)
                 if distroInfo['Name'] == 'openSUSE Leap'
                     '/srv/www/htdocs/'
@@ -83,6 +105,11 @@ module ConfigLMM
                 end
             end
 
+            def self.withConnection(linuxConnection)
+                yield(PHPFPMConnection.new(linuxConnection))
+            end
+
+            # DEPRECATED
             def self.fixConfigFileOverSSH(distroInfo, ssh)
                 dir = self.configFileDir(distroInfo)
                 if !self.remoteFilePresent?(dir + 'php-fpm.conf', ssh)

data/Plugins/Apps/Peppermint/Peppermint.conf.erb

@@ -1,9 +1,5 @@
 
 server {
-    listen 80;
-    listen [::]:80;
-    server_name peppermint.example.com;
-    add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
 
     <% if !config['TLS'] %>
         listen       <%= config['Port'] %>;
@@ -26,10 +22,6 @@ server {
 
     server_name <%= config['Domain'] %>;
 
-    access_log  /var/log/nginx/peppermint.access.log;
-    error_log   /var/log/nginx/peppermint.error.log;
-
-    include config-lmm/errors.conf;
     include config-lmm/security.conf;
 
     client_max_body_size 10M;
@@ -43,6 +35,7 @@ server {
 
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
 
+        include config-lmm/errors.conf;
         include config-lmm/proxy.conf;
         proxy_redirect off;
         proxy_read_timeout 5m;
@@ -52,7 +45,7 @@ server {
         <% if config['Server'] %>
             proxy_pass <%= config['Server'] %>;
         <% else %>
-            proxy_pass http://127.0.0.1:15003/;
+            proxy_pass http://127.0.0.1:15003;
         <% end %>
 
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;

data/Plugins/Apps/Peppermint/Peppermint.container

@@ -4,11 +4,17 @@ Description=Peppermint Ticket Management container
 After=local-fs.target
 
 [Container]
-Image=pepperlabs/peppermint:latest
+ContainerName=Peppermint
+Image=docker.io/pepperlabs/peppermint:latest
 EnvironmentFile=/var/lib/peppermint/.config/containers/systemd/Peppermint.env
 Network=slirp4netns:allow_host_loopback=true
 PublishPort=127.0.0.1:13000:3000
 PublishPort=127.0.0.1:15003:5003
+LogDriver=journald
+AutoUpdate=registry
+
+[Service]
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target default.target