From cb2133e8717192532b365730b9caa5e081e1ca0e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 14 Nov 2018 15:11:05 -0500 Subject: [PATCH] Change strategy for pam.d entry The symbolic link did not stay a symbolic link. Use %post in rpm instead. --- confluent_server/confluent_server.spec.tmpl | 3 +++ confluent_server/pam/confluent | 1 - confluent_server/setup.py.tmpl | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 120000 confluent_server/pam/confluent diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index 19d3d247..2580580c 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -40,6 +40,9 @@ true %post sysctl -p /usr/lib/sysctl.d/confluent.conf >& /dev/null if [ -x /usr/bin/systemctl ]; then /usr/bin/systemctl try-restart confluent >& /dev/null; fi +if [ ! -e /etc/pam.d/confluent ]; then + ln -s /etc/pam.d/sshd /etc/pam.d/confluent +fi true %clean diff --git a/confluent_server/pam/confluent b/confluent_server/pam/confluent deleted file mode 120000 index fc9a7f75..00000000 --- a/confluent_server/pam/confluent +++ /dev/null @@ -1 +0,0 @@ -/etc/pam.d/sshd \ No newline at end of file diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index 3e33ad62..f638f45d 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -22,7 +22,6 @@ setup( 'pyghmi>=1.0.44'], scripts=['bin/confluent', 'bin/confluentdbutil', 'bin/collective'], data_files=[('/etc/init.d', ['sysvinit/confluent']), - ('/etc/pam.d/', ['pam/confluent']), ('/usr/lib/sysctl.d', ['sysctl/confluent.conf']), ('/usr/lib/systemd/system', ['systemd/confluent.service']), ('/opt/confluent/lib/python/confluent/plugins/console/', [])],