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

[fix] alternc.install misc fixes: mysql_query heredoc + phpmyadmin test

This commit is contained in:
Benjamin Sonntag 2018-06-24 16:09:28 +02:00
parent 404ba2803b
commit 6fd89455fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install/alternc.install
View File

@ -292,7 +292,7 @@ fi
# Create the default certificate if needed (requires openssl) # Create the default certificate if needed (requires openssl)
make-ssl-cert generate-default-snakeoil make-ssl-cert generate-default-snakeoil
mysql_query <<EOF /usr/bin/mysql --defaults-file=/etc/alternc/my.cnf -Bs <<EOF
SET SESSION sql_mode="NO_AUTO_VALUE_ON_ZERO" ; SET SESSION sql_mode="NO_AUTO_VALUE_ON_ZERO" ;
INSERT IGNORE INTO certificates INSERT IGNORE INTO certificates
(id,uid,status,fqdn,validstart,validend,sslkey,sslcrt,provider) (id,uid,status,fqdn,validstart,validend,sslkey,sslcrt,provider)
@ -341,15 +341,15 @@ if [ -x /usr/sbin/apache2 ]; then
fi fi
if ! [ -L /etc/apache2/mods-enabled/php$php.load ] if ! [ -L /etc/apache2/mods-enabled/php$php.load ]
then then
a2enmod php$php a2enmod php$php
fi fi
if ! [ -L /etc/apache2/mods-enabled/rewrite.load ] if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
then then
a2enmod rewrite a2enmod rewrite
fi fi
if ! [ -L /etc/apache2/mods-enabled/expires.load ] if ! [ -L /etc/apache2/mods-enabled/expires.load ]
then then
a2enmod expires a2enmod expires
fi fi
if [ ! -h /etc/apache2/conf-available/alternc-ssl.conf ] && [ -e /etc/apache2/conf-available/ ]; then if [ ! -h /etc/apache2/conf-available/alternc-ssl.conf ] && [ -e /etc/apache2/conf-available/ ]; then
@ -427,7 +427,10 @@ OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION" echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
# Remove phpmyadmin apache2 configuration # Remove phpmyadmin apache2 configuration
a2disconf phpmyadmin if [ -L /etc/apache2/conf-enabled/phpmyadmin.conf ]
then
a2disconf phpmyadmin
fi
# Configure PHPMyAdmin # Configure PHPMyAdmin
include_str='include("/etc/alternc/phpmyadmin.inc.php")' include_str='include("/etc/alternc/phpmyadmin.inc.php")'