commit 4f38d7c6d582c126b6ea67a7aca97348db22ac6a Author: František Dvořák Date: Sun Aug 25 23:27:08 2013 +0200 Move proxyrenewal daemon from bin to sbin (Fedora review #892698). diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile index 8dc55a8..343294e 100644 --- a/org.glite.px.proxyrenewal/Makefile +++ b/org.glite.px.proxyrenewal/Makefile @@ -221,7 +221,8 @@ examples: ${EXAMPLES} install: -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/sbin ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal ${DESTDIR}${PREFIX}${prefix}/share/man/man1 ${DESTDIR}${PREFIX}${prefix}/share/man/man8 ${DESTDIR}${PREFIX}${sysdefaultdir} ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} - ${INSTALL} -m 755 ${DAEMON} ${CLIENT} ${DESTDIR}${PREFIX}${prefix}/bin + ${INSTALL} -m 755 ${CLIENT} ${DESTDIR}${PREFIX}${prefix}/bin + ${INSTALL} -m 755 ${DAEMON} ${DESTDIR}${PREFIX}${prefix}/sbin ${INSTALL} -m 755 setup ${DESTDIR}${PREFIX}${prefix}/sbin/glite-proxy-setup cd ${top_srcdir}/interface && ${INSTALL} -m 644 renewal.h renewal_core.h ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal ${INSTALL} -m 644 ${MAN1_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1 diff --git a/org.glite.px.proxyrenewal/config/setup b/org.glite.px.proxyrenewal/config/setup index 0e2280a..b451c05 100755 --- a/org.glite.px.proxyrenewal/config/setup +++ b/org.glite.px.proxyrenewal/config/setup @@ -150,7 +150,7 @@ fi # ==== startup ==== if test "$setup_startup" = "1"; then - if test ! -x $GLITE_LOCATION/bin/glite-proxy-renewd; then + if test ! -x $GLITE_LOCATION/sbin/glite-proxy-renewd; then echo "$NAME: ERROR: glite-proxy-renewd not installed" startup_error=1 fi diff --git a/org.glite.px.proxyrenewal/config/startup b/org.glite.px.proxyrenewal/config/startup index 09c24f5..2c68eb0 100755 --- a/org.glite.px.proxyrenewal/config/startup +++ b/org.glite.px.proxyrenewal/config/startup @@ -81,7 +81,7 @@ start() fi su - $GLITE_USER -c "VOMS_USERCONF=$user_voms_config \ - $GLITE_LOCATION/bin/glite-proxy-renewd \ + $GLITE_LOCATION/sbin/glite-proxy-renewd \ -r $PROXY_REPOSITORY $creds -A $GLITE_PROXY_RENEWD_OPTIONS" if [ $? -eq 0 ]; then diff --git a/org.glite.px.proxyrenewal/config/systemd.proxy-renewd b/org.glite.px.proxyrenewal/config/systemd.proxy-renewd index e39ffdc..7ecef42 100644 --- a/org.glite.px.proxyrenewal/config/systemd.proxy-renewd +++ b/org.glite.px.proxyrenewal/config/systemd.proxy-renewd @@ -15,7 +15,7 @@ EnvironmentFile=-/etc/profile.d/grid-env.sh EnvironmentFile=-/etc/sysconfig/glite-px ExecStartPre=/usr/bin/touch /tmp/renewal_vomses ExecStartPre=/usr/bin/chmod 644 /tmp/renewal_vomses -ExecStart=/usr/bin/glite-proxy-renewd -A $GLITE_PROXY_RENEWD_OPTIONS +ExecStart=/usr/sbin/glite-proxy-renewd -A $GLITE_PROXY_RENEWD_OPTIONS [Install] WantedBy=multi-user.target