coffin

commit 93c69ad9ab59e877862dce4d6cc6370f32762d50
parent 509410f3cb6c61de8386274a8e7a233c58996cf4
Author: parazyd <parazyd@dyne.org>
Date:   Mon, 16 May 2016 18:42:56 +0200

move src install makefile to bottom

Diffstat:
M
src/Makefile
 | 
4
+++-
M
src/extra/conf.sh
 | 
4
++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -15,7 +15,6 @@ clean:
 	make -C extra clean
 
 install:
-	make -C extra install
 	install -Dm755 coffin ${PREFIX}/coffin
 	install -Dm755 sacrist ${PREFIX}/sacrist
 	install -Dm755 zlibs/features ${PREFIX}/zlibs/features
@@ -41,6 +40,9 @@ install:
 	install -Dm700 -d /etc/ssl/coffin
 	install -Dm440 extra/coffin.pem /etc/ssl/coffin/coffin.pem
 	install -Dm400 extra/coffin.key /etc/ssl/coffin/coffin.key
+	# extras
+	make -C extra install
+	# fin
 	@echo "To enable WebDAV, run: 'a2ensite coffindav.conf' as root."
 
 uninstall:
diff --git a/src/extra/conf.sh b/src/extra/conf.sh
@@ -61,14 +61,14 @@ DAVLockDB /etc/apache2/DAV/DAVLock
 EOF
 	}
 
-	apachemods on
 	edit-sudoers add
+	apachemods on
 }
 
 [[ $1 == "unsnowman" ]] && {
 	gpasswd -d www-data coffin && \
 		print "Removed www-data from coffin group!"
 
-	apachemods off
 	edit-sudoers del
+	apachemods off
 }