guardian: Drop .pl extension and move to /usr/bin.

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian
similarity index 99%
rename from config/guardian/guardian.pl
rename to config/guardian/guardian
index 86775fe696272577e058d9a9becbe438b1dddb67..9124e2b3b1e2b7617496ddd582a382bd6269b0f8 100644 (file)
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian
@@ -95,7 +95,7 @@ my %fileposition = ();
 &getopts ("hc:d", \%options);
 if (defined($options{"h"})) {
        print "Guardian v2.0 \n";
-       print "guardian.pl [-hd] <-c config>\n";
+       print "guardian [-hd] <-c config>\n";
        print " -h  shows help\n";
        print " -d  run in debug mode (doesn't fork, output goes to STDOUT)\n";
        print " -c  specifiy a configuration file other than the default (/etc/guardian/guardian.conf)\n";

diff --git a/config/rootfiles/packages/guardian b/config/rootfiles/packages/guardian
index 6c6a1a0b2dc65bd6554a2d760e740c95dfb55bdd..84465bb70418cc1325cabeb82c3fd39dd3e1ec1e 100644 (file)
--- a/config/rootfiles/packages/guardian
+++ b/config/rootfiles/packages/guardian
@@ -1,13 +1,12 @@
 etc/rc.d/rc0.d/K76guardian
 etc/rc.d/rc3.d/S45guardian
 etc/rc.d/rc6.d/K76guardian
-usr/local/bin/guardian.pl
+usr/bin/guardian
 usr/local/bin/guardianctrl
 var/ipfire/backup/addons/includes/guardian
 #var/ipfire/guardian
 var/ipfire/guardian/guardian.conf
 var/ipfire/guardian/guardian.ignore
-var/ipfire/guardian/guardian.target
 var/ipfire/guardian/settings
 #var/log/guardian
 var/log/guardian/guardian.log

diff --git a/lfs/guardian b/lfs/guardian
index 190f9ec1c0f6fc828318753d6185ee68cdd058ce..af9419ec1a2af55dc6a00a7e5693c57ec3510ffe 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -61,7 +61,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Create config directory and create files.
        -mkdir -p /var/ipfire/guardian
        touch /var/ipfire/guardian/guardian.ignore
-       touch /var/ipfire/guardian/guardian.target
        touch /var/ipfire/guardian/settings
 
        # Create directory and file for logging.
@@ -72,11 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/guardian/guardian.conf /var/ipfire/guardian/
 
        # Install guardian.
-       install -v -m 755 $(DIR_SRC)/config/guardian/guardian.pl /usr/local/bin/
+       install -v -m 755 $(DIR_SRC)/config/guardian/guardian /usr/bin/
 
        # Fix permissions to allow the webinterface to read and write the files.
        chown nobody.nobody /var/ipfire/guardian
-       chown nobody.nobody /var/ipfire/guardian/{guardian.conf,guardian.ignore,guardian.target}
+       chown nobody.nobody /var/ipfire/guardian/{guardian.conf,guardian.ignore}
 
        # Create symlinks for runlevel interaction.
        ln -s /etc/rc.d/init.d/guardian /etc/rc.d/rc3.d/S45guardian

diff --git a/src/initscripts/init.d/guardian b/src/initscripts/init.d/guardian
index 499173221f8fcb132da274feb6b33d22d1a24580..b054795c2858780c89129b0832483c38cf9cc12e 100644 (file)
--- a/src/initscripts/init.d/guardian
+++ b/src/initscripts/init.d/guardian
@@ -26,18 +26,18 @@ case "$1" in
                        guardian_is_enabled || exit 0
 
                        boot_mesg "Starting Guardian..."
-                       loadproc /usr/local/bin/guardian.pl
+                       loadproc /usr/bin/guardian
        ;;
 
        stop)
-               if ([ ! -z $(pidofproc /usr/local/bin/guardian.pl) ]); then
+               if ([ ! -z $(pidofproc /usr/bin/guardian) ]); then
                        boot_mesg "Stopping Guardian..."
-                       killproc /usr/local/bin/guardian.pl
+                       killproc /usr/bin/guardian
                fi
        ;;
 
         status)
-               statusproc /usr/local/bin/guardian.pl
+               statusproc /usr/bin/guardian
        ;;
                 
        restart)