Move supervisor and rsyslog sock files to their own dirs under /var/run

awx/main/utils/external_logging.py

@@ -28,7 +28,7 @@ def reconfigure_rsyslog():
                 port = settings.LOG_AGGREGATOR_PORT
 
         parts.extend([
-            'input(type="imuxsock" Socket="/var/run/tower/sockets/rsyslog.sock" unlink="on")',
+            'input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")',
             'template(name="awx" type="string" string="%msg%")',
         ])
         if protocol.startswith('http'):

awx/settings/defaults.py

@@ -955,7 +955,7 @@ CHANNEL_LAYERS = {
 }
 
 # Logging configuration.
-LOGGING_SOCK = '/var/run/tower/sockets/rsyslog.sock'
+LOGGING_SOCK = '/var/run/rsyslog/rsyslog.sock'
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

installer/roles/image_build/files/supervisor.conf

@@ -47,7 +47,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:awx-rsyslogd]
-command = rsyslogd -n -i /var/run/tower/sockets/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+command = rsyslogd -n -i /var/run/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
 autostart = true
 autorestart = true
 stopwaitsecs = 1
@@ -74,10 +74,10 @@ events=TICK_60
 priority=0
 
 [unix_http_server]
-file=/var/run/tower/sockets/supervisor.web.sock
+file=/var/run/supervisor/supervisor.web.sock
 
 [supervisorctl]
-serverurl=unix:///var/run/tower/sockets/supervisor.web.sock ; use a unix:// URL  for a unix socket
+serverurl=unix:///var/run/supervisor/supervisor.web.sock ; use a unix:// URL  for a unix socket
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -94,9 +94,11 @@ spec:
           ports:
             - containerPort: 8052
           volumeMounts:
-            - name: sockets
+            - name: supervisor-socket
-              mountPath: "/var/run/tower/sockets/"
+              mountPath: "/var/run/supervisor"
-            - name: rsyslog
+            - name: rsyslog-socket
+              mountPath: "/var/run/rsyslog"
+            - name: rsyslog-config
               mountPath: "/var/lib/awx/rsyslog/"
 {% if ca_trust_dir is defined %}
             - name: {{ kubernetes_deployment_name }}-ca-trust-dir
@@ -178,9 +180,11 @@ spec:
             - /usr/bin/launch_awx_task.sh
           imagePullPolicy: Always
           volumeMounts:
-            - name: sockets
+            - name: supervisor-socket
-              mountPath: "/var/run/tower/sockets/"
+              mountPath: "/var/run/supervisor"
-            - name: rsyslog
+            - name: rsyslog-socket
+              mountPath: "/var/run/rsyslog"
+            - name: rsyslog-config
               mountPath: "/var/lib/awx/rsyslog/"
 {% if ca_trust_dir is defined %}
             - name: {{ kubernetes_deployment_name }}-ca-trust-dir
@@ -323,9 +327,11 @@ spec:
 {{ affinity | to_nice_yaml(indent=2) | indent(width=8, indentfirst=True) }}
 {% endif %}
       volumes:
-        - name: sockets
+        - name: supervisor-socket
           emptyDir: {}
-        - name: rsyslog
+        - name: rsyslog-socket
+          emptyDir: {}
+        - name: rsyslog-config
           emptyDir: {}
 {% if ca_trust_dir is defined %}
         - name: {{ kubernetes_deployment_name }}-ca-trust-dir

installer/roles/local_docker/templates/docker-compose.yml.j2

@@ -20,8 +20,8 @@ services:
     user: root
     restart: unless-stopped
     volumes:
-      - sockets:/var/run/tower/sockets/
+      - rsyslog-socket:/var/run/rsyslog/
-      - rsyslog:/var/lib/awx/rsyslog/
+      - rsyslog-config:/var/lib/awx/rsyslog/
       - "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
       - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
@@ -77,8 +77,8 @@ services:
     user: root
     restart: unless-stopped
     volumes:
-      - sockets:/var/run/tower/sockets/
+      - rsyslog-socket:/var/run/rsyslog/
-      - rsyslog:/var/lib/awx/rsyslog/
+      - rsyslog-config:/var/lib/awx/rsyslog/
       - "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
       - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
@@ -163,5 +163,6 @@ services:
       no_proxy: {{ no_proxy | default('') }}
   {% endif %}
 volumes:
-  sockets:
+  supervisor-socket:
-  rsyslog:
+  rsyslog-socket:
+  rsyslog-config:

tools/docker-compose/supervisor.conf

@@ -72,7 +72,7 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
 [program:awx-rsyslogd]
-command = rsyslogd -n -i /var/run/tower/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+command = rsyslogd -n -i /var/run/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
 autostart = true
 autorestart = true
 stopwaitsecs = 1