Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into add_analysis_interval

pull/956/head
Emmanuel Papin 2015-07-24 00:35:08 +02:00
commit 0c7b8e1acb
2 changed files with 2 additions and 2 deletions

View File

@ -23,7 +23,7 @@ apache_remove() {
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
# Deconfigure the web server
db_get zoneminder/webserver
db_get zoneminder/webserver || true
for webserver in $RET; do
webserver=${webserver%,}
# Currently we only support apache2

View File

@ -23,7 +23,7 @@ apache_remove() {
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
# Deconfigure the web server
db_get zoneminder/webserver
db_get zoneminder/webserver || true
for webserver in $RET; do
webserver=${webserver%,}
# Currently we only support apache2