diff --git a/BuildFiles/Packaging/templates/postinst-frontend.template b/BuildFiles/Packaging/templates/postinst-frontend.template index da424d43..f7bb0de9 100644 --- a/BuildFiles/Packaging/templates/postinst-frontend.template +++ b/BuildFiles/Packaging/templates/postinst-frontend.template @@ -8,12 +8,11 @@ if [ ! -e /var/lib/swarmops/upload ]; then chown www-data:www-data /var/lib/swarmops/upload chmod 777 /var/lib/swarmops/upload -#If there's only 000-default in apache sites, assume new install +# If there's only 000-default in apache sites, assume new install + if [ "$(ls -l /etc/apache2/sites-enabled/ | wc -l)" = "2" ]; then - echo "Dialog branch was triggered (this is for debug purposes)" - - dialog_selection = $(dialog --title "Autoconfigure Apache?" --menu "This seems to be a new installation of Swarmops Frontend on a newly installed Apache. Would you like to create the necessary site directives and make it the default Apache site?" 0 0 3 1 "No thanks, don't touch my Apache, that's for me alone" 2 "Yes please, make Swarmops the default site for port 80" 3 "Create a Swarmops config, please, but don't enable it" 2>&1 1>&3) + dialog_selection=$(dialog --title "Autoconfigure Apache?" --menu "This seems to be a new installation of Swarmops Frontend on a newly installed Apache. Would you like to create the necessary site directives and make it the default Apache site?" 0 0 3 1 "No thanks, don't touch my Apache, that's for me alone" 2 "Yes please, make Swarmops the default site for port 80" 3 "Create a Swarmops config, please, but don't enable it" 2>&1 1>&3) case "$dialog_selection" in 1 ) echo "Neither reconfiguring Apache nor creating configuration file." @@ -22,7 +21,11 @@ if [ ! -e /var/lib/swarmops/upload ]; then a2dissite 000-default cp /usr/share/swarmops/frontend/apache-default-config.txt /etc/apache2/sites-available/000-swarmops.conf a2ensite 000-swarmops - /etc/init.d/apache2 force-reload + +# Forcing a stop/start cycle because of install dependency fuckups + + /etc/init.d/apache2 stop + /etc/init.d/apache2 start ;; 3 ) echo "Creating but not enabling 000-swarmops." cp /usr/share/swarmops/frontend/apache-default-config.txt /etc/apache2/sites-available/000-swarmops.conf