diff --git a/Rocksolid_Light/rocksolid/config.inc.php b/Rocksolid_Light/rocksolid/config.inc.php index 1ec46bb..87694e4 100644 --- a/Rocksolid_Light/rocksolid/config.inc.php +++ b/Rocksolid_Light/rocksolid/config.inc.php @@ -28,6 +28,7 @@ $script_path = $config_dir."/scripts/"; $CONFIG = include($config_file); $logdir=$spooldir.'/log'; +$lockdir=$spooldir.'/lock'; ini_set('error_reporting', E_ERROR ); diff --git a/Rocksolid_Light/rslight/scripts/expire.php b/Rocksolid_Light/rslight/scripts/expire.php index fd476a3..06b6a53 100755 --- a/Rocksolid_Light/rslight/scripts/expire.php +++ b/Rocksolid_Light/rslight/scripts/expire.php @@ -6,7 +6,7 @@ if(filemtime($spooldir.'/'.$config_name.'-expire-timer')+86400 > time()) { exit; } - $lockfile = sys_get_temp_dir() . '/'.$config_name.'-spoolnews.lock'; + $lockfile = $lockdir . '/'.$config_name.'-spoolnews.lock'; $pid = file_get_contents($lockfile); if (posix_getsid($pid) === false || !is_file($lockfile)) { print "Starting expire...\n"; diff --git a/Rocksolid_Light/rslight/scripts/import-db3.php b/Rocksolid_Light/rslight/scripts/import-db3.php index 3891882..31faca7 100755 --- a/Rocksolid_Light/rslight/scripts/import-db3.php +++ b/Rocksolid_Light/rslight/scripts/import-db3.php @@ -27,7 +27,7 @@ $logfile=$logdir.'/import.log'; $workpath=$spooldir."/"; $path=$workpath."articles/"; -$lockfile = sys_get_temp_dir() . '/'.$config_name.'-spoolnews.lock'; +$lockfile = $lockdir . '/'.$config_name.'-spoolnews.lock'; $pid = file_get_contents($lockfile); if (posix_getsid($pid) === false || !is_file($lockfile)) { print "Starting Import...\n"; diff --git a/Rocksolid_Light/rslight/scripts/nntp-ssl.php b/Rocksolid_Light/rslight/scripts/nntp-ssl.php index ca01a45..e30b2e0 100755 --- a/Rocksolid_Light/rslight/scripts/nntp-ssl.php +++ b/Rocksolid_Light/rslight/scripts/nntp-ssl.php @@ -4,7 +4,7 @@ include $config_dir."/scripts/rslight-lib.php"; if(file_exists($config_dir."/nntp.disable")) { clearstatcache(true, $config_dir."/nntp.disable"); - $parent_pid = file_get_contents(sys_get_temp_dir().'/rslight-nntp.lock', IGNORE_NEW_LINES); + $parent_pid = file_get_contents($lockdir.'/rslight-nntp.lock', IGNORE_NEW_LINES); posix_kill($parent_pid, SIGTERM); exit; } @@ -57,10 +57,10 @@ { GLOBAL $__server_listening; GLOBAL -$CONFIG,$logdir,$webserver_uid,$webserver_gid,$installed_path, +$CONFIG,$logdir,$lockdir,$webserver_uid,$webserver_gid,$installed_path, $config_path,$groupconfig,$workpath,$path,$spooldir,$nntp_group,$auth_ok; $logfile=$logdir.'/nntp.log'; - $lockfile = sys_get_temp_dir() . '/rslight-nntp-ssl.lock'; + $lockfile = $lockdir . '/rslight-nntp-ssl.lock'; $pid = file_get_contents($lockfile); if (posix_getsid($pid) === false || !is_file($lockfile)) { print "Starting Rocksolid Light NNTP Server...\n"; diff --git a/Rocksolid_Light/rslight/scripts/nntp.php b/Rocksolid_Light/rslight/scripts/nntp.php index a5a92b1..6aaa84c 100755 --- a/Rocksolid_Light/rslight/scripts/nntp.php +++ b/Rocksolid_Light/rslight/scripts/nntp.php @@ -4,7 +4,7 @@ include $config_dir."/scripts/rslight-lib.php"; if(file_exists($config_dir."/nntp.disable")) { clearstatcache(true, $config_dir."/nntp.disable"); - $parent_pid = file_get_contents(sys_get_temp_dir().'/rslight-nntp.lock', IGNORE_NEW_LINES); + $parent_pid = file_get_contents($lockdir.'/rslight-nntp.lock', IGNORE_NEW_LINES); posix_kill($parent_pid, SIGTERM); exit; } @@ -56,11 +56,11 @@ function server_loop($address, $port) { GLOBAL $__server_listening; - GLOBAL -$CONFIG,$logdir,$webserver_uid,$webserver_gid,$installed_path, + GLOBAL +$CONFIG,$logdir,$lockdir,$webserver_uid,$webserver_gid,$installed_path, $config_path,$groupconfig,$workpath,$path,$spooldir,$nntp_group,$auth_ok; $logfile=$logdir.'/nntp.log'; - $lockfile = sys_get_temp_dir() . '/rslight-nntp.lock'; + $lockfile = $lockdir . '/rslight-nntp.lock'; $pid = file_get_contents($lockfile); if (posix_getsid($pid) === false || !is_file($lockfile)) { print "Starting Rocksolid Light NNTP Server...\n"; diff --git a/Rocksolid_Light/rslight/scripts/nocem.php b/Rocksolid_Light/rslight/scripts/nocem.php index eddd268..7f566f1 100755 --- a/Rocksolid_Light/rslight/scripts/nocem.php +++ b/Rocksolid_Light/rslight/scripts/nocem.php @@ -7,7 +7,7 @@ exit; } - $lockfile = sys_get_temp_dir() . '/rslight-spoolnews.lock'; + $lockfile = $lockdir . '/rslight-spoolnews.lock'; $pid = file_get_contents($lockfile); if (posix_getsid($pid) === false || !is_file($lockfile)) { print "Starting nocem...\n"; diff --git a/Rocksolid_Light/rslight/scripts/rslight-lib.php b/Rocksolid_Light/rslight/scripts/rslight-lib.php index 7ce3158..76da579 100755 --- a/Rocksolid_Light/rslight/scripts/rslight-lib.php +++ b/Rocksolid_Light/rslight/scripts/rslight-lib.php @@ -1,7 +1,7 @@