Merge branch 'master' into andreas

apache/000-default.conf

@@ -1,6 +1,3 @@
-WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
-WSGIPythonPath /vagrant/django/webshop/
-
 <VirtualHost *:80>
         # The ServerName directive sets the request scheme, hostname and port that
         # the server uses to identify itself. This is used when creating
@@ -23,13 +20,17 @@ WSGIPythonPath /vagrant/django/webshop/
         </Directory>
 
 
-		<Directory /vagrant/django/webshop/media>
-		Require all granted
-		</Directory>
+	<Directory /vagrant/django/webshop/media>
+	Require all granted
+	</Directory>
+
+	<Directory /vagrant/django/webshop/static>
+	Require all granted
+	</Directory>
+	WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
+	WSGIDaemonProcess webshop python-path=/vagrant/django/webshop processes=2 threads=15 display-name=%{GROUP}
+	WSGIProcessGroup webshop
 
-		<Directory /vagrant/django/webshop/static>
-		Require all granted
-		</Directory>
 
         # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
         # error, crit, alert, emerg.

sql/01_create_database.sql

@@ -11,4 +11,10 @@ create database if not exists webshopdb;
 grant all on webshopdb.* to
     'webshop'@'localhost'
     identified by '2YKtY53F3HDDzPyExAaSh3jdVNh6VN';
+grant all on test_webshopdb.* to
+    'webshop'@'localhost'
+    identified by '2YKtY53F3HDDzPyExAaSh3jdVNh6VN';
+grant all on django_migrations.* to
+    'webshop'@'localhost'
+    identified by '2YKtY53F3HDDzPyExAaSh3jdVNh6VN';
 flush privileges;

sql/04_remove_database.sql

@@ -5,4 +5,6 @@
 -- MariaDB 10.1.26
 
 drop database if exists webshopdb;
+drop database if exists test_webshopdb;
+drop database if exists django_migrations;
 drop user if exists webshop@localhost;