From 5de7ecc99b3a987f1fc7d8e2c02e08dfc06e4a59 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Sat, 5 Oct 2013 14:54:53 -0500 Subject: [PATCH] Configure Apache by default. --- Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c9a6b4cdc..d21792192 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ DATADIR=/usr/share/plinth PYDIR=$(DATADIR)/python/plinth ## Catch-all tagets -default: config dirs template css docs dbs +default: config dirs template css docs dbs apache-config all: default predepend: @@ -93,3 +93,16 @@ current-checkout.tar.gz: $(ALL_BUT_GZ) current-repository.tar.gz: $(ALL_BUT_GZ) tar cz $(EXCLUDE) * .git > current-repository.tar.gz + +apache-config: apache-ssl + cp support/apache/sites-available/plinth.conf /etc/apache/sites-available/plinth.conf + cp support/apache/plinth-ports.conf /etc/apache/plinth-ports.conf +# include plinth's ports if necessary. +ifeq ($(shell grep 'plinth-ports.conf' /etc/apache2/ports.conf), "") + echo "Include plinth-ports.conf" >> /etc/apache2/ports.conf +endif + a2ensite plinth + +apache-ssl: + make-ssl-cert generate-default-snakeoil + a2enmod ssl