From 604592eedd111bec7ab85555798acb96bd9b73d2 Mon Sep 17 00:00:00 2001 From: Remi Date: Mon, 22 Feb 2016 15:49:50 +0100 Subject: [PATCH] bug fixes in ACL, wildcard on vhost, and some sql bug --- bureau/admin/adm_dnsweberror.php | 2 +- install/alternc.install | 2 +- jessie/alternc.install | 2 +- src/functions_hosting.sh | 5 +++++ wheezy/originals/alternc.install | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bureau/admin/adm_dnsweberror.php b/bureau/admin/adm_dnsweberror.php index a94e641b..025d565d 100644 --- a/bureau/admin/adm_dnsweberror.php +++ b/bureau/admin/adm_dnsweberror.php @@ -61,7 +61,7 @@ include_once("head.php"); query("select sd.compte, m.login, sd.domaine, if(length(sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine) as fqdn, sd.valeur, dt.description, sd.web_result from sub_domaines sd,membres m, domaines_type dt where sd.web_action='OK' and length(sd.web_result)<>0 and upper(dt.name)=upper(sd.type) order by sd.domaine, sd.sub, sd.valeur;"); +$db->query("select sd.compte, m.login, sd.domaine, if(length(sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine) as fqdn, sd.valeur, dt.description, sd.web_result from sub_domaines sd,membres m, domaines_type dt where sd.web_action='OK' and length(sd.web_result)<>0 and upper(dt.name)=upper(sd.type) and sd.compte=m.uid order by sd.domaine, sd.sub, sd.valeur;"); while($db->next_record()) { ?> diff --git a/install/alternc.install b/install/alternc.install index bacad5cc..849a0f69 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -531,7 +531,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES # Last touches # -find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:rw- -m d:u:alterncpanel:rw- -m u:alterncpanel:rw- -m g:alterncpanel:rw- {} \; +find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m d:u:alterncpanel:-wx -m u:alterncpanel:-wx -m g:alterncpanel:-wx {} \; #creating log file if [ ! -e "/var/log/alternc/bureau.log" ]; then diff --git a/jessie/alternc.install b/jessie/alternc.install index b4b3d98b..90c07095 100644 --- a/jessie/alternc.install +++ b/jessie/alternc.install @@ -533,7 +533,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES # Last touches # -find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:rw- -m d:u:alterncpanel:rw- -m u:alterncpanel:rw- -m g:alterncpanel:rw- {} \; +find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m d:u:alterncpanel:-wx -m u:alterncpanel:-wx -m g:alterncpanel:-wx {} \; #creating log file if [ ! -e "/var/log/alternc/bureau.log" ]; then diff --git a/src/functions_hosting.sh b/src/functions_hosting.sh index 7c163fb5..b97077d5 100644 --- a/src/functions_hosting.sh +++ b/src/functions_hosting.sh @@ -121,6 +121,11 @@ host_create() { -e "s#%%user%%#$USER2#g" \ $TMP_FILE + ## Fix for wildcard + if [[ "$FQDN2" == "*."* ]]; then + sed -i "s/ServerName/ServerAlias/" $TMP_FILE + fi + # Check if all is right in the conf file # If not, put a debug message # NO : redirect and document_root COULD contains legitimate %% expressions (...) diff --git a/wheezy/originals/alternc.install b/wheezy/originals/alternc.install index 9ebdd1c5..d8e8b362 100644 --- a/wheezy/originals/alternc.install +++ b/wheezy/originals/alternc.install @@ -490,7 +490,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES # Last touches # -find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:rw- -m g:alterncpanel:rw- {} \; +find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m g:alterncpanel:-wx {} \; #creating log file if [ ! -e "/var/log/alternc/bureau.log" ]; then