Merge branch 'image' of github.com:Avans/Security-Workshop into image

Conflicts:
	build-vm/boot.sh
This commit is contained in:
Paul committed 2014-05-05 14:20:54 +02:00
commit 0170519041
2 files changed
+4 -3

No files matched your search

+2 -1
View File
@@ -14,8 +14,9 @@ a2dissite 000-default
a2ensite security-workshop
service apache2 reload
# Update permissions
# Prepare image site
chmod o+w image/uploads
echo "TODO: Fix AE-35 Unit" > /etc/geheim.txt
# Update database
echo "Resetting database"