Changeset 2066 for trunk/server/common/oursrc

Timestamp:

Nov 22, 2011, 12:45:17 AM (12 years ago)

Author:

achernya

Message:

Merge branches/fc15-dev to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/common/oursrc/execsys/execsys-binfmt (modified) (1 prop)
• server/common/oursrc/php_scripts/php_scripts-config.m4 (modified) (1 prop)
• server/common/oursrc/scripts-python-path (deleted)
• server/common/oursrc/scripts-static-cat/test.html (deleted)
• server/common/oursrc/scripts-static-cat/test.py (deleted)
• server/common/oursrc/tokensys/configure.in (modified) (1 diff)
• server/common/oursrc/tokensys/crontab (deleted)
• server/common/oursrc/tokensys/renew.in (modified) (1 diff)
• server/common/oursrc/tokensys/scripts-afsagent-startup.in (copied) (copied from branches/fc15-dev/server/common/oursrc/tokensys/scripts-afsagent-startup.in)
• server/common/oursrc/tokensys/scripts-afsagent-startup.service (copied) (copied from branches/fc15-dev/server/common/oursrc/tokensys/scripts-afsagent-startup.service)
• server/common/oursrc/tokensys/scripts-afsagent.service (copied) (copied from branches/fc15-dev/server/common/oursrc/tokensys/scripts-afsagent.service)
• server/common/oursrc/tokensys/scripts-afsagent.timer (copied) (copied from branches/fc15-dev/server/common/oursrc/tokensys/scripts-afsagent.timer)
• server/common/oursrc/whoisd/Makefile.in (modified) (1 diff)
• server/common/oursrc/whoisd/scripts-whoisd.service (copied) (copied from branches/fc15-dev/server/common/oursrc/whoisd/scripts-whoisd.service)

trunk/server/common/oursrc/tokensys/configure.in

@@ -24 +24 @@
 REQUIRE_PATH(aklog)
 
+AC_ARG_WITH(fs,
+[  --with-fs[=PATH]          fs is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    fs_path="$withval"
+  fi
+])
+REQUIRE_PATH(fs)
+
 AC_OUTPUT(Makefile)
 AC_OUTPUT(renew)
+AC_OUTPUT(scripts-afsagent-startup)

trunk/server/common/oursrc/tokensys/renew.in

@@ -2 +2 @@
 
 # This script renews afsagent's tickets and tokens.
-# It is called by afsagent's crontab every 8 hours.
+# It is called by systemd on a regular schedule.
 
 export KRB5CCNAME=/home/afsagent/krb5cc

trunk/server/common/oursrc/whoisd/Makefile.in

@@ -1 +1 @@
 install:
         install -Dpm 644 whoisd.tac ${DESTDIR}@libexecdir@/whoisd.tac
-        install -Dpm 644 crontab ${DESTDIR}/etc/cron.d/whoisd
+        install -Dpm 644 scripts-whoisd.service ${DESTDIR}/lib/systemd/system/scripts-whoisd.service
 
 clean:
         rm -f ${DESTDIR}@libexecdir@/whoisd.tac
-        rm -f ${DESTDIR}/etc/cron.d/whoisd
+        rm -f ${DESTDIR}/lib/systemd/system/scripts-whoisd.service