X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Finspircd;h=f34345cea54fd4abc05edfc8af79a96cbd4bfdcd;hb=0438ae0aa491a14de049e9731a5786af517f7c0e;hp=a75140c5dbcd8fccaa20c07501e763143b30ba8a;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/inspircd b/make/template/inspircd
index a75140c5d..f34345cea 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -1,3 +1,4 @@
+%mode 0750
 #!/usr/bin/env perl
 
 #
@@ -18,21 +19,47 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+# InspIRCd          Start up the InspIRCd Internet Relay Chat Daemon
+#
+# chkconfig: 2345 55 25
+# description: InspIRCd -- Internet Relay Chat Daemon
+#
+# processname: inspircd
 
 use strict;
 use POSIX;
 use Fcntl;
 
+# From http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
+use constant {
+    STATUS_EXIT_SUCCESS => 0,
+    STATUS_EXIT_DEAD_WITH_PIDFILE => 1,
+    STATUS_EXIT_DEAD_WITH_LOCKFILE => 2,
+    STATUS_EXIT_NOT_RUNNING => 3,
+    STATUS_EXIT_UNKNOWN => 4,
+
+    GENERIC_EXIT_SUCCESS => 0,
+    GENERIC_EXIT_UNSPECIFIED => 1,
+    GENERIC_EXIT_INVALID_ARGUMENTS => 2,
+    GENERIC_EXIT_UNIMPLEMENTED => 3,
+    GENERIC_EXIT_INSUFFICIENT_PRIVILEGE => 4,
+    GENERIC_EXIT_NOT_INSTALLED => 5,
+    GENERIC_EXIT_NOT_CONFIGURED => 6,
+    GENERIC_EXIT_NOT_RUNNING => 7
+};
+
+my $scriptpath = "@SCRIPT_DIR@";
 my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
 my $runpath	=	"@BASE_DIR@";
+my $datadir	=       "@DATA_DIR@";
 my $valgrindlogpath	=	"$basepath/valgrindlogs";
-my $executable	=	"@EXECUTABLE@";
-my $version	=	"@VERSION@";
+my $executable	=	"inspircd";
+my $version	=	"@VERSION_FULL@";
 my $uid = "@UID@";
 
-if ($< == 0 || $> == 0) {
+if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
 	if ($uid !~ /^\d+$/) {
 		# Named UID, look it up
 		$uid = getpwnam $uid;
@@ -80,12 +107,11 @@ if (!defined($sub))
 {
 	print STDERR "Invalid command or none given.\n";
 	cmd_help();
-	exit 1;
+	exit GENERIC_EXIT_UNIMPLEMENTED;
 }
 else
 {
-	$sub->(@ARGV);
-	exit 0;
+	exit $sub->(@ARGV); # Error code passed through return value
 }
 
 sub cmd_help()
@@ -98,7 +124,7 @@ sub cmd_help()
 	$_ =~ s/_/-/g foreach (@cmds, @devs);
 	print STDERR "Usage: ./inspircd (" . join("|", @cmds) . ")\n";
 	print STDERR "Developer arguments: (" . join("|", @devs) . ")\n";
-	exit 0;
+	exit GENERIC_EXIT_SUCCESS;
 }
 
 sub cmd_status()
@@ -106,10 +132,10 @@ sub cmd_status()
 	if (getstatus() == 1) {
 		my $pid = getprocessid();
 		print "InspIRCd is running (PID: $pid)\n";
-		exit();
+		exit STATUS_EXIT_SUCCESS;
 	} else {
 		print "InspIRCd is not running. (Or PID File not found)\n";
-		exit();
+		exit STATUS_EXIT_NOT_RUNNING;
 	}
 }
 
@@ -119,43 +145,43 @@ sub cmd_rehash()
 		my $pid = getprocessid();
 		system("kill -HUP $pid >/dev/null 2>&1");
 		print "InspIRCd rehashed (pid: $pid).\n";
-		exit();
+		exit GENERIC_EXIT_SUCCESS;
 	} else {
 		print "InspIRCd is not running. (Or PID File not found)\n";
-		exit();
+		exit GENERIC_EXIT_NOT_RUNNING;
 	}
 }
 
 sub cmd_cron()
 {
-	if (getstatus() == 0) { goto &cmd_start(); }
-	exit();
+	if (getstatus() == 0) { goto &cmd_start(@_); }
+	exit GENERIC_EXIT_UNSPECIFIED;
 }
 
 sub cmd_version()
 {
 	print "InspIRCd version: $version\n";
-	exit();
+	exit GENERIC_EXIT_SUCCESS;
 }
 
 sub cmd_restart(@)
 {
 	cmd_stop();
 	unlink($pidfile) if (-e $pidfile);
-	goto &cmd_start;
+	goto &cmd_start(@_);
 }
 
 sub hid_cheese_sandwich()
 {
 	print "Creating Cheese Sandwich..\n";
 	print "Done.\n";
-	exit();
+	exit GENERIC_EXIT_SUCCESS;
 }
 
 sub cmd_start(@)
 {
 	# Check to see its not 'running' already.
-	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; exit GENERIC_EXIT_SUCCESS; }
 	# If we are still alive here.. Try starting the IRCd..
 	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
@@ -178,7 +204,7 @@ sub dev_debug(@)
 	checkgdb();
 
 	# If we are still alive here.. Try starting the IRCd..
-	exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(--nofork --debug), @_;
+	exec 'gdb', "--command=$scriptpath/.gdbargs", '--args', "$binpath/$executable", qw(--nofork --debug), @_;
 	die "Failed to start GDB: $!\n";
 }
 
@@ -197,7 +223,7 @@ sub dev_screendebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec qw(screen -m -d gdb), "--command=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(screen -m -d gdb), "--command=$scriptpath/.gdbargs", '-args', "$binpath/$executable", qw(--nofork --debug --nolog), @_;
 	die "Failed to start screen: $!\n";
 }
 
@@ -217,7 +243,7 @@ sub dev_valdebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
 	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
-	exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
 	die "Failed to start valgrind: $!\n";
 }
 
@@ -251,7 +277,7 @@ sub dev_valdebug_unattended(@)
 		sysopen STDERR, "$valgrindlogpath/valdebug.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0666 or die "Can't open $valgrindlogpath/valdebug.$suffix: $!\n";
 	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
 	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
-		exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
+		exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=30 --track-fds=yes),
 			"--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
 			qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
 			"$binpath/$executable", qw(--nofork --debug --nolog), @_;
@@ -276,13 +302,13 @@ sub dev_screenvaldebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
 	die "Failed to start screen: $!\n";
 }
 
 sub cmd_stop()
 {
-	if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
+	if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return GENERIC_EXIT_SUCCESS; }
 	# Get to here, we have something to kill.
 	my $pid = getprocessid();
 	print "Stopping InspIRCd (pid: $pid)...\n";
@@ -292,12 +318,12 @@ sub cmd_stop()
 		sleep 1;
 		if (getstatus() == 0) {
 			print "InspIRCd Stopped.\n";
-			return;
+			return GENERIC_EXIT_SUCCESS;
 		}
 	}
 	print "InspIRCd not dying quietly -- forcing kill\n";
 	kill KILL => $pid;
-	return 0;
+	return GENERIC_EXIT_SUCCESS;
 }
 
 ###
@@ -382,7 +408,7 @@ sub getpidfile
 	}
 
 	# End of includes / No includes found. Using default.
-	$pidfile = $runpath . "/data/inspircd.pid";
+	$pidfile = $datadir . "/inspircd.pid";
 }
 
 sub getstatus {
@@ -408,7 +434,7 @@ sub checkvalgrind
 	unless(`valgrind --version`)
 	{
 		print "Couldn't start valgrind: $!\n";
-		exit;
+		exit GENERIC_EXIT_UNSPECIFIED;
 	}
 }
 
@@ -417,7 +443,7 @@ sub checkgdb
 	unless(`gdb --version`)
 	{
 		print "Couldn't start gdb: $!\n";
-		exit;
+		exit GENERIC_EXIT_UNSPECIFIED;
 	}
 }
 
@@ -426,6 +452,6 @@ sub checkscreen
 	unless(`screen --version`)
 	{
 		print "Couldn't start screen: $!\n";
-		exit;
+		exit GENERIC_EXIT_UNSPECIFIED;
 	}
 }