diff --git a/actions/apache b/actions/apache index 1a510c7f1..6ebb4fbc3 100755 --- a/actions/apache +++ b/actions/apache @@ -122,9 +122,9 @@ def subcommand_setup(arguments): webserver.enable('proxy_fcgi', kind='module') webserver.enable('rewrite', kind='module') - # enable GnuTLS - webserver.disable('ssl', kind='module') - webserver.enable('gnutls', kind='module') + # switch to mod_ssl from mod_gnutls + webserver.disable('gnutls', kind='module') + webserver.enable('ssl', kind='module') # enable mod_alias for RedirectMatch webserver.enable('alias', kind='module') @@ -151,8 +151,8 @@ def subcommand_setup(arguments): # default sites webserver.enable('000-default', kind='site') - webserver.disable('default-ssl', kind='site') - webserver.enable('default-tls', kind='site') + webserver.disable('default-tls', kind='site') + webserver.enable('default-ssl', kind='site') webserver.enable('plinth', kind='site') webserver.enable('plinth-ssl', kind='site') diff --git a/plinth/modules/apache/__init__.py b/plinth/modules/apache/__init__.py index 1b8b7e6c8..f55573245 100644 --- a/plinth/modules/apache/__init__.py +++ b/plinth/modules/apache/__init__.py @@ -20,11 +20,11 @@ FreedomBox app for Apache server. from plinth import actions -version = 4 +version = 5 is_essential = True -managed_packages = ['apache2', 'libapache2-mod-gnutls', 'php-fpm'] +managed_packages = ['apache2', 'php-fpm'] def setup(helper, old_version=None):