Changeset 2063 for branches/fc15-dev/server/fedora

Timestamp:

Nov 22, 2011, 12:24:41 AM (13 years ago)

Author:

quentin

Message:

Package afsagent systemd and get rid of rc.local sysname hack

Location:

branches/fc15-dev/server/fedora

Files:

• config/etc/rc.d/rc.local (modified) (1 diff)
• specs/tokensys.spec (modified) (6 diffs)

branches/fc15-dev/server/fedora/config/etc/rc.d/rc.local

@@ -4 +4 @@
 
 /bin/mkdir -pm 1773 /tmp/sessions
-
-#### Set the AFS sysname. Ideally, this should go elsewhere, but this
-#### is a horrible hack to clean up after another horrible hack, so...
-
-/sbin/sysctl -q afs.GCPAGs=0
-/usr/bin/fs setcrypt on
-/usr/bin/fs sysname 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
-
-/usr/bin/fs setcell -nosuid -c athena

branches/fc15-dev/server/fedora/specs/tokensys.spec

@@ -11 +11 @@
 %define debug_package %{nil}
 Prereq: /usr/bin/kinit, /usr/bin/aklog
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+BuildRequires: systemd-units
 
 %description
@@ -17 +21 @@
 Contains:
  - A shell script for renewing the scripts AFS credentials <renew>
- - A crontab for calling the renew script <crontab>
+ - A shell script for configuring scripts AFS <scripts-afsagent-startup>
+ - systemd units for running the above
 See http://scripts.mit.edu/wiki for more information.
 
@@ -24 +29 @@
 
 %build
-./configure --with-kinit=/usr/bin/kinit --with-aklog=/usr/bin/aklog
+./configure --with-kinit=/usr/bin/kinit --with-aklog=/usr/bin/aklog --with-fs=/usr/bin/fs
 
 %install
 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
 install -D renew $RPM_BUILD_ROOT/home/afsagent/renew
-install -D crontab $RPM_BUILD_ROOT/etc/cron.d/afsagent
+install -D scripts-afsagent-startup $RPM_BUILD_ROOT/usr/local/libexec/scripts-afsagent-startup
+install -D scripts-afsagent-startup.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent-startup.service
+install -D scripts-afsagent.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.service
+install -D scripts-afsagent.timer $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.timer
 
 %clean
@@ -35 +43 @@
 
 %files
-%defattr(0600, root, root)
-/etc/cron.d/afsagent
+%defattr(0644,root,root)
+%{_unitdir}/*.service
+%{_unitdir}/*.timer
 %defattr(0755, afsagent, afsagent)
 /home/afsagent/renew
+/usr/local/libexec/scripts-afsagent-startup
 
 %pre
@@ -44 +54 @@
 useradd -u 101 -g 101 afsagent || [ $? -eq 9 ]
 
+%post
+/bin/systemctl enable scripts-afsagent-startup.service >/dev/null 2>&1 || :
+/bin/systemctl enable scripts-afsagent.service >/dev/null 2>&1 || :
+/bin/systemctl enable scripts-afsagent.timer >/dev/null 2>&1 || :
+
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable scripts-afsagent-startup.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable scripts-afsagent.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable scripts-afsagent.timer > /dev/null 2>&1 || :
+    /bin/systemctl stop scripts-afsagent-startup.service > /dev/null 2>&1 || :
+    /bin/systemctl stop scripts-afsagent.service > /dev/null 2>&1 || :
+    /bin/systemctl stop scripts-afsagent.timer > /dev/null 2>&1 || :
+fi
+
 %postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart scripts-afsagent.service >/dev/null 2>&1 || :
+fi
+
 if [ "$1" = "0" ] ; then
    userdel -r afsagent
@@ -50 +87 @@
 
 %changelog
+* Mon Nov 21 2011  Quentin Smith <quentin@mit.edu>
+- add systemd units
+- remove crontab
+
 * Tue Aug 17 2010  Geoffrey Thomas <geofft@mit.edu>
 - aklog csail as well