diff --git a/lib/apache b/lib/apache index afeac158ca..34ac660266 100644 --- a/lib/apache +++ b/lib/apache @@ -218,11 +218,6 @@ function restart_apache_server { restart_service $APACHE_NAME } -# reload_apache_server -function reload_apache_server { - reload_service $APACHE_NAME -} - function write_uwsgi_config { local file=$1 local wsgi=$2 @@ -267,7 +262,7 @@ function write_uwsgi_config { apache_conf=$(apache_site_config_for $name) echo "ProxyPass \"${url}\" \"unix:${socket}|uwsgi://uwsgi-uds-${name}/\" retry=0 " | sudo tee $apache_conf enable_apache_site $name - reload_apache_server + restart_apache_server fi } diff --git a/lib/tls b/lib/tls index 7a7b10454e..238687c5dd 100644 --- a/lib/tls +++ b/lib/tls @@ -526,12 +526,7 @@ EOF enable_apache_mod $mod done enable_apache_site $b_service - # Only a reload is required to pull in new vhosts - # Note that a restart reliably fails on centos7 and trusty - # because apache can't open port 80 because the old apache - # still has it open. Using reload fixes trusty but centos7 - # still doesn't work. - reload_apache_server + restart_apache_server } # Follow TLS proxy