nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache: Switch to mod_ssl from mod_gnutls

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-02-07 14:08:07 -08:00 committed by James Valleroy
parent e36a4b85ee
commit ab64bd17a3
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/apache
View File

@ -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')

4
plinth/modules/apache/__init__.py
View File

@ -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):