Rename awx rsyslog socket and PID dir

awx/main/tests/unit/api/test_logger.py

@@ -144,7 +144,7 @@ def test_rsyslog_conf_template(enabled, type, host, port, protocol, expected_con
     # Set test settings
     logging_defaults = getattr(settings, 'LOGGING')
     setattr(mock_settings, 'LOGGING', logging_defaults)
-    setattr(mock_settings, 'LOGGING["handlers"]["external_logger"]["address"]', '/var/run/rsyslog/rsyslog.sock')
+    setattr(mock_settings, 'LOGGING["handlers"]["external_logger"]["address"]', '/var/run/awx-rsyslog/rsyslog.sock')
     setattr(mock_settings, 'LOG_AGGREGATOR_ENABLED', enabled)
     setattr(mock_settings, 'LOG_AGGREGATOR_TYPE', type)
     setattr(mock_settings, 'LOG_AGGREGATOR_HOST', host)

awx/settings/defaults.py

@@ -1013,7 +1013,7 @@ LOGGING = {
         'external_logger': {
             'class': 'awx.main.utils.handlers.RSysLogHandler',
             'formatter': 'json',
-            'address': '/var/run/rsyslog/rsyslog.sock',
+            'address': '/var/run/awx-rsyslog/rsyslog.sock',
             'filters': ['external_log_enabled', 'dynamic_level_filter'],
         },
         'tower_warnings': {

installer/roles/image_build/files/rsyslog.conf

@@ -2,6 +2,6 @@ $WorkDirectory /var/lib/awx/rsyslog
 $MaxMessageSize 700000
 $IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf
 module(load="imuxsock" SysSock.Use="off")
-input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")
+input(type="imuxsock" Socket="/var/run/awx-rsyslog/rsyslog.sock" unlink="on")
 template(name="awx" type="string" string="%msg%")
 action(type="omfile" file="/dev/null")

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/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
 autostart = true
 autorestart = true
 stopwaitsecs = 1

installer/roles/image_build/templates/Dockerfile.j2

@@ -101,7 +101,7 @@ ADD rsyslog.repo /etc/yum.repos.d/rsyslog.repo
 RUN yum install -y rsyslog-omhttp
 
 # Pre-create things that we need to write to
-RUN for dir in /home/awx /var/run/supervisor /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/rsyslog /var/log/tower /var/log/nginx /var/lib/nginx; \
+RUN for dir in /home/awx /var/run/supervisor /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower /var/log/nginx /var/lib/nginx; \
     do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \
     \
     for file in /etc/passwd /var/run/nginx.pid; \

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

@@ -97,7 +97,7 @@ spec:
             - name: supervisor-socket
               mountPath: "/var/run/supervisor"
             - name: rsyslog-socket
-              mountPath: "/var/run/rsyslog"
+              mountPath: "/var/run/awx-rsyslog"
             - name: rsyslog-dir
               mountPath: "/var/lib/awx/rsyslog"
 {% if ca_trust_dir is defined %}
@@ -183,7 +183,7 @@ spec:
             - name: supervisor-socket
               mountPath: "/var/run/supervisor"
             - name: rsyslog-socket
-              mountPath: "/var/run/rsyslog"
+              mountPath: "/var/run/awx-rsyslog"
             - name: rsyslog-dir
               mountPath: "/var/lib/awx/rsyslog"
 {% if ca_trust_dir is defined %}

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

@@ -54,7 +54,7 @@ data:
     stderr_logfile_maxbytes=0
 
     [program:awx-rsyslogd]
-    command = rsyslogd -n -i /var/run/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+    command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
     autostart = true
     autorestart = true
     stopwaitsecs = 1

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

@@ -20,7 +20,7 @@ services:
     user: root
     restart: unless-stopped
     volumes:
-      - rsyslog-socket:/var/run/rsyslog/
+      - rsyslog-socket:/var/run/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"
@@ -77,7 +77,7 @@ services:
     user: root
     restart: unless-stopped
     volumes:
-      - rsyslog-socket:/var/run/rsyslog/
+      - rsyslog-socket:/var/run/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"

tools/docker-compose/Dockerfile

@@ -123,7 +123,7 @@ ADD tools/docker-compose/entrypoint.sh /
 ADD tools/scripts/awx-python /usr/bin/awx-python
 
 # Pre-create things that we need to write to
-RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
+RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
     do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \
     \
     for file in /etc/passwd /etc/supervisord.conf /venv/awx/lib/python3.6/site-packages/awx.egg-link /var/run/nginx.pid; \

tools/docker-compose/rsyslog.conf

@@ -2,6 +2,6 @@ $WorkDirectory /var/lib/awx/rsyslog
 $MaxMessageSize 700000
 $IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf
 module(load="imuxsock" SysSock.Use="off")
-input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")
+input(type="imuxsock" Socket="/var/run/awx-rsyslog/rsyslog.sock" unlink="on")
 template(name="awx" type="string" string="%msg%")
 action(type="omfile" file="/dev/null")

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/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
 autostart = true
 autorestart = true
 stopwaitsecs = 1