Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into add_analysis_interval
commit
0c7b8e1acb
|
@ -23,7 +23,7 @@ apache_remove() {
|
||||||
|
|
||||||
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
||||||
# Deconfigure the web server
|
# Deconfigure the web server
|
||||||
db_get zoneminder/webserver
|
db_get zoneminder/webserver || true
|
||||||
for webserver in $RET; do
|
for webserver in $RET; do
|
||||||
webserver=${webserver%,}
|
webserver=${webserver%,}
|
||||||
# Currently we only support apache2
|
# Currently we only support apache2
|
||||||
|
|
|
@ -23,7 +23,7 @@ apache_remove() {
|
||||||
|
|
||||||
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
||||||
# Deconfigure the web server
|
# Deconfigure the web server
|
||||||
db_get zoneminder/webserver
|
db_get zoneminder/webserver || true
|
||||||
for webserver in $RET; do
|
for webserver in $RET; do
|
||||||
webserver=${webserver%,}
|
webserver=${webserver%,}
|
||||||
# Currently we only support apache2
|
# Currently we only support apache2
|
||||||
|
|
Loading…
Reference in New Issue