apache hook script fixed
This commit is contained in:
parent
a4d1e6db26
commit
3ceb286c46
|
@ -23,7 +23,7 @@ set -eu
|
||||||
APACHE_SCRIPT=/etc/init.d/apache2
|
APACHE_SCRIPT=/etc/init.d/apache2
|
||||||
APACHE_CONF_DIR=/var/cache/cryptobox/apache2_dav.conf.d
|
APACHE_CONF_DIR=/var/cache/cryptobox/apache2_dav.conf.d
|
||||||
TEMPLATE_CONF_FILE=/etc/cryptobox/apache2_dav-share.conf-template
|
TEMPLATE_CONF_FILE=/etc/cryptobox/apache2_dav-share.conf-template
|
||||||
MAIN_APACHE_CONF_FILE=/etc/cryptobox/apache-include.conf
|
MAIN_APACHE_CONF_FILE=/etc/cryptobox/apache2-include.conf
|
||||||
|
|
||||||
# exit if apache2 is not installed
|
# exit if apache2 is not installed
|
||||||
test -e "$APACHE_SCRIPT" || exit 0
|
test -e "$APACHE_SCRIPT" || exit 0
|
||||||
|
@ -47,14 +47,14 @@ update_include_conf_file()
|
||||||
( echo "# this file was automatically generated by the CryptoBox"
|
( echo "# this file was automatically generated by the CryptoBox"
|
||||||
echo "# DO NOT EDIT - all changes will get lost!"
|
echo "# DO NOT EDIT - all changes will get lost!"
|
||||||
find "$APACHE_CONF_DIR" -type f -name "*.conf" | while read fname
|
find "$APACHE_CONF_DIR" -type f -name "*.conf" | while read fname
|
||||||
do echo "include = $fname"
|
do echo "Include '$fname'"
|
||||||
done ) >"$MAIN_APACHE_CONF_FILE"
|
done ) >"$MAIN_APACHE_CONF_FILE"
|
||||||
}
|
}
|
||||||
|
|
||||||
send_reload_command()
|
send_reload_command()
|
||||||
{
|
{
|
||||||
# reload config files
|
# reload config files
|
||||||
"$APACHE_SCRIPT" graceful
|
"$APACHE_SCRIPT" reload
|
||||||
}
|
}
|
||||||
|
|
||||||
# -----------------=-=-=- main -=-=-=----------------------
|
# -----------------=-=-=- main -=-=-=----------------------
|
||||||
|
|
Loading…
Reference in a new issue