From 51482b5240a1c2ea7fca622bcc2c47cb91341399 Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Mon, 18 Feb 2013 17:53:24 +0000 Subject: [PATCH] Tjs bugfixes pour compliants --- debian/alternc.postinst | 4 ++-- debian/rules | 3 --- etc/alternc/templates/alternc/apache2.conf | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/alternc.postinst b/debian/alternc.postinst index bf32b49c..4a43ef0f 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -201,7 +201,7 @@ EOF echo "Creating alternc account" adduser --quiet --system --uid 342 --home $ALTERNC_HTML --shell /bin/false --ingroup adm alternc fi - chown alternc /var/alternc + chown alternc "$ALTERNC_USER_HOME" if [ -r ~root/.ssh/id_dsa.pub ]; then key=`cat ~root/.ssh/id_dsa.pub` if ! grep -q "$key" $ALTERNC_USER_HOME/.ssh/authorized_keys ; then @@ -251,7 +251,7 @@ EOF touch /var/run/alternc/refresh_slave /usr/lib/alternc/slave_dns # Apache will not start without this file - touch /var/alternc/apache-vhost/vhosts_all.conf + touch /var/lib/alternc/apache-vhost/vhosts_all.conf #sudo stuff allowing alterncpanel to use quota if [ -d /etc/sudoers.d ]; then diff --git a/debian/rules b/debian/rules index ba652baa..403860ce 100755 --- a/debian/rules +++ b/debian/rules @@ -67,9 +67,6 @@ install: build chown -R www-data:www-data debian/alternc/var/log/alternc debian/alternc/var/alternc/tmp chmod a+x debian/alternc/usr/share/alternc/install/alternc.install debian/alternc/usr/share/alternc/install/dopo.sh debian/alternc/usr/share/alternc/install/mysql.sh debian/alternc/usr/share/alternc/install/newone.php debian/alternc/usr/share/alternc/install/reset_root.php debian/alternc/usr/share/alternc/install/upgrade_check.sh debian/alternc/usr/share/alternc/install/upgrades/*.php debian/alternc/usr/share/alternc/install/upgrades/*.sh - #log directory - mkdir -p debian/alternc/var/alternc/logs - chown 1999:1999 debian/alternc/var/alternc/logs mkdir -p debian/alternc/var/run/alternc/ chown 1999:1999 debian/alternc/var/run/alternc/ diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf index 66240a61..ddbdd181 100644 --- a/etc/alternc/templates/alternc/apache2.conf +++ b/etc/alternc/templates/alternc/apache2.conf @@ -70,4 +70,4 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ -Include /var/alternc/apache-vhost/vhosts_all.conf +Include /var/lib/alternc/apache-vhost/vhosts_all.conf