evolix/evoadmin-web
22
0
Fork 1
Code Issues 31 Pull requests 4 Releases 1 Wiki Activity

New check command for web-add.sh #5

Merged
Ghost merged 5 commits from ticket-37722 into master 2018-12-13 23:29:07 +01:00
Conversation 13 Commits 5 Files changed 1 +44 -2
1 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
scripts/web-add.sh
View file

@ -26,7 +26,7 @@ SSH_GROUP="evolinux-ssh"
# Set to nginx if you use nginx and not apache
WEB_SERVER="apache"
if [ "$WEB_SERVER" == "apache" ]; then
VHOST_PATH="/etc/apache2/sites-available/"
VHOST_PATH="/etc/apache2/sites-available"
TPL_VHOST="$SCRIPTS_PATH/vhost"
TPL_MAIL="$SCRIPTS_PATH/web-mail.tpl"
@ -109,6 +109,9 @@ del LOGIN [DBNAME]
list-vhost LOGIN
List Apache vhost for user LOGIN
check-vhosts -f
List suggested changes to vhosts, apply fixes with -f
add-alias VHOST ALIAS
@ -709,6 +712,9 @@ arg_processing() {
;;
list-vhost)
op_listvhost "$@"
;;
check-vhosts)
op_checkvhosts "$@"
;;
add-alias)
op_aliasadd "$@"
@ -767,7 +773,7 @@ op_aliasadd() {
vhost="${1}.conf"
alias=$2
[ -f $VHOST_PATH/"$vhost" ] && sed -i -e "s/\\(ServerName .*\\)/\\1\\n\\tServerAlias $alias/" "$VHOST_PATH"/"$vhost" --follow-symlinks
[ -f $VHOST_PATH/"$vhost" ] && sed -i "/ServerName .*/a \\\tServerAlias $alias" "$VHOST_PATH"/"$vhost" --follow-symlinks
benpro commented 2018-12-05 09:46:12 +01:00
Review
Copy link

"/ServerName .*/a \\\tServerAlias $alias missing the trailing slash?

`"/ServerName .*/a \\\tServerAlias $alias` missing the trailing slash?
apache2ctl configtest 2>/dev/null
/etc/init.d/apache2 force-reload >/dev/null
@ -988,5 +994,41 @@ op_add() {
echo
}
# Some people forget to use the --follow-symlinks flag with sed(1),
# thus not carrying changes over to /etc/sites-available.
op_checkvhosts() {
ln_vhosts_dir="$(sed 's/available/enabled/' <<< "$VHOST_PATH")"
non_ln_vhosts="$(find "$ln_vhosts_dir"/* ! -type l)"
while getopts f opt; do
case "$opt" in
f)
apply=1
;;
Ghost commented 2018-12-04 17:28:51 +01:00
Review
Copy link

See the latest commit for changes. I switched fix-vhosts to check-vhosts and added the -f flag to apply fixes.

See the latest commit for changes. I switched fix-vhosts to check-vhosts and added the -f flag to apply fixes.
?)
usage
exit 1
;;
esac
done
for ln_path in $non_ln_vhosts
do
vhost_name=$(basename "$ln_path")
fix_conf="mv $ln_path $VHOST_PATH/$vhost_name"
fix_ln="a2ensite $vhost_name"
if [[ -z "$apply" ]]; then
echo "Suggested fixes for $vhost_name:"
echo "diff $ln_path $VHOST_PATH/$vhost_name"
echo "$fix_conf"
echo "$fix_ln"
else
$fix_conf
$fix_ln
fi
done
}
# Point d'entrée
arg_processing "$@"