Revert "rename the django project"

This reverts commit 9e88888750.

ansible/roles/web_AI-5/files/000-default.conf

@@ -1,3 +1,6 @@
+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
@@ -10,27 +13,23 @@
 
         ServerAdmin webmaster@localhost
 
-        Alias /media/ /vagrant/django/didgeridoo/media/
-        Alias /static/ /vagrant/django/didgeridoo/static/
+        Alias /media/ /vagrant/django/webshop/media/
+        Alias /static/ /vagrant/django/webshop/static/
 
-        <Directory /vagrant/django/didgeridoo/didgeridoo>
+        <Directory /vagrant/django/webshop/webshop>
         <Files wsgi.py>
         Require all granted
         </Files>
         </Directory>
 
 
-	<Directory /vagrant/django/didgeridoo/media>
-	Require all granted
-	</Directory>
-
-	<Directory /vagrant/django/didgeridoo/static>
-	Require all granted
-	</Directory>
-	WSGIScriptAlias / /vagrant/django/didgeridoo/didgeridoo/wsgi.py
-	WSGIDaemonProcess didgeridoo python-path=/vagrant/django/didgeridoo processes=2 threads=15 display-name=%{GROUP}
-	WSGIProcessGroup didgeridoo
+		<Directory /vagrant/django/webshop/media>
+		Require all granted
+		</Directory>
 
+		<Directory /vagrant/django/webshop/static>
+		Require all granted
+		</Directory>
 
         # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
         # error, crit, alert, emerg.
@@ -48,3 +47,5 @@
         # after it has been globally disabled with "a2disconf".
         #Include conf-available/serve-cgi-bin.conf
 </VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

apache/000-default.conf

@@ -10,26 +10,26 @@
 
         ServerAdmin webmaster@localhost
 
-        Alias /media/ /vagrant/django/didgeridoo/media/
-        Alias /static/ /vagrant/django/didgeridoo/static/
+        Alias /media/ /vagrant/django/webshop/media/
+        Alias /static/ /vagrant/django/webshop/static/
 
-        <Directory /vagrant/django/didgeridoo/didgeridoo>
+        <Directory /vagrant/django/webshop/webshop>
         <Files wsgi.py>
         Require all granted
         </Files>
         </Directory>
 
 
-	<Directory /vagrant/django/didgeridoo/media>
+	<Directory /vagrant/django/webshop/media>
 	Require all granted
 	</Directory>
 
-	<Directory /vagrant/django/didgeridoo/static>
+	<Directory /vagrant/django/webshop/static>
 	Require all granted
 	</Directory>
-	WSGIScriptAlias / /vagrant/django/didgeridoo/didgeridoo/wsgi.py
-	WSGIDaemonProcess didgeridoo python-path=/vagrant/django/didgeridoo processes=2 threads=15 display-name=%{GROUP}
-	WSGIProcessGroup didgeridoo
+	WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
+	WSGIDaemonProcess webshop python-path=/vagrant/django/webshop processes=2 threads=15 display-name=%{GROUP}
+	WSGIProcessGroup webshop
 
 
         # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
@@ -48,3 +48,5 @@
         # after it has been globally disabled with "a2disconf".
         #Include conf-available/serve-cgi-bin.conf
 </VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

django/didgeridoo/webshop/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

django/didgeridoo/webshop/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class WebshopConfig(AppConfig):
-    name = 'webshop'

django/didgeridoo/webshop/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

django/didgeridoo/webshop/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

django/didgeridoo/webshop/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

django/webshop/manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "didgeridoo.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webshop.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError:

django/webshop/webshop/settings.py

@@ -1,5 +1,5 @@
 """
-Django settings for didgeridoo project.
+Django settings for webshop project.
 
 Generated by 'django-admin startproject' using Django 1.10.7.
 
@@ -31,7 +31,6 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
-    'webshop.apps.WebshopConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -50,7 +49,7 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'didgeridoo.urls'
+ROOT_URLCONF = 'webshop.urls'
 
 TEMPLATES = [
     {
@@ -68,7 +67,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'didgeridoo.wsgi.application'
+WSGI_APPLICATION = 'webshop.wsgi.application'
 
 
 # Database
@@ -77,8 +76,8 @@ WSGI_APPLICATION = 'didgeridoo.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'didgeridoodb',
-        'USER': 'didgeridoo',
+        'NAME': 'webshopdb',
+        'USER': 'webshop',
         'PASSWORD': '2YKtY53F3HDDzPyExAaSh3jdVNh6VN',
         'HOST': '127.0.0.1',
         'PORT': '3306',
@@ -126,4 +125,4 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = '/vagrant/django/didgeridoo/static/'
+STATIC_ROOT = '/vagrant/django/webshop/static/'

django/webshop/webshop/urls.py

@@ -1,4 +1,4 @@
-"""didgeridoo URL Configuration
+"""webshop URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/1.10/topics/http/urls/
@@ -18,5 +18,4 @@ from django.contrib import admin
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
-    url(r'^webshop/', include('webshop.urls')),
 ]

django/webshop/webshop/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for didgeridoo project.
+WSGI config for webshop project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "didgeridoo.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webshop.settings")
 
 application = get_wsgi_application()