Permalink
Browse files

изменено название samsdaemon на sams2daemon

  • Loading branch information...
DmitryChemerik DmitryChemerik
DmitryChemerik authored and DmitryChemerik committed Aug 8, 2010
1 parent 8d4fcd7 commit af038c4f889875eb317f910d4cc0a7bb0a3b6e2a
Showing with 14 additions and 14 deletions.
  1. +3 −3 debian/init.d
  2. +1 −1 debian/sams2.install
  3. +6 −6 redhat/init.d
  4. +1 −1 spec/sams2.spec
  5. +2 −2 src/Makefile.am
  6. +1 −1 suse/init.d
View
@@ -10,7 +10,7 @@
# Default-Stop: 0 1 6
# Short-Description: Starting sams daemon
# Description: Squid Account Management System (SAMS)
# Starting sams management daemon - samsdaemon
# Starting sams management daemon - sams2daemon
### END INIT INFO
#
# Author: Pavel Vinogradov <Pavel.Vinogradov@nixdev.net>
@@ -19,9 +19,9 @@
SAMSPATH=`cat /etc/sams2.conf | grep SAMSPATH | tr "SAMSPATH=" "\0"`
NAME="sams"
DAEMON=$SAMSPATH/bin/samsdaemon
DAEMON=$SAMSPATH/bin/sams2daemon
LOCKFILE=/var/lock/samsd
PIDFILE=/var/run/samsdaemon.pid
PIDFILE=/var/run/sams2daemon.pid
RETVAL=0
SAMS_ENABLE=false
View
@@ -1,3 +1,3 @@
etc/sams2.conf etc
src/samsdaemon src/samsparser src/samsredir usr/bin
src/sams2daemon src/samsparser src/samsredir usr/bin
#mysql usr/share/sams2
View
@@ -25,7 +25,7 @@ OPTIONS=${OPTIONS:-"-l syslog"}
PIDFILE_TIMEOUT=${PIDFILE_TIMEOUT:-5}
SHUTDOWN_TIMEOUT=${SHUTDOWN_TIMEOUT:-60}
DAEMON=__PREFIX/samsdaemon
DAEMON=__PREFIX/sams2daemon
prog=sams2
@@ -40,7 +40,7 @@ start () {
if [ $RETVAL -eq 0 ]; then
timeout=0;
while : ; do
[ ! -f /var/run/samsdaemon.pid ] || break
[ ! -f /var/run/sams2daemon.pid ] || break
if [ $timeout -ge $PIDFILE_TIMEOUT ]; then
RETVAL=1
break
@@ -49,7 +49,7 @@ start () {
timeout=$((timeout+1))
done
fi
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/samsdaemon
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/sams2daemon
[ $RETVAL -eq 0 ] && echo_success
[ $RETVAL -ne 0 ] && echo_failure
echo
@@ -62,10 +62,10 @@ stop () {
$DAEMON --stop
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
rm -f /var/lock/subsys/samsdaemon
rm -f /var/lock/subsys/sams2daemon
timeout=0
while : ; do
[ -f /var/run/samsdaemon.pid ] || break
[ -f /var/run/sams2daemon.pid ] || break
if [ $timeout -ge $SHUTDOWN_TIMEOUT ]; then
echo_failure
echo
@@ -99,7 +99,7 @@ case $1 in
restart
;;
condrestart)
[ -f /var/lock/subsys/samsdaemon ] && restart || :
[ -f /var/lock/subsys/sams2daemon ] && restart || :
;;
reload)
echo -n $"Reloading $prog: "
View
@@ -209,7 +209,7 @@ rm -rf "${RPM_BUILD_ROOT}"
%files
%defattr(-,root,root,-)
%{_prefix}/bin/samsparser
%{_prefix}/bin/samsdaemon
%{_prefix}/bin/sams2daemon
%{_prefix}/bin/samsredir
%{_prefix}/bin/sams_send_email
%{_initrddir}/sams2
View
@@ -3,7 +3,7 @@ BUILT_SOURCES =
CLEANFILES =
DISTCLEANFILES = Makefile.in config.h.in
bin_PROGRAMS = samsparser samsdaemon samsredir
bin_PROGRAMS = samsparser sams2daemon samsredir
# set the include path found by configure
INCLUDES = $(all_includes)
@@ -17,7 +17,7 @@ samsparser_SOURCES = \
dbconn.cpp dbquery.cpp mysqlquery.cpp templatelist.cpp template.cpp grouplist.cpp \
pgconn.cpp pgquery.cpp timerangelist.cpp timerange.cpp urlgrouplist.cpp urlgroup.cpp \
dns.cpp userlist.cpp samsldap.cpp
samsdaemon_SOURCES = \
sams2daemon_SOURCES = \
datefilter.cpp debug.cpp filter.cpp ip.cpp \
localnetworks.cpp logger.cpp net.cpp odbcconn.cpp odbcquery.cpp processmanager.cpp \
proxy.cpp samsconfig.cpp samsuser.cpp samsuserlist.cpp tools.cpp url.cpp \
View
@@ -117,7 +117,7 @@
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
SAMS2_BIN=__PREFIX/samsdaemon
SAMS2_BIN=__PREFIX/sams2daemon
test -x $SAMS2_BIN || { echo "$SAMS2_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }

0 comments on commit af038c4

Please sign in to comment.