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")"
benpro commented 2018-11-23 15:46:37 +01:00
Outdated
Review
Copy link

Useless echo? Missing last sed trail?

Should be:

sed 's/available/enabled/' <<< "$VHOST_PATH"
Useless echo? Missing last sed trail? Should be: ```bash sed 's/available/enabled/' <<< "$VHOST_PATH" ```
Ghost commented 2018-11-29 17:20:51 +01:00
Outdated
Review
Copy link

Mostly me not completely used to bash again, I'll fix it.

Mostly me not completely used to bash again, I'll fix it.
non_ln_vhosts="$(find "$ln_vhosts_dir"/* ! -type l)"
while getopts f opt; do
case "$opt" in
f)
apply=1
;;
benpro commented 2018-11-23 15:49:44 +01:00
Outdated
Review
Copy link

Beware that operation can be dangerous. If people have modified the version in sites-available and sites-enabled, you should first merge the difference in the sites-available version, then do the symbolic link.

Beware that operation can be dangerous. If people have modified the version in sites-available **and** sites-enabled, you should first merge the difference in the sites-available version, then do the symbolic link.
Ghost commented 2018-11-29 17:21:46 +01:00
Outdated
Review
Copy link

I'm thinking it could probably take a --dry-run flag

I'm thinking it could probably take a --dry-run flag
Ghost commented 2018-11-30 16:33:43 +01:00
Outdated
Review
Copy link

So what would the behavior be when using it from the web interface?

So what would the behavior be when using it from the web interface?
benpro commented 2018-11-30 16:55:53 +01:00
Outdated
Review
Copy link

Huh. No need for that feature in the web interface.
This is for helping sysadmins only.

Huh. No need for that feature in the web interface. This is for helping sysadmins only.
benpro commented 2018-11-30 16:56:33 +01:00
Outdated
Review
Copy link

Yes you should add a --dry-run, or even should be the default.

Yes you should add a `--dry-run`, or even should be the default.
Ghost commented 2018-12-03 16:11:19 +01:00
Outdated
Review
Copy link

What's your preference: --force or --apply?

What's your preference: `--force` or `--apply`?
benpro commented 2018-12-03 16:15:41 +01:00
Outdated
Review
Copy link

--force is nice. (If you force, you must understand the consequences ;))

`--force` is nice. (If you force, you must understand the consequences ;))
Ghost commented 2018-12-03 16:56:00 +01:00
Outdated
Review
Copy link

Yeah but web-add.sh fix --apply makes more semantic sense in my mind, web-add.sh fix --force seems to apply more to an operation that was aborted because of inconsistencies, but gives you the option to force break stuff? Like web-add.sh add-alias [alias] --force would make sense.

Yeah but `web-add.sh fix --apply` makes more semantic sense in my mind, `web-add.sh fix --force` seems to apply more to an operation that was aborted because of inconsistencies, but gives you the option to force break stuff? Like `web-add.sh add-alias [alias] --force` would make sense.
benpro commented 2018-12-03 17:10:45 +01:00
Outdated
Review
Copy link

Well... Ok for --apply.

Well... Ok for `--apply`.
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.
?)
benpro commented 2018-11-23 15:50:32 +01:00
Outdated
Review
Copy link

You could also use a2ensite in place of doing a manual link.

You could also use `a2ensite` in place of doing a manual link.
Ghost commented 2018-11-29 17:22:04 +01:00
Outdated
Review
Copy link

Good idea

Good idea
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 "$@"