/var/alternc specific instructions were removed from the wrong postinst
This commit is contained in:
parent
7b5c4d887f
commit
c2c91d5729
|
@ -157,13 +157,6 @@ EOF
|
|||
. $CONFIGFILE
|
||||
fi
|
||||
|
||||
# /var/alternc/dns/d/www.example.com
|
||||
FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
|
||||
if [ "$FQDN_LETTER" = "$FQDN" ]
|
||||
then
|
||||
FQDN_LETTER="_"
|
||||
fi
|
||||
|
||||
# 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
|
||||
|
@ -181,30 +174,12 @@ EOF
|
|||
echo "<?php $include_str ?>" >> $pma_config
|
||||
fi
|
||||
|
||||
# Add access to the management panel
|
||||
ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN
|
||||
|
||||
# Bind stuff
|
||||
touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
chown root:bind /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
touch /var/run/alternc/refresh_slave
|
||||
/usr/lib/alternc/slave_dns
|
||||
# Apache will not start without this file
|
||||
touch /var/alternc/apacheconf/override_php.conf
|
||||
|
||||
# Update l18n files
|
||||
/usr/share/alternc/install/dopo.sh
|
||||
|
||||
# important: postinst gele sans ca
|
||||
db_stop
|
||||
|
||||
echo "running alternc.install"
|
||||
alternc.install
|
||||
|
||||
# Add basedir protection
|
||||
/usr/lib/alternc/basedir_prot.sh
|
||||
|
||||
if [ -x /usr/sbin/apache ]; then
|
||||
if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then
|
||||
ln -sf /etc/alternc/apache-ssl.conf \
|
||||
|
|
|
@ -157,6 +157,13 @@ EOF
|
|||
. $CONFIGFILE
|
||||
fi
|
||||
|
||||
# /var/alternc/dns/d/www.example.com
|
||||
FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
|
||||
if [ "$FQDN_LETTER" = "$FQDN" ]
|
||||
then
|
||||
FQDN_LETTER="_"
|
||||
fi
|
||||
|
||||
# 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
|
||||
|
@ -174,12 +181,30 @@ EOF
|
|||
echo "<?php $include_str ?>" >> $pma_config
|
||||
fi
|
||||
|
||||
# Add access to the management panel
|
||||
ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN
|
||||
|
||||
# Bind stuff
|
||||
touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
chown root:bind /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
|
||||
touch /var/run/alternc/refresh_slave
|
||||
/usr/lib/alternc/slave_dns
|
||||
# Apache will not start without this file
|
||||
touch /var/alternc/apacheconf/override_php.conf
|
||||
|
||||
# Update l18n files
|
||||
/usr/share/alternc/install/dopo.sh
|
||||
|
||||
# important: postinst gele sans ca
|
||||
db_stop
|
||||
|
||||
echo "running alternc.install"
|
||||
alternc.install
|
||||
|
||||
# Add basedir protection
|
||||
/usr/lib/alternc/basedir_prot.sh
|
||||
|
||||
if [ -x /usr/sbin/apache ]; then
|
||||
if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then
|
||||
ln -sf /etc/alternc/apache-ssl.conf \
|
||||
|
|
Loading…
Reference in New Issue