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

Moved Apache configuration to Plinth setup script.

Browse Source 
James added the Apache Headers module to the makefile, but not the
FreedomBox-Setup configuration script.  However, it's ridiculous to
have multiple locations for that same logic, so now the makefile uses
the setup script for the Apache configuration instead.

Also, the modules are now fancy and alphabetized.
This commit is contained in:
Nick Daly 2013-12-08 11:37:15 -06:00
parent 96f4430513
commit 51e3af611b
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -93,15 +93,11 @@ current-repository.tar.gz: $(ALL_BUT_GZ)
apache-install:
install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf
apache-config: apache-install apache-ssl
apache-config: apache-install apache-modules
a2ensite plinth
service apache2 reload
apache-ssl:
make-ssl-cert generate-default-snakeoil
a2enmod ssl
a2enmod headers
a2enmod rewrite
a2enmod proxy
a2enmod proxy_http
apache-modules:
# enable all required modules, create snakeoil cert.
./setup.d/86_plinth
service apache2 restart

11
setup.d/86_plinth
View File

@ -1,15 +1,16 @@
#!/bin/sh
#
# Enable Plinth.
# Enable Apache modules required for Plinth.
echo "Configuring Plinth..."
echo "Configuring Apache for Plinth..."
make-ssl-cert generate-default-snakeoil
a2enmod ssl
a2enmod rewrite
a2enmod headers
a2enmod proxy
a2enmod proxy_http
a2enmod rewrite
a2enmod ssl
a2dissite default
a2ensite plinth.conf
echo "Done configuring Plinth.."
echo "Done configuring Apache for Plinth."