diff --git a/awstats/alternc-awstats b/awstats/alternc-awstats index 5af133d8..739c4eca 100755 --- a/awstats/alternc-awstats +++ b/awstats/alternc-awstats @@ -13,16 +13,13 @@ then ./awstats.cache.php fi -# FIXME : set this var in local.sh -LOG_DIR="/var/alternc/logs" - CACHEDIR="/var/cache/awstats" # Dans la sarge par defaut les données awstats sont stockées dans /var/lib/awstats ... mkdir -p $CACHEDIR function searchdomain { U_ID=$(mysql_query "SELECT uid FROM aws WHERE hostname='$1'" | grep -v "^uid") U_LOGIN=$(mysql_query "SELECT login FROM membres WHERE uid='$U_ID'" |grep -v "^login") - DOM_DIR="$LOG_DIR/$U_ID-$U_LOGIN" + DOM_DIR="$ALTERNC_LOGS/$U_ID-$U_LOGIN" if [ -d "$DOM_DIR" ] ; then echo $(find -P "$DOM_DIR" -mindepth 1 -maxdepth 2 -type f -iname "*.log" -print0 | xargs -0) fi diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php index 03d825aa..8b955846 100644 --- a/bureau/class/m_bro.php +++ b/bureau/class/m_bro.php @@ -114,7 +114,7 @@ class m_bro { } else { // si on ne strip pas, il faut enlever le chemin rel // et mettre la racine d'alternc pour viter les - // problmes de lien depuis /var/alternc ! + // problmes de lien depuis /var /alternc ! $dir=$root_alternc . substr($dir,strlen($root)); } if (substr($dir,-1)=="/") { diff --git a/debian/alternc-roundcube.dirs b/debian/alternc-roundcube.dirs index 1f9c0bf6..e4d75171 100644 --- a/debian/alternc-roundcube.dirs +++ b/debian/alternc-roundcube.dirs @@ -6,5 +6,5 @@ etc/alternc/templates/roundcube/plugins/password etc/alternc/templates/apache2 etc/roundcube usr/lib/alternc/install.d -var/alternc/bureau/class +usr/share/alternc/panel/class usr/share/roundcube/skins/default/images diff --git a/debian/alternc-slave.config b/debian/alternc-slave.config index 38361862..2051f0b9 100644 --- a/debian/alternc-slave.config +++ b/debian/alternc-slave.config @@ -16,7 +16,7 @@ FQDN="`cat /etc/mailname 2>/dev/null || hostname -f`" INTERNAL_IP="`env LANG=C /sbin/ifconfig|grep inet | grep -v 127.0.0.1| head -1 | cut -d: -f2 | sed -e 's/\([0-9\.]*\).*$/\1/' 2>/dev/null || hostname -f`" PUBLIC_IP="$INTERNAL_IP" DEFAULT_MX="`cat /etc/mailname 2>/dev/null || hostname -f`" -ALTERNC_LOC=/var/alternc +ALTERNC_HTML="/var/www/alternc/" NS1_HOSTNAME="$FQDN" NS2_HOSTNAME="$FQDN" HOSTING="AlternC" @@ -129,10 +129,10 @@ if [ -z "$RET" ] db_set alternc-slave/sql/backup_overwrite "$SQLBACKUP_OVERWRITE" fi -db_get alternc-slave/alternc_location +db_get alternc-slave/alternc_html if [ -z "$RET" ] then -db_set alternc-slave/alternc_location "$ALTERNC_LOC" +db_set alternc-slave/alternc_html "$ALTERNC_HTML" fi db_input medium alternc-slave/desktopname || true diff --git a/debian/alternc-upnp.dirs b/debian/alternc-upnp.dirs index e19f6a1f..fa36b7dc 100644 --- a/debian/alternc-upnp.dirs +++ b/debian/alternc-upnp.dirs @@ -1,6 +1,6 @@ etc/cron.d -var/alternc/bureau/class/ -var/alternc/bureau/admin/ +usr/share/alternc/panel/class/ +usr/share/alternc/panel/admin/ usr/lib/alternc/ usr/lib/alternc/install.d usr/share/alternc/install/ diff --git a/debian/alternc.links b/debian/alternc.links index 366b9315..6214410a 100644 --- a/debian/alternc.links +++ b/debian/alternc.links @@ -1,3 +1,3 @@ /usr/share/alternc/install/alternc.install usr/sbin/alternc.install -fr_FR var/alternc/bureau/locales/fr_CA -en_US var/alternc/bureau/locales/en_GB +fr_FR usr/share/alternc/panel/locales/fr_CA +en_US usr/share/alternc/panel/locales/en_GB diff --git a/debian/alternc.postinst b/debian/alternc.postinst index 4a43ef0f..92bd97f2 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -160,7 +160,7 @@ EOF # Erase all apacheconf file # They will be regenerated without the bug by upgrade_check.sh below. if dpkg --compare-versions "$2" le "0.9.3.9-globenet14"; then - rm -f /var/alternc/apacheconf/*/* + rm -f /var/alternc/apacheconf/*/* # Old AlternC version fi echo "checking for upgrades" diff --git a/debian/control b/debian/control index 379f09a0..1f135813 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Description: Hosting software managment suite for Debian for the softwares used by it. . This package is designed for frontend nodes in a load balancing setup, where - the /var/alternc directory is not touched and managed over NFS. + the AlternC directory is not touched and managed over NFS. . More information at http://www.alternc.com/ Homepage: http://www.alternc.com/ diff --git a/etc/alternc/templates/proftpd/proftpd.conf b/etc/alternc/templates/proftpd/proftpd.conf index dddde27a..6ab929da 100644 --- a/etc/alternc/templates/proftpd/proftpd.conf +++ b/etc/alternc/templates/proftpd/proftpd.conf @@ -49,7 +49,7 @@ PassivePorts 49152 65534 DenyAll - + Umask 022 022 AllowOverwrite on AllowAll diff --git a/install/alternc.install b/install/alternc.install index be225eaf..6312d9f4 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -173,7 +173,7 @@ WARNING="WARNING: Do not edit this file, edit the one in /etc/alternc/templates VERSION="`dpkg -s alternc | sed -n -e 's/^Version: \(.*\)/\1/p'`" -# /var/alternc/dns/d/www.example.com +# /var/ alternc/dns/d/www.example.com FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`" if [ "$FQDN_LETTER" = "$FQDN" ] then diff --git a/install/dopo.sh b/install/dopo.sh index ab65e1d7..697e653f 100755 --- a/install/dopo.sh +++ b/install/dopo.sh @@ -10,10 +10,10 @@ # eg: alternc-procmailbuilder, alternc-mailman ... # $id$ # -# This script build one "alternc.mo" file per language in /var/alternc/bureau/locales/ +# This script build one "alternc.mo" file per language in /usr/share/alternc/panel/locales # Each alternc.mo file is build with msgfmt from a alternc.po file. # Each alternc.po file is build from a serie of .po files located in -# /var/alternc/bureau/locales//LC_MESSAGES/*.po +# /usr/share/alternc/panel/locales//LC_MESSAGES/*.po # main.txt is included before all others .po to construct a complete alternc.po file. # - Advantages : diff --git a/roundcube/Makefile b/roundcube/Makefile index 51cd2e91..b5bed00e 100644 --- a/roundcube/Makefile +++ b/roundcube/Makefile @@ -30,4 +30,4 @@ install: # domaintype template: install -m 644 templates/apache2/roundcube.conf $(DESTDIR)/etc/alternc/templates/apache2/ # Desktop files - install -o 1999 -g 1999 -m 644 class/m_roundcube.php $(DESTDIR)/var/alternc/bureau/class/ + install -o 1999 -g 1999 -m 644 class/m_roundcube.php $(DESTDIR)/usr/share/alternc/panel/class/ diff --git a/upnp/Makefile b/upnp/Makefile index 043b9abd..5b6601a2 100644 --- a/upnp/Makefile +++ b/upnp/Makefile @@ -22,9 +22,9 @@ install: # Desktop files - install -m 644 m_upnp.php $(DESTDIR)/var/alternc/bureau/class/ - install -m 644 upnp_list.php upnp_change.php $(DESTDIR)/var/alternc/bureau/admin/ - install -m 644 adminmenu_upnp.php $(DESTDIR)/var/alternc/bureau/admin/ + install -m 644 m_upnp.php $(DESTDIR)/usr/share/alternc/panel/class/ + install -m 644 upnp_list.php upnp_change.php $(DESTDIR)/usr/share/alternc/panel/admin/ + install -m 644 adminmenu_upnp.php $(DESTDIR)/usr/share/alternc/panel/admin/ # Cron install -m 755 update_upnp.sh $(DESTDIR)/usr/lib/alternc/ # Install script