X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Finspircd;h=c50d28c7fa0c337f3fa81417085f605be2c949a1;hb=ce05e885a9258139eb7b076c29a70b5f8d366209;hp=138de29a9cfdb4ef6eb060bff65fe11bbfca4007;hpb=8ceae7ec0fc73baa0d871708d5ab004c6923ac1f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/template/inspircd b/make/template/inspircd index 138de29a9..c50d28c7f 100644 --- a/make/template/inspircd +++ b/make/template/inspircd @@ -1,10 +1,23 @@ %mode 0750 #!/usr/bin/env perl - # # InspIRCd -- Internet Relay Chat Daemon # +# Copyright (C) 2015 Steven Van Acker +# Copyright (C) 2015 Attila Molnar +# Copyright (C) 2014 Dan Parsons +# Copyright (C) 2013-2014, 2016-2019 Sadie Powell +# Copyright (C) 2012 Robby +# Copyright (C) 2012 Adam +# Copyright (C) 2011 DjSlash # Copyright (C) 2009-2010 Daniel De Graaf +# Copyright (C) 2008-2009 Robin Burchell +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2007 Dennis Friis +# Copyright (C) 2006 Oliver Lupton +# Copyright (C) 2006 John Brooks +# Copyright (C) 2005-2006, 2008-2009 Craig Edwards +# Copyright (C) 2005 Craig McLure # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public @@ -48,17 +61,33 @@ use constant { GENERIC_EXIT_NOT_RUNNING => 7 }; +my $scriptpath = "@SCRIPT_DIR@"; my $basepath = "@BASE_DIR@"; -my $confpath = "@CONFIG_DIR@/"; +my $confpath = "@CONFIG_DIR@"; my $binpath = "@BINARY_DIR@"; -my $runpath = "@BASE_DIR@"; -my $datadir = "@DATA_DIR@"; +my $runtimedir = "@RUNTIME_DIR@"; my $valgrindlogpath = "$basepath/valgrindlogs"; my $executable = "inspircd"; -my $version = "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@"; +my $version = "@VERSION_FULL@"; my $uid = "@UID@"; -if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) { +my @gdbargs = ( + '--eval-command', 'handle SIGPIPE pass nostop noprint', + '--eval-command', 'handle SIGHUP pass nostop noprint', + '--eval-command', 'run', + '--args', "$binpath/$executable", qw(--nofork --nolog --debug) +); + +sub expand_fragment($$) { + my ($base, $fragment) = @_; + if ($fragment =~ /^\//) { + return $fragment; + } else { + return "$base/$fragment"; + } +} + +if (!(grep { $_ eq '--runasroot' } @ARGV) && ($< == 0 || $> == 0)) { if ($uid !~ /^\d+$/) { # Named UID, look it up $uid = getpwnam $uid; @@ -87,7 +116,7 @@ for my $a (@ARGV) } } if (!defined $conf) { - $conf = $confpath . "inspircd.conf"; + $conf = expand_fragment $confpath, "inspircd.conf"; push @ARGV, '--config='.$conf; } @@ -119,8 +148,8 @@ sub cmd_help() my @cmds = grep /^cmd_/, @subs; my @devs = grep /^dev_/, @subs; local $_; - $_ =~ s/^(cmd|dev)_// foreach (@cmds, @devs); - $_ =~ s/_/-/g foreach (@cmds, @devs); + $_ =~ s/^(cmd|dev)_// for (@cmds, @devs); + $_ =~ s/_/-/g for (@cmds, @devs); print STDERR "Usage: ./inspircd (" . join("|", @cmds) . ")\n"; print STDERR "Developer arguments: (" . join("|", @devs) . ")\n"; exit GENERIC_EXIT_SUCCESS; @@ -142,7 +171,7 @@ sub cmd_rehash() { if (getstatus() == 1) { my $pid = getprocessid(); - system("kill -HUP $pid >/dev/null 2>&1"); + kill HUP => $pid; print "InspIRCd rehashed (pid: $pid).\n"; exit GENERIC_EXIT_SUCCESS; } else { @@ -153,7 +182,7 @@ sub cmd_rehash() sub cmd_cron() { - if (getstatus() == 0) { goto &cmd_start(); } + if (getstatus() == 0) { goto &cmd_start(@_); } exit GENERIC_EXIT_UNSPECIFIED; } @@ -167,7 +196,7 @@ sub cmd_restart(@) { cmd_stop(); unlink($pidfile) if (-e $pidfile); - goto &cmd_start; + goto &cmd_start(@_); } sub hid_cheese_sandwich() @@ -181,8 +210,8 @@ sub cmd_start(@) { # Check to see its not 'running' already. 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"); print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable"); @@ -195,7 +224,6 @@ sub dev_debug(@) # Check to see its not 'running' already. if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; } - chdir $runpath; print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable"); print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable"); @@ -203,7 +231,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', @gdbargs, @_; die "Failed to start GDB: $!\n"; } @@ -212,7 +240,6 @@ sub dev_screendebug(@) # Check to see its not 'running' already. if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; } - chdir $runpath; print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable"); #Check we have gdb @@ -222,7 +249,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), @gdbargs, @_; die "Failed to start screen: $!\n"; } @@ -231,7 +258,6 @@ sub dev_valdebug(@) # Check to see its not 'running' already. if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; } - chdir $runpath; print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable"); print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable"); @@ -252,7 +278,6 @@ sub dev_valdebug_unattended(@) # Check to see its not 'running' already. if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; } - chdir $runpath; print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable"); print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable"); @@ -289,7 +314,6 @@ sub dev_screenvaldebug(@) # Check to see its not 'running' already. if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; } - chdir $runpath; print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable"); print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable"); @@ -311,7 +335,7 @@ sub cmd_stop() # Get to here, we have something to kill. my $pid = getprocessid(); print "Stopping InspIRCd (pid: $pid)...\n"; - my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 90 : 15; + my $maxwait = (`ps -o command $pid 2>/dev/null` =~ /valgrind/i) ? 90 : 15; kill TERM => $pid or die "Cannot terminate IRCd: $!\n"; for (1..$maxwait) { sleep 1; @@ -329,18 +353,6 @@ sub cmd_stop() # Generic Helper Functions. ### -# GetPidfile Version 2 - Now With Include Support.. -# I beg for months for include support in insp, then.. -# when it is added, it comes around and BITES ME IN THE ASS, -# because i then have to code support into this script.. Evil. - -# Craig got bitten in the ass again -- -# in 1.1 beta the include file is manditory, therefore -# if we cant find it, default to %conf%/inspircd.pid. -# Note, this also contains a fix for when the pid file is -# defined, but defined in a comment (line starts with #) -# -- Brain - my %filesparsed; sub getpidfile @@ -350,11 +362,9 @@ sub getpidfile if ($pid ne "") { return; } - # Are We using a relative path? - if ($file !~ /^\//) { - # Convert it to a full path. - $file = $runpath .'/'. $file; - } + + # Expand any relative paths. + $file = expand_fragment $confpath, $file; # Have we checked this file before? return if $filesparsed{$file}; @@ -376,16 +386,7 @@ sub getpidfile if (($i =~ //i) && ($i !~ /^#/)) { # Set the PID file and return. - $pidfile = $1; - if (-f $pidfile) - { - return; - } - elsif (-f "$runpath/$pidfile") - { - $pidfile = "$runpath/$pidfile"; - return; - } + $pidfile = expand_fragment $runtimedir, $1; return; } } @@ -407,7 +408,7 @@ sub getpidfile } # End of includes / No includes found. Using default. - $pidfile = $datadir . "/inspircd.pid"; + $pidfile = $runtimedir . "/inspircd.pid"; } sub getstatus {