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

bug fixes in ACL, wildcard on vhost, and some sql bug

This commit is contained in:
Remi 2016-02-22 15:49:50 +01:00
parent ea3371ae34
commit 604592eedd
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bureau/admin/adm_dnsweberror.php
View File

@ -61,7 +61,7 @@ include_once("head.php");
<?php <?php
$pair=0; $pair=0;
$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) 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()) { ?> while($db->next_record()) { ?>
<tr class="lst"> <tr class="lst">

2
install/alternc.install
View File

@ -531,7 +531,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
# Last touches # 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 #creating log file
if [ ! -e "/var/log/alternc/bureau.log" ]; then if [ ! -e "/var/log/alternc/bureau.log" ]; then

2
jessie/alternc.install
View File

@ -533,7 +533,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
# Last touches # 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 #creating log file
if [ ! -e "/var/log/alternc/bureau.log" ]; then if [ ! -e "/var/log/alternc/bureau.log" ]; then

5
src/functions_hosting.sh
View File

@ -121,6 +121,11 @@ host_create() {
-e "s#%%user%%#$USER2#g" \ -e "s#%%user%%#$USER2#g" \
$TMP_FILE $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 # Check if all is right in the conf file
# If not, put a debug message # If not, put a debug message
# NO : redirect and document_root COULD contains legitimate %% expressions (...) # NO : redirect and document_root COULD contains legitimate %% expressions (...)

2
wheezy/originals/alternc.install
View File

@ -490,7 +490,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
# Last touches # 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 #creating log file
if [ ! -e "/var/log/alternc/bureau.log" ]; then if [ ! -e "/var/log/alternc/bureau.log" ]; then