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

Lot de bugfixes pour Debian Compliance

This commit is contained in:
Alan Garcia 2013-02-18 18:09:43 +00:00
parent 51482b5240
commit 5134362254
13 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awstats/alternc-awstats
View File

@ -13,16 +13,13 @@ then
./awstats.cache.php ./awstats.cache.php
fi 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 ... CACHEDIR="/var/cache/awstats" # Dans la sarge par defaut les données awstats sont stockées dans /var/lib/awstats ...
mkdir -p $CACHEDIR mkdir -p $CACHEDIR
function searchdomain { function searchdomain {
U_ID=$(mysql_query "SELECT uid FROM aws WHERE hostname='$1'" | grep -v "^uid") 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") 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 if [ -d "$DOM_DIR" ] ; then
echo $(find -P "$DOM_DIR" -mindepth 1 -maxdepth 2 -type f -iname "*.log" -print0 | xargs -0) echo $(find -P "$DOM_DIR" -mindepth 1 -maxdepth 2 -type f -iname "*.log" -print0 | xargs -0)
fi fi

2
bureau/class/m_bro.php
View File

@ -114,7 +114,7 @@ class m_bro {
} else { } else {
// si on ne strip pas, il faut enlever le chemin rel // si on ne strip pas, il faut enlever le chemin rel
// et mettre la racine d'alternc pour viter les // 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)); $dir=$root_alternc . substr($dir,strlen($root));
} }
if (substr($dir,-1)=="/") { if (substr($dir,-1)=="/") {

2
debian/alternc-roundcube.dirs vendored
View File

@ -6,5 +6,5 @@ etc/alternc/templates/roundcube/plugins/password
etc/alternc/templates/apache2 etc/alternc/templates/apache2
etc/roundcube etc/roundcube
usr/lib/alternc/install.d usr/lib/alternc/install.d
var/alternc/bureau/class usr/share/alternc/panel/class
usr/share/roundcube/skins/default/images usr/share/roundcube/skins/default/images

6
debian/alternc-slave.config vendored
View File

@ -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`" 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" PUBLIC_IP="$INTERNAL_IP"
DEFAULT_MX="`cat /etc/mailname 2>/dev/null || hostname -f`" DEFAULT_MX="`cat /etc/mailname 2>/dev/null || hostname -f`"
ALTERNC_LOC=/var/alternc ALTERNC_HTML="/var/www/alternc/"
NS1_HOSTNAME="$FQDN" NS1_HOSTNAME="$FQDN"
NS2_HOSTNAME="$FQDN" NS2_HOSTNAME="$FQDN"
HOSTING="AlternC" HOSTING="AlternC"
@ -129,10 +129,10 @@ if [ -z "$RET" ]
db_set alternc-slave/sql/backup_overwrite "$SQLBACKUP_OVERWRITE" db_set alternc-slave/sql/backup_overwrite "$SQLBACKUP_OVERWRITE"
fi fi
db_get alternc-slave/alternc_location db_get alternc-slave/alternc_html
if [ -z "$RET" ] if [ -z "$RET" ]
then then
db_set alternc-slave/alternc_location "$ALTERNC_LOC" db_set alternc-slave/alternc_html "$ALTERNC_HTML"
fi fi
db_input medium alternc-slave/desktopname || true db_input medium alternc-slave/desktopname || true

4
debian/alternc-upnp.dirs vendored
View File

@ -1,6 +1,6 @@
etc/cron.d etc/cron.d
var/alternc/bureau/class/ usr/share/alternc/panel/class/
var/alternc/bureau/admin/ usr/share/alternc/panel/admin/
usr/lib/alternc/ usr/lib/alternc/
usr/lib/alternc/install.d usr/lib/alternc/install.d
usr/share/alternc/install/ usr/share/alternc/install/

4
debian/alternc.links vendored
View File

@ -1,3 +1,3 @@
/usr/share/alternc/install/alternc.install usr/sbin/alternc.install /usr/share/alternc/install/alternc.install usr/sbin/alternc.install
fr_FR var/alternc/bureau/locales/fr_CA fr_FR usr/share/alternc/panel/locales/fr_CA
en_US var/alternc/bureau/locales/en_GB en_US usr/share/alternc/panel/locales/en_GB

2
debian/alternc.postinst vendored
View File

@ -160,7 +160,7 @@ EOF
# Erase all apacheconf file # Erase all apacheconf file
# They will be regenerated without the bug by upgrade_check.sh below. # They will be regenerated without the bug by upgrade_check.sh below.
if dpkg --compare-versions "$2" le "0.9.3.9-globenet14"; then 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 fi
echo "checking for upgrades" echo "checking for upgrades"

2
debian/control vendored
View File

@ -54,7 +54,7 @@ Description: Hosting software managment suite for Debian
for the softwares used by it. for the softwares used by it.
. .
This package is designed for frontend nodes in a load balancing setup, where 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/ More information at http://www.alternc.com/
Homepage: http://www.alternc.com/ Homepage: http://www.alternc.com/

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

@ -49,7 +49,7 @@ PassivePorts 49152 65534
DenyAll DenyAll
</Directory> </Directory>
<Directory /var/alternc/html> <Directory %%ALTERNC_HTML%%>
Umask 022 022 Umask 022 022
AllowOverwrite on AllowOverwrite on
AllowAll AllowAll

2
install/alternc.install
View File

@ -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'`" 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/'`" FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
if [ "$FQDN_LETTER" = "$FQDN" ] if [ "$FQDN_LETTER" = "$FQDN" ]
then then

4
install/dopo.sh
View File

@ -10,10 +10,10 @@
# eg: alternc-procmailbuilder, alternc-mailman ... # eg: alternc-procmailbuilder, alternc-mailman ...
# $id$ # $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.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 # Each alternc.po file is build from a serie of .po files located in
# /var/alternc/bureau/locales/<lang>/LC_MESSAGES/*.po # /usr/share/alternc/panel/locales/<lang>/LC_MESSAGES/*.po
# main.txt is included before all others .po to construct a complete alternc.po file. # main.txt is included before all others .po to construct a complete alternc.po file.
# - Advantages : # - Advantages :

2
roundcube/Makefile
View File

@ -30,4 +30,4 @@ install:
# domaintype template: # domaintype template:
install -m 644 templates/apache2/roundcube.conf $(DESTDIR)/etc/alternc/templates/apache2/ install -m 644 templates/apache2/roundcube.conf $(DESTDIR)/etc/alternc/templates/apache2/
# Desktop files # 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/

6
upnp/Makefile
View File

@ -22,9 +22,9 @@
install: install:
# Desktop files # Desktop files
install -m 644 m_upnp.php $(DESTDIR)/var/alternc/bureau/class/ install -m 644 m_upnp.php $(DESTDIR)/usr/share/alternc/panel/class/
install -m 644 upnp_list.php upnp_change.php $(DESTDIR)/var/alternc/bureau/admin/ install -m 644 upnp_list.php upnp_change.php $(DESTDIR)/usr/share/alternc/panel/admin/
install -m 644 adminmenu_upnp.php $(DESTDIR)/var/alternc/bureau/admin/ install -m 644 adminmenu_upnp.php $(DESTDIR)/usr/share/alternc/panel/admin/
# Cron # Cron
install -m 755 update_upnp.sh $(DESTDIR)/usr/lib/alternc/ install -m 755 update_upnp.sh $(DESTDIR)/usr/lib/alternc/
# Install script # Install script