From 16ec0de22bf3c93df18fdb9e3bab06cea161b442 2020-05-07 18:59:45 From: Branko Majic Date: 2020-05-07 18:59:45 Subject: [PATCH] MAR-152: Switch to /run path in backup_server, ldap_server, and xmpp_server roles. --- diff --git a/roles/backup_server/files/backup-sshd_config-stretch b/roles/backup_server/files/backup-sshd_config-stretch index fc512483ac2ed4d5b37e155d42842f31ab1a64e2..eff4f61893496e420c9f33052138bbbe06a929d4 100644 --- a/roles/backup_server/files/backup-sshd_config-stretch +++ b/roles/backup_server/files/backup-sshd_config-stretch @@ -65,7 +65,7 @@ Subsystem sftp internal-sftp UsePAM yes # Specify a dedicated PID file for the backup SSH. -PidFile /var/run/sshd-backup.pid +PidFile /run/sshd-backup.pid # Users logging-in are forced to use the SFTP server. ForceCommand internal-sftp diff --git a/roles/ldap_server/molecule/default/tests/test_default.py b/roles/ldap_server/molecule/default/tests/test_default.py index 47c79b221b76b01b291058f7346506b944350567..1605dc951550eb4b95574a2d37da424053d94cc6 100644 --- a/roles/ldap_server/molecule/default/tests/test_default.py +++ b/roles/ldap_server/molecule/default/tests/test_default.py @@ -32,7 +32,7 @@ def test_ldap_server_service_sockets_and_ports(host): assert host.socket('tcp://389').is_listening assert host.socket('tcp://636').is_listening - assert host.socket('unix:///var/run/slapd/ldapi').is_listening + assert host.socket('unix:///run/slapd/ldapi').is_listening def test_ldap_server_service(host): diff --git a/roles/xmpp_server/templates/prosody.cfg.lua.j2 b/roles/xmpp_server/templates/prosody.cfg.lua.j2 index 1b8d5e4b1b08e2667f56e5c800c92a192d3082cb..d36bffae94817418b03be034d53adb0d7502611e 100644 --- a/roles/xmpp_server/templates/prosody.cfg.lua.j2 +++ b/roles/xmpp_server/templates/prosody.cfg.lua.j2 @@ -56,7 +56,7 @@ c2s_require_encryption = true s2s_secure_auth = false -- Path to Prosody's PID file. -pidfile = "/var/run/prosody/prosody.pid" +pidfile = "/run/prosody/prosody.pid" -- Authentication backend. authentication = "ldap"