kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[fix] replacing /var/run by /run everywhere we can (not everywhere: postfix chroot or old compatibility is maintained

This commit is contained in:
Benjamin Sonntag 2018-07-04 17:42:42 +02:00
parent cdd0bfd0fa
commit 2ad744ecc7
24 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/panel/bootstrap.php
View File

@ -13,7 +13,7 @@ if(isset($L_ALTERNC_LOGS_ARCHIVE))
define('ALTERNC_LOGS', "$L_ALTERNC_LOGS"); define('ALTERNC_LOGS', "$L_ALTERNC_LOGS");
define('ALTERNC_PANEL', "/usr/share/alternc/panel"); define('ALTERNC_PANEL', "/usr/share/alternc/panel");
define('ALTERNC_LOCALES', ALTERNC_PANEL."/locales"); define('ALTERNC_LOCALES', ALTERNC_PANEL."/locales");
define('ALTERNC_LOCK_JOBS', '/var/run/alternc/jobs-lock'); define('ALTERNC_LOCK_JOBS', '/run/alternc/jobs-lock');
define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock'); define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock');
/* PHPLIB inclusions : */ /* PHPLIB inclusions : */

2
bureau/class/config.php
View File

@ -87,7 +87,7 @@ if (isset($L_ALTERNC_LOGS_ARCHIVE)) {
define('ALTERNC_LOGS', "$L_ALTERNC_LOGS"); define('ALTERNC_LOGS', "$L_ALTERNC_LOGS");
define('ALTERNC_PANEL', "/usr/share/alternc/panel"); define('ALTERNC_PANEL', "/usr/share/alternc/panel");
define('ALTERNC_LOCALES', ALTERNC_PANEL . "/locales"); define('ALTERNC_LOCALES', ALTERNC_PANEL . "/locales");
define('ALTERNC_LOCK_JOBS', '/var/run/alternc/jobs-lock'); define('ALTERNC_LOCK_JOBS', '/run/alternc/jobs-lock');
define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock'); define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock');
define('ALTERNC_APACHE2_GEN_TMPL_DIR', '/etc/alternc/templates/apache2/'); define('ALTERNC_APACHE2_GEN_TMPL_DIR', '/etc/alternc/templates/apache2/');
define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/"); define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/");

4
bureau/class/m_dom.php
View File

@ -18,7 +18,7 @@
---------------------------------------------------------------------- ----------------------------------------------------------------------
*/ */
define('SLAVE_FLAG', "/var/run/alternc/refresh_slave"); define('SLAVE_FLAG', "/run/alternc/refresh_slave");
/** /**
* Classe de gestion des domaines de l'hébergé. * Classe de gestion des domaines de l'hébergé.
@ -54,7 +54,7 @@ class m_dom {
* du domaine par update_domains.sh * du domaine par update_domains.sh
* @access private * @access private
*/ */
var $fic_lock_cron = "/var/run/alternc/cron.lock"; var $fic_lock_cron = "/run/alternc/cron.lock";
/** /**
* Le cron a-t-il été bloqué ? * Le cron a-t-il été bloqué ?

4
debian/alternc.cron.d vendored
View File

@ -1,8 +1,8 @@
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Create /var/run/ folder : it may be a ramdrive # Create /run/ folder : it may be a ramdrive
@reboot root mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc @reboot root mkdir -p /run/alternc && chown alterncpanel:alterncpanel /run/alternc
# Every 2 days compress log files # Every 2 days compress log files
0 4 * * * alterncpanel /usr/lib/alternc/compress_logs.sh 0 4 * * * alterncpanel /usr/lib/alternc/compress_logs.sh

8
debian/alternc.postinst vendored
View File

@ -113,10 +113,10 @@ SQLBACKUP_OVERWRITE=""
ALTERNC_SLAVES="" ALTERNC_SLAVES=""
# File to look at for forced launch of update_domain (use incron) # File to look at for forced launch of update_domain (use incron)
INOTIFY_UPDATE_DOMAIN="/var/run/alternc/inotify_update_domain.lock" INOTIFY_UPDATE_DOMAIN="/run/alternc/inotify_update_domain.lock"
# File to look at for forced launch of do_actions (use incron) # File to look at for forced launch of do_actions (use incron)
INOTIFY_DO_ACTION="/var/run/alternc/inotify_do_action.lock" INOTIFY_DO_ACTION="/run/alternc/inotify_do_action.lock"
# AlternC Locations # AlternC Locations
ALTERNC_HTML="" ALTERNC_HTML=""
@ -251,8 +251,8 @@ NFS_QUOTA=no" >> $CONFIGFILE
touch /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf touch /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf
chown root:bind /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf chown root:bind /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf
chmod 640 /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf chmod 640 /var/lib/alternc/bind/automatic.conf /var/lib/alternc/bind/slaveip.conf
mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc mkdir -p /run/alternc && chown alterncpanel:alterncpanel /run/alternc
touch /var/run/alternc/refresh_slave touch /run/alternc/refresh_slave
/usr/lib/alternc/slave_dns /usr/lib/alternc/slave_dns
# Apache will not start without this file # Apache will not start without this file
touch /var/lib/alternc/apache-vhost/vhosts_all.conf touch /var/lib/alternc/apache-vhost/vhosts_all.conf

2
etc/alternc/templates/alternc/apache2.conf
View File

@ -33,7 +33,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
php_value post_max_size 50M php_value post_max_size 50M
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
# open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman... # open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman...
php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/run/alternc:/var/run/alternc/:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%:/etc/awstats/:/var/log/alternc/:/var/lib/alternc/panel/ php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/run/alternc:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%:/etc/awstats/:/var/log/alternc/:/var/lib/alternc/panel/
</Directory> </Directory>

4
etc/alternc/templates/apache2/envvars
View File

@ -20,8 +20,8 @@ fi
# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc. # /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
export APACHE_RUN_USER=www-data export APACHE_RUN_USER=www-data
export APACHE_RUN_GROUP=www-data export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/var/run/apache2$SUFFIX.pid export APACHE_PID_FILE=/run/apache2$SUFFIX.pid
export APACHE_RUN_DIR=/var/run/apache2$SUFFIX export APACHE_RUN_DIR=/run/apache2$SUFFIX
export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2. # Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
export APACHE_LOG_DIR=/var/log/apache2$SUFFIX export APACHE_LOG_DIR=/var/log/apache2$SUFFIX

6
etc/alternc/templates/default/opendkim
View File

@ -4,10 +4,10 @@
# Command-line options specified here will override the contents of # Command-line options specified here will override the contents of
# /etc/opendkim.conf. See opendkim(8) for a complete list of options. # /etc/opendkim.conf. See opendkim(8) for a complete list of options.
#DAEMON_OPTS="" #DAEMON_OPTS=""
# Change to /var/spool/postfix/var/run/opendkim to use a Unix socket with # Change to /var/spool/postfix/run/opendkim to use a Unix socket with
# postfix in a chroot: # postfix in a chroot:
#RUNDIR=/var/spool/postfix/var/run/opendkim #RUNDIR=/var/spool/postfix/run/opendkim
RUNDIR=/var/run/opendkim RUNDIR=/run/opendkim
# #
# Uncomment to specify an alternate socket # Uncomment to specify an alternate socket
# Note that setting this will override any Socket value in opendkim.conf # Note that setting this will override any Socket value in opendkim.conf

2
etc/alternc/templates/dovecot/alternc-sql.conf
View File

@ -57,7 +57,7 @@ driver = mysql
# the default my.cnf location # the default my.cnf location
# option_group - Read options from the given group (default: client) # option_group - Read options from the given group (default: client)
# #
# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock # You can connect to UNIX sockets by using host: host=/run/mysql.sock
# Note that currently you can't use spaces in parameters. # Note that currently you can't use spaces in parameters.
# #
# sqlite: # sqlite:

2
etc/alternc/templates/dovecot/conf.d/95_alternc.conf
View File

@ -182,7 +182,7 @@ protocol lda {
# UNIX socket path to master authentication server to find users. # UNIX socket path to master authentication server to find users.
auth_socket_path = /var/run/dovecot/auth-master auth_socket_path = /run/dovecot/auth-master
} }

2
etc/incron.d/alternc_do_action
View File

@ -1 +1 @@
/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_do_actions.sh /run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_do_actions.sh

2
etc/incron.d/alternc_update_domains
View File

@ -1 +1 @@
/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_update_domains.sh /run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_update_domains.sh

2
install/alternc.install
View File

@ -157,7 +157,7 @@ chown :alterncpanel /etc/alternc/local.sh
. /etc/alternc/local.sh . /etc/alternc/local.sh
# May be missing # May be missing
test -d /var/run/alternc || ( mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc ) test -d /run/alternc || ( mkdir -p /run/alternc && chown alterncpanel:alterncpanel /run/alternc )
# Create the target directory # Create the target directory
for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do

4
install/upgrades/3.0.0~4.sh
View File

@ -6,9 +6,9 @@
if [ -z "$INOTIFY_UPDATE_DOMAIN" ] ; then if [ -z "$INOTIFY_UPDATE_DOMAIN" ] ; then
/bin/echo -e ' /bin/echo -e '
# File to look at for forced launch of update_domain (use incron) # File to look at for forced launch of update_domain (use incron)
INOTIFY_UPDATE_DOMAIN="/var/run/alternc/inotify_update_domain.lock" INOTIFY_UPDATE_DOMAIN="/run/alternc/inotify_update_domain.lock"
' >> /etc/alternc/local.sh ' >> /etc/alternc/local.sh
fi fi
mkdir -p /var/run/alternc && chown alterncpanel /var/run/alternc mkdir -p /run/alternc && chown alterncpanel /run/alternc

2
phpunit/bootstrap.php
View File

@ -60,7 +60,7 @@ if(isset($L_ALTERNC_LOGS_ARCHIVE)){
define('ALTERNC_LOGS_ARCHIVE', "$L_ALTERNC_LOGS_ARCHIVE"); define('ALTERNC_LOGS_ARCHIVE', "$L_ALTERNC_LOGS_ARCHIVE");
} }
if( !defined("ALTERNC_LOCALES") ) { define('ALTERNC_LOCALES', ALTERNC_PANEL."/locales"); }; if( !defined("ALTERNC_LOCALES") ) { define('ALTERNC_LOCALES', ALTERNC_PANEL."/locales"); };
if( !defined("ALTERNC_LOCK_JOBS") ) { define('ALTERNC_LOCK_JOBS', '/var/run/alternc/jobs-lock'); }; if( !defined("ALTERNC_LOCK_JOBS") ) { define('ALTERNC_LOCK_JOBS', '/run/alternc/jobs-lock'); };
if( !defined("ALTERNC_LOCK_PANEL") ) { define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock'); }; if( !defined("ALTERNC_LOCK_PANEL") ) { define('ALTERNC_LOCK_PANEL', '/var/lib/alternc/panel/nologin.lock'); };
if( !defined("ALTERNC_APACHE2_GEN_TMPL_DIR") ) { define('ALTERNC_APACHE2_GEN_TMPL_DIR', '/etc/alternc/templates/apache2/'); }; if( !defined("ALTERNC_APACHE2_GEN_TMPL_DIR") ) { define('ALTERNC_APACHE2_GEN_TMPL_DIR', '/etc/alternc/templates/apache2/'); };
if( !defined("ALTERNC_VHOST_DIR") ) { define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/"); }; if( !defined("ALTERNC_VHOST_DIR") ) { define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/"); };

2
src/cron_users.sh
View File

@ -9,7 +9,7 @@
require_once("/usr/share/alternc/panel/class/config_nochk.php"); require_once("/usr/share/alternc/panel/class/config_nochk.php");
ini_set("display_errors", 1); ini_set("display_errors", 1);
if (file_exists("/var/run/alternc/jobs-lock")) { if (file_exists("/run/alternc/jobs-lock")) {
echo "jobs-lock exists, did you ran alternc.install?\n"; echo "jobs-lock exists, did you ran alternc.install?\n";
echo "canceling cron_users\n"; echo "canceling cron_users\n";
exit(1); exit(1);

2
src/do_actions.php
View File

@ -57,7 +57,7 @@ require_once("/usr/share/alternc/panel/class/config_nochk.php");
$admin->stop_if_jobs_locked(); $admin->stop_if_jobs_locked();
if( !defined("ALTERNC_DO_ACTION_LOCK")){ if( !defined("ALTERNC_DO_ACTION_LOCK")){
define("ALTERNC_DO_ACTION_LOCK",'/var/run/alternc/do_actions_cron.lock'); define("ALTERNC_DO_ACTION_LOCK",'/run/alternc/do_actions_cron.lock');
} }
$SCRIPT='/usr/bin/php do_actions.php'; $SCRIPT='/usr/bin/php do_actions.php';

2
src/functions.sh
View File

@ -32,7 +32,7 @@ mysql_query() { /usr/bin/mysql --defaults-file=/etc/alternc/my.cnf -Bs -e "$@" ;
DOMAIN_LOG_FILE="/var/log/alternc/update_domains.log" DOMAIN_LOG_FILE="/var/log/alternc/update_domains.log"
VHOST_FILE="$VHOST_DIR/vhosts_all.conf" VHOST_FILE="$VHOST_DIR/vhosts_all.conf"
VHOST_MANUALCONF="$VHOST_DIR/manual/" VHOST_MANUALCONF="$VHOST_DIR/manual/"
LOCK_JOBS="/var/run/alternc/jobs-lock" LOCK_JOBS="/run/alternc/jobs-lock"
# Some useful miscellaneous shell functions # Some useful miscellaneous shell functions

2
src/slave_dns
View File

@ -4,7 +4,7 @@
# with the IP of the slave dns # with the IP of the slave dns
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
FLAGFILE="/var/run/alternc/refresh_slave"; FLAGFILE="/run/alternc/refresh_slave";
TPL="/etc/alternc/templates/bind/slaveip.conf" TPL="/etc/alternc/templates/bind/slaveip.conf"
TARGET="/var/lib/alternc/bind/slaveip.conf" TARGET="/var/lib/alternc/bind/slaveip.conf"

2
src/update_mails.sh
View File

@ -15,7 +15,7 @@ done
stop_if_jobs_locked stop_if_jobs_locked
LOCK_FILE="/var/run/alternc/update_mails" LOCK_FILE="/run/alternc/update_mails"
# ALTERNC_MAIL is from local.sh # ALTERNC_MAIL is from local.sh

4
stretch/opendkim.conf
View File

@ -31,7 +31,7 @@ UMask 007
# ## local:/path/to/socket to listen on a UNIX domain socket # ## local:/path/to/socket to listen on a UNIX domain socket
# #
#Socket inet:8892@localhost #Socket inet:8892@localhost
Socket local:/var/run/opendkim/opendkim.sock Socket local:/run/opendkim/opendkim.sock
## PidFile filename ## PidFile filename
### default (none) ### default (none)
@ -39,7 +39,7 @@ Socket local:/var/run/opendkim/opendkim.sock
### Name of the file where the filter should write its pid before beginning ### Name of the file where the filter should write its pid before beginning
### normal operations. ### normal operations.
# #
PidFile /var/run/opendkim/opendkim.pid PidFile /run/opendkim/opendkim.pid
# Always oversign From (sign using actual From and a null From to prevent # Always oversign From (sign using actual From and a null From to prevent

2
tools/top_ftp_users
View File

@ -45,7 +45,7 @@ LOG_FILE=$LOG_DIR/xferlog
TMP_ROOT=$ALTERNC_ROOT/tmp TMP_ROOT=$ALTERNC_ROOT/tmp
RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$ RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$
INTERMEDIATE_FILE=$TMP_ROOT/$PROG_NAME.int.$$ INTERMEDIATE_FILE=$TMP_ROOT/$PROG_NAME.int.$$
LOCK_FILE=/var/run/$PROG_NAME LOCK_FILE=/run/$PROG_NAME
export TEXTDOMAIN=alternc-admintools export TEXTDOMAIN=alternc-admintools
YES=yes YES=yes
NO=no NO=no

2
tools/top_http_users
View File

@ -40,7 +40,7 @@ LOG_DIR=/var/log/apache
TMP_ROOT=$ALTERNC_ROOT/tmp TMP_ROOT=$ALTERNC_ROOT/tmp
RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$ RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$
INTERMEDIATE_FILE=$TMP_ROOT/$PROG_NAME.int.$$ INTERMEDIATE_FILE=$TMP_ROOT/$PROG_NAME.int.$$
LOCK_FILE=/var/run/$PROG_NAME LOCK_FILE=/run/$PROG_NAME
export TEXTDOMAIN=alternc-admintools export TEXTDOMAIN=alternc-admintools
YES=yes YES=yes
NO=no NO=no

2
tools/top_mysql_users
View File

@ -40,7 +40,7 @@ LOG_DIR=/var/log
LOG_FILE=$LOG_DIR/mysql.log LOG_FILE=$LOG_DIR/mysql.log
TMP_ROOT=$ALTERNC_ROOT/tmp TMP_ROOT=$ALTERNC_ROOT/tmp
RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$ RES_FILE=$TMP_ROOT/$PROG_NAME.res.$$
LOCK_FILE=/var/run/$PROG_NAME LOCK_FILE=/run/$PROG_NAME
export TEXTDOMAIN=alternc-admintools export TEXTDOMAIN=alternc-admintools
YES=yes YES=yes
NO=no NO=no