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

adding missing COMMITS in alternc.install between Jessie and Wheezy, fixes #161

This commit is contained in:
Benjamin Sonntag 2017-08-12 17:03:03 +02:00
parent 41ad8b3632
commit aaa5a68388
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/alternc.install
View File

@ -586,6 +586,7 @@ mkdir -p "/etc/opendkim/keys"
touch /etc/opendkim/TrustedHosts /etc/opendkim/SigningTable /etc/opendkim/KeyTable touch /etc/opendkim/TrustedHosts /etc/opendkim/SigningTable /etc/opendkim/KeyTable
grep -q "^127.0.0.1\$" /etc/opendkim/TrustedHosts || echo "127.0.0.1" >>/etc/opendkim/TrustedHosts grep -q "^127.0.0.1\$" /etc/opendkim/TrustedHosts || echo "127.0.0.1" >>/etc/opendkim/TrustedHosts
grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/opendkim/TrustedHosts grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/opendkim/TrustedHosts
grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
# Add opendkim to service to restart # Add opendkim to service to restart
SERVICES="$SERVICES opendkim" SERVICES="$SERVICES opendkim"

7
jessie/alternc.install
View File

@ -259,6 +259,7 @@ done
BACKUPS="$BACKUPS etc/postfix/main.cf" BACKUPS="$BACKUPS etc/postfix/main.cf"
tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
chmod 600 "$BACKUP_FILE"
####################################################################### #######################################################################
# Expand templates in the right place # Expand templates in the right place
@ -279,7 +280,9 @@ rm -f $SED_SCRIPT
# #
php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`" php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`"
ln -fs /etc/alternc/alternc.ini /etc/$php/conf.d/alternc.ini || true ln -fs /etc/alternc/alternc.ini /etc/$php/apache2/conf.d/alternc.ini || true
ln -fs /etc/alternc/alternc.ini /etc/$php/cli/conf.d/alternc.ini || true
if [ -x /usr/sbin/apache2 ]; then if [ -x /usr/sbin/apache2 ]; then
# hook # hook
run-parts --arg=apache2 /usr/lib/alternc/install.d run-parts --arg=apache2 /usr/lib/alternc/install.d
@ -411,7 +414,7 @@ grep -v '^\ *#' $postfix_conf |while read line ; do
echo -e "\033[31m*****************************************************" echo -e "\033[31m*****************************************************"
echo "* The certificate file : $cert_file does not exists *" echo "* The certificate file : $cert_file does not exists *"
echo "* If you want to be able to use SSL/TLS *" echo "* If you want to be able to use SSL/TLS *"
echo "* please go to https://alternc.org/wiki/SSL *" echo "* please go to https://alternc.com/SSL *"
echo "* to get information on how to create a certificate *" echo "* to get information on how to create a certificate *"
echo "* Finally relaunch alternc.install *" echo "* Finally relaunch alternc.install *"
echo "*****************************************************" echo "*****************************************************"