From 25d0c6f2b0a22bc55a641598f3f2d8ae02d1f920 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 12 Nov 2017 21:02:40 +0100 Subject: [PATCH] Revert "rename the django project" This reverts commit 9e88888750674d65285647ef66b70309570c6703. --- ansible/roles/web_AI-5/files/000-default.conf | 27 +++++++++--------- apache/000-default.conf | 18 ++++++------ django/didgeridoo/webshop/__init__.py | 0 django/didgeridoo/webshop/admin.py | 3 -- django/didgeridoo/webshop/apps.py | 5 ---- .../didgeridoo/webshop/migrations/__init__.py | 0 django/didgeridoo/webshop/models.py | 3 -- django/didgeridoo/webshop/tests.py | 3 -- django/didgeridoo/webshop/views.py | 3 -- django/{didgeridoo => webshop}/manage.py | 2 +- .../static/admin/css/base.css | 0 .../static/admin/css/changelists.css | 0 .../static/admin/css/dashboard.css | 0 .../static/admin/css/fonts.css | 0 .../static/admin/css/forms.css | 0 .../static/admin/css/login.css | 0 .../static/admin/css/rtl.css | 0 .../static/admin/css/widgets.css | 0 .../static/admin/fonts/README.txt | 0 .../admin/fonts/Roboto-Bold-webfont.woff | Bin .../admin/fonts/Roboto-Light-webfont.woff | Bin .../admin/fonts/Roboto-Regular-webfont.woff | Bin .../static/admin/img/README.txt | 0 .../static/admin/img/calendar-icons.svg | 0 .../static/admin/img/gis/move_vertex_off.svg | 0 .../static/admin/img/gis/move_vertex_on.svg | 0 .../static/admin/img/icon-addlink.svg | 0 .../static/admin/img/icon-alert.svg | 0 .../static/admin/img/icon-calendar.svg | 0 .../static/admin/img/icon-changelink.svg | 0 .../static/admin/img/icon-clock.svg | 0 .../static/admin/img/icon-deletelink.svg | 0 .../static/admin/img/icon-no.svg | 0 .../static/admin/img/icon-unknown-alt.svg | 0 .../static/admin/img/icon-unknown.svg | 0 .../static/admin/img/icon-yes.svg | 0 .../static/admin/img/inline-delete.svg | 0 .../static/admin/img/search.svg | 0 .../static/admin/img/selector-icons.svg | 0 .../static/admin/img/sorting-icons.svg | 0 .../static/admin/img/tooltag-add.svg | 0 .../static/admin/img/tooltag-arrowright.svg | 0 .../static/admin/js/SelectBox.js | 0 .../static/admin/js/SelectFilter2.js | 0 .../static/admin/js/actions.js | 0 .../static/admin/js/actions.min.js | 0 .../admin/js/admin/DateTimeShortcuts.js | 0 .../admin/js/admin/RelatedObjectLookups.js | 0 .../static/admin/js/calendar.js | 0 .../static/admin/js/cancel.js | 0 .../static/admin/js/change_form.js | 0 .../static/admin/js/collapse.js | 0 .../static/admin/js/collapse.min.js | 0 .../static/admin/js/core.js | 0 .../static/admin/js/inlines.js | 0 .../static/admin/js/inlines.min.js | 0 .../static/admin/js/jquery.init.js | 0 .../static/admin/js/popup_response.js | 0 .../static/admin/js/prepopulate.js | 0 .../static/admin/js/prepopulate.min.js | 0 .../static/admin/js/prepopulate_init.js | 0 .../static/admin/js/timeparse.js | 0 .../static/admin/js/urlify.js | 0 .../admin/js/vendor/jquery/LICENSE-JQUERY.txt | 0 .../static/admin/js/vendor/jquery/jquery.js | 0 .../admin/js/vendor/jquery/jquery.min.js | 0 .../js/vendor/xregexp/LICENSE-XREGEXP.txt | 0 .../static/admin/js/vendor/xregexp/xregexp.js | 0 .../admin/js/vendor/xregexp/xregexp.min.js | 0 .../webshop}/__init__.py | 0 .../webshop}/settings.py | 13 ++++----- .../didgeridoo => webshop/webshop}/urls.py | 3 +- .../didgeridoo => webshop/webshop}/wsgi.py | 4 +-- 73 files changed, 34 insertions(+), 50 deletions(-) delete mode 100644 django/didgeridoo/webshop/__init__.py delete mode 100644 django/didgeridoo/webshop/admin.py delete mode 100644 django/didgeridoo/webshop/apps.py delete mode 100644 django/didgeridoo/webshop/migrations/__init__.py delete mode 100644 django/didgeridoo/webshop/models.py delete mode 100644 django/didgeridoo/webshop/tests.py delete mode 100644 django/didgeridoo/webshop/views.py rename django/{didgeridoo => webshop}/manage.py (90%) rename django/{didgeridoo => webshop}/static/admin/css/base.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/changelists.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/dashboard.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/fonts.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/forms.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/login.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/rtl.css (100%) rename django/{didgeridoo => webshop}/static/admin/css/widgets.css (100%) rename django/{didgeridoo => webshop}/static/admin/fonts/README.txt (100%) rename django/{didgeridoo => webshop}/static/admin/fonts/Roboto-Bold-webfont.woff (100%) rename django/{didgeridoo => webshop}/static/admin/fonts/Roboto-Light-webfont.woff (100%) rename django/{didgeridoo => webshop}/static/admin/fonts/Roboto-Regular-webfont.woff (100%) rename django/{didgeridoo => webshop}/static/admin/img/README.txt (100%) rename django/{didgeridoo => webshop}/static/admin/img/calendar-icons.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/gis/move_vertex_off.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/gis/move_vertex_on.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-addlink.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-alert.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-calendar.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-changelink.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-clock.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-deletelink.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-no.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-unknown-alt.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-unknown.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/icon-yes.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/inline-delete.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/search.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/selector-icons.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/sorting-icons.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/tooltag-add.svg (100%) rename django/{didgeridoo => webshop}/static/admin/img/tooltag-arrowright.svg (100%) rename django/{didgeridoo => webshop}/static/admin/js/SelectBox.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/SelectFilter2.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/actions.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/actions.min.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/admin/DateTimeShortcuts.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/admin/RelatedObjectLookups.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/calendar.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/cancel.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/change_form.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/collapse.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/collapse.min.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/core.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/inlines.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/inlines.min.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/jquery.init.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/popup_response.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/prepopulate.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/prepopulate.min.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/prepopulate_init.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/timeparse.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/urlify.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/jquery/jquery.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/jquery/jquery.min.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/xregexp/xregexp.js (100%) rename django/{didgeridoo => webshop}/static/admin/js/vendor/xregexp/xregexp.min.js (100%) rename django/{didgeridoo/didgeridoo => webshop/webshop}/__init__.py (100%) rename django/{didgeridoo/didgeridoo => webshop/webshop}/settings.py (92%) rename django/{didgeridoo/didgeridoo => webshop/webshop}/urls.py (90%) rename django/{didgeridoo/didgeridoo => webshop/webshop}/wsgi.py (73%) diff --git a/ansible/roles/web_AI-5/files/000-default.conf b/ansible/roles/web_AI-5/files/000-default.conf index cb27676..28f47da 100644 --- a/ansible/roles/web_AI-5/files/000-default.conf +++ b/ansible/roles/web_AI-5/files/000-default.conf @@ -1,3 +1,6 @@ +WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py +WSGIPythonPath /vagrant/django/webshop/ + # 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/ - + Require all granted - - Require all granted - - - - Require all granted - - WSGIScriptAlias / /vagrant/django/didgeridoo/didgeridoo/wsgi.py - WSGIDaemonProcess didgeridoo python-path=/vagrant/django/didgeridoo processes=2 threads=15 display-name=%{GROUP} - WSGIProcessGroup didgeridoo + + Require all granted + + + Require all granted + # 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 + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/apache/000-default.conf b/apache/000-default.conf index cb27676..ea11143 100644 --- a/apache/000-default.conf +++ b/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/ - + Require all granted - + Require all granted - + Require all granted - 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 + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/django/didgeridoo/webshop/__init__.py b/django/didgeridoo/webshop/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/django/didgeridoo/webshop/admin.py b/django/didgeridoo/webshop/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/django/didgeridoo/webshop/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/django/didgeridoo/webshop/apps.py b/django/didgeridoo/webshop/apps.py deleted file mode 100644 index f027ae2..0000000 --- a/django/didgeridoo/webshop/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class WebshopConfig(AppConfig): - name = 'webshop' diff --git a/django/didgeridoo/webshop/migrations/__init__.py b/django/didgeridoo/webshop/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/django/didgeridoo/webshop/models.py b/django/didgeridoo/webshop/models.py deleted file mode 100644 index 71a8362..0000000 --- a/django/didgeridoo/webshop/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/django/didgeridoo/webshop/tests.py b/django/didgeridoo/webshop/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/django/didgeridoo/webshop/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/django/didgeridoo/webshop/views.py b/django/didgeridoo/webshop/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/django/didgeridoo/webshop/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/django/didgeridoo/manage.py b/django/webshop/manage.py similarity index 90% rename from django/didgeridoo/manage.py rename to django/webshop/manage.py index e46f11e..9c4f460 100644 --- a/django/didgeridoo/manage.py +++ b/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: diff --git a/django/didgeridoo/static/admin/css/base.css b/django/webshop/static/admin/css/base.css similarity index 100% rename from django/didgeridoo/static/admin/css/base.css rename to django/webshop/static/admin/css/base.css diff --git a/django/didgeridoo/static/admin/css/changelists.css b/django/webshop/static/admin/css/changelists.css similarity index 100% rename from django/didgeridoo/static/admin/css/changelists.css rename to django/webshop/static/admin/css/changelists.css diff --git a/django/didgeridoo/static/admin/css/dashboard.css b/django/webshop/static/admin/css/dashboard.css similarity index 100% rename from django/didgeridoo/static/admin/css/dashboard.css rename to django/webshop/static/admin/css/dashboard.css diff --git a/django/didgeridoo/static/admin/css/fonts.css b/django/webshop/static/admin/css/fonts.css similarity index 100% rename from django/didgeridoo/static/admin/css/fonts.css rename to django/webshop/static/admin/css/fonts.css diff --git a/django/didgeridoo/static/admin/css/forms.css b/django/webshop/static/admin/css/forms.css similarity index 100% rename from django/didgeridoo/static/admin/css/forms.css rename to django/webshop/static/admin/css/forms.css diff --git a/django/didgeridoo/static/admin/css/login.css b/django/webshop/static/admin/css/login.css similarity index 100% rename from django/didgeridoo/static/admin/css/login.css rename to django/webshop/static/admin/css/login.css diff --git a/django/didgeridoo/static/admin/css/rtl.css b/django/webshop/static/admin/css/rtl.css similarity index 100% rename from django/didgeridoo/static/admin/css/rtl.css rename to django/webshop/static/admin/css/rtl.css diff --git a/django/didgeridoo/static/admin/css/widgets.css b/django/webshop/static/admin/css/widgets.css similarity index 100% rename from django/didgeridoo/static/admin/css/widgets.css rename to django/webshop/static/admin/css/widgets.css diff --git a/django/didgeridoo/static/admin/fonts/README.txt b/django/webshop/static/admin/fonts/README.txt similarity index 100% rename from django/didgeridoo/static/admin/fonts/README.txt rename to django/webshop/static/admin/fonts/README.txt diff --git a/django/didgeridoo/static/admin/fonts/Roboto-Bold-webfont.woff b/django/webshop/static/admin/fonts/Roboto-Bold-webfont.woff similarity index 100% rename from django/didgeridoo/static/admin/fonts/Roboto-Bold-webfont.woff rename to django/webshop/static/admin/fonts/Roboto-Bold-webfont.woff diff --git a/django/didgeridoo/static/admin/fonts/Roboto-Light-webfont.woff b/django/webshop/static/admin/fonts/Roboto-Light-webfont.woff similarity index 100% rename from django/didgeridoo/static/admin/fonts/Roboto-Light-webfont.woff rename to django/webshop/static/admin/fonts/Roboto-Light-webfont.woff diff --git a/django/didgeridoo/static/admin/fonts/Roboto-Regular-webfont.woff b/django/webshop/static/admin/fonts/Roboto-Regular-webfont.woff similarity index 100% rename from django/didgeridoo/static/admin/fonts/Roboto-Regular-webfont.woff rename to django/webshop/static/admin/fonts/Roboto-Regular-webfont.woff diff --git a/django/didgeridoo/static/admin/img/README.txt b/django/webshop/static/admin/img/README.txt similarity index 100% rename from django/didgeridoo/static/admin/img/README.txt rename to django/webshop/static/admin/img/README.txt diff --git a/django/didgeridoo/static/admin/img/calendar-icons.svg b/django/webshop/static/admin/img/calendar-icons.svg similarity index 100% rename from django/didgeridoo/static/admin/img/calendar-icons.svg rename to django/webshop/static/admin/img/calendar-icons.svg diff --git a/django/didgeridoo/static/admin/img/gis/move_vertex_off.svg b/django/webshop/static/admin/img/gis/move_vertex_off.svg similarity index 100% rename from django/didgeridoo/static/admin/img/gis/move_vertex_off.svg rename to django/webshop/static/admin/img/gis/move_vertex_off.svg diff --git a/django/didgeridoo/static/admin/img/gis/move_vertex_on.svg b/django/webshop/static/admin/img/gis/move_vertex_on.svg similarity index 100% rename from django/didgeridoo/static/admin/img/gis/move_vertex_on.svg rename to django/webshop/static/admin/img/gis/move_vertex_on.svg diff --git a/django/didgeridoo/static/admin/img/icon-addlink.svg b/django/webshop/static/admin/img/icon-addlink.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-addlink.svg rename to django/webshop/static/admin/img/icon-addlink.svg diff --git a/django/didgeridoo/static/admin/img/icon-alert.svg b/django/webshop/static/admin/img/icon-alert.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-alert.svg rename to django/webshop/static/admin/img/icon-alert.svg diff --git a/django/didgeridoo/static/admin/img/icon-calendar.svg b/django/webshop/static/admin/img/icon-calendar.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-calendar.svg rename to django/webshop/static/admin/img/icon-calendar.svg diff --git a/django/didgeridoo/static/admin/img/icon-changelink.svg b/django/webshop/static/admin/img/icon-changelink.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-changelink.svg rename to django/webshop/static/admin/img/icon-changelink.svg diff --git a/django/didgeridoo/static/admin/img/icon-clock.svg b/django/webshop/static/admin/img/icon-clock.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-clock.svg rename to django/webshop/static/admin/img/icon-clock.svg diff --git a/django/didgeridoo/static/admin/img/icon-deletelink.svg b/django/webshop/static/admin/img/icon-deletelink.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-deletelink.svg rename to django/webshop/static/admin/img/icon-deletelink.svg diff --git a/django/didgeridoo/static/admin/img/icon-no.svg b/django/webshop/static/admin/img/icon-no.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-no.svg rename to django/webshop/static/admin/img/icon-no.svg diff --git a/django/didgeridoo/static/admin/img/icon-unknown-alt.svg b/django/webshop/static/admin/img/icon-unknown-alt.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-unknown-alt.svg rename to django/webshop/static/admin/img/icon-unknown-alt.svg diff --git a/django/didgeridoo/static/admin/img/icon-unknown.svg b/django/webshop/static/admin/img/icon-unknown.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-unknown.svg rename to django/webshop/static/admin/img/icon-unknown.svg diff --git a/django/didgeridoo/static/admin/img/icon-yes.svg b/django/webshop/static/admin/img/icon-yes.svg similarity index 100% rename from django/didgeridoo/static/admin/img/icon-yes.svg rename to django/webshop/static/admin/img/icon-yes.svg diff --git a/django/didgeridoo/static/admin/img/inline-delete.svg b/django/webshop/static/admin/img/inline-delete.svg similarity index 100% rename from django/didgeridoo/static/admin/img/inline-delete.svg rename to django/webshop/static/admin/img/inline-delete.svg diff --git a/django/didgeridoo/static/admin/img/search.svg b/django/webshop/static/admin/img/search.svg similarity index 100% rename from django/didgeridoo/static/admin/img/search.svg rename to django/webshop/static/admin/img/search.svg diff --git a/django/didgeridoo/static/admin/img/selector-icons.svg b/django/webshop/static/admin/img/selector-icons.svg similarity index 100% rename from django/didgeridoo/static/admin/img/selector-icons.svg rename to django/webshop/static/admin/img/selector-icons.svg diff --git a/django/didgeridoo/static/admin/img/sorting-icons.svg b/django/webshop/static/admin/img/sorting-icons.svg similarity index 100% rename from django/didgeridoo/static/admin/img/sorting-icons.svg rename to django/webshop/static/admin/img/sorting-icons.svg diff --git a/django/didgeridoo/static/admin/img/tooltag-add.svg b/django/webshop/static/admin/img/tooltag-add.svg similarity index 100% rename from django/didgeridoo/static/admin/img/tooltag-add.svg rename to django/webshop/static/admin/img/tooltag-add.svg diff --git a/django/didgeridoo/static/admin/img/tooltag-arrowright.svg b/django/webshop/static/admin/img/tooltag-arrowright.svg similarity index 100% rename from django/didgeridoo/static/admin/img/tooltag-arrowright.svg rename to django/webshop/static/admin/img/tooltag-arrowright.svg diff --git a/django/didgeridoo/static/admin/js/SelectBox.js b/django/webshop/static/admin/js/SelectBox.js similarity index 100% rename from django/didgeridoo/static/admin/js/SelectBox.js rename to django/webshop/static/admin/js/SelectBox.js diff --git a/django/didgeridoo/static/admin/js/SelectFilter2.js b/django/webshop/static/admin/js/SelectFilter2.js similarity index 100% rename from django/didgeridoo/static/admin/js/SelectFilter2.js rename to django/webshop/static/admin/js/SelectFilter2.js diff --git a/django/didgeridoo/static/admin/js/actions.js b/django/webshop/static/admin/js/actions.js similarity index 100% rename from django/didgeridoo/static/admin/js/actions.js rename to django/webshop/static/admin/js/actions.js diff --git a/django/didgeridoo/static/admin/js/actions.min.js b/django/webshop/static/admin/js/actions.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/actions.min.js rename to django/webshop/static/admin/js/actions.min.js diff --git a/django/didgeridoo/static/admin/js/admin/DateTimeShortcuts.js b/django/webshop/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from django/didgeridoo/static/admin/js/admin/DateTimeShortcuts.js rename to django/webshop/static/admin/js/admin/DateTimeShortcuts.js diff --git a/django/didgeridoo/static/admin/js/admin/RelatedObjectLookups.js b/django/webshop/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from django/didgeridoo/static/admin/js/admin/RelatedObjectLookups.js rename to django/webshop/static/admin/js/admin/RelatedObjectLookups.js diff --git a/django/didgeridoo/static/admin/js/calendar.js b/django/webshop/static/admin/js/calendar.js similarity index 100% rename from django/didgeridoo/static/admin/js/calendar.js rename to django/webshop/static/admin/js/calendar.js diff --git a/django/didgeridoo/static/admin/js/cancel.js b/django/webshop/static/admin/js/cancel.js similarity index 100% rename from django/didgeridoo/static/admin/js/cancel.js rename to django/webshop/static/admin/js/cancel.js diff --git a/django/didgeridoo/static/admin/js/change_form.js b/django/webshop/static/admin/js/change_form.js similarity index 100% rename from django/didgeridoo/static/admin/js/change_form.js rename to django/webshop/static/admin/js/change_form.js diff --git a/django/didgeridoo/static/admin/js/collapse.js b/django/webshop/static/admin/js/collapse.js similarity index 100% rename from django/didgeridoo/static/admin/js/collapse.js rename to django/webshop/static/admin/js/collapse.js diff --git a/django/didgeridoo/static/admin/js/collapse.min.js b/django/webshop/static/admin/js/collapse.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/collapse.min.js rename to django/webshop/static/admin/js/collapse.min.js diff --git a/django/didgeridoo/static/admin/js/core.js b/django/webshop/static/admin/js/core.js similarity index 100% rename from django/didgeridoo/static/admin/js/core.js rename to django/webshop/static/admin/js/core.js diff --git a/django/didgeridoo/static/admin/js/inlines.js b/django/webshop/static/admin/js/inlines.js similarity index 100% rename from django/didgeridoo/static/admin/js/inlines.js rename to django/webshop/static/admin/js/inlines.js diff --git a/django/didgeridoo/static/admin/js/inlines.min.js b/django/webshop/static/admin/js/inlines.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/inlines.min.js rename to django/webshop/static/admin/js/inlines.min.js diff --git a/django/didgeridoo/static/admin/js/jquery.init.js b/django/webshop/static/admin/js/jquery.init.js similarity index 100% rename from django/didgeridoo/static/admin/js/jquery.init.js rename to django/webshop/static/admin/js/jquery.init.js diff --git a/django/didgeridoo/static/admin/js/popup_response.js b/django/webshop/static/admin/js/popup_response.js similarity index 100% rename from django/didgeridoo/static/admin/js/popup_response.js rename to django/webshop/static/admin/js/popup_response.js diff --git a/django/didgeridoo/static/admin/js/prepopulate.js b/django/webshop/static/admin/js/prepopulate.js similarity index 100% rename from django/didgeridoo/static/admin/js/prepopulate.js rename to django/webshop/static/admin/js/prepopulate.js diff --git a/django/didgeridoo/static/admin/js/prepopulate.min.js b/django/webshop/static/admin/js/prepopulate.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/prepopulate.min.js rename to django/webshop/static/admin/js/prepopulate.min.js diff --git a/django/didgeridoo/static/admin/js/prepopulate_init.js b/django/webshop/static/admin/js/prepopulate_init.js similarity index 100% rename from django/didgeridoo/static/admin/js/prepopulate_init.js rename to django/webshop/static/admin/js/prepopulate_init.js diff --git a/django/didgeridoo/static/admin/js/timeparse.js b/django/webshop/static/admin/js/timeparse.js similarity index 100% rename from django/didgeridoo/static/admin/js/timeparse.js rename to django/webshop/static/admin/js/timeparse.js diff --git a/django/didgeridoo/static/admin/js/urlify.js b/django/webshop/static/admin/js/urlify.js similarity index 100% rename from django/didgeridoo/static/admin/js/urlify.js rename to django/webshop/static/admin/js/urlify.js diff --git a/django/didgeridoo/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt b/django/webshop/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt rename to django/webshop/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt diff --git a/django/didgeridoo/static/admin/js/vendor/jquery/jquery.js b/django/webshop/static/admin/js/vendor/jquery/jquery.js similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/jquery/jquery.js rename to django/webshop/static/admin/js/vendor/jquery/jquery.js diff --git a/django/didgeridoo/static/admin/js/vendor/jquery/jquery.min.js b/django/webshop/static/admin/js/vendor/jquery/jquery.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/jquery/jquery.min.js rename to django/webshop/static/admin/js/vendor/jquery/jquery.min.js diff --git a/django/didgeridoo/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt b/django/webshop/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt rename to django/webshop/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt diff --git a/django/didgeridoo/static/admin/js/vendor/xregexp/xregexp.js b/django/webshop/static/admin/js/vendor/xregexp/xregexp.js similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/xregexp/xregexp.js rename to django/webshop/static/admin/js/vendor/xregexp/xregexp.js diff --git a/django/didgeridoo/static/admin/js/vendor/xregexp/xregexp.min.js b/django/webshop/static/admin/js/vendor/xregexp/xregexp.min.js similarity index 100% rename from django/didgeridoo/static/admin/js/vendor/xregexp/xregexp.min.js rename to django/webshop/static/admin/js/vendor/xregexp/xregexp.min.js diff --git a/django/didgeridoo/didgeridoo/__init__.py b/django/webshop/webshop/__init__.py similarity index 100% rename from django/didgeridoo/didgeridoo/__init__.py rename to django/webshop/webshop/__init__.py diff --git a/django/didgeridoo/didgeridoo/settings.py b/django/webshop/webshop/settings.py similarity index 92% rename from django/didgeridoo/didgeridoo/settings.py rename to django/webshop/webshop/settings.py index e37cfef..7cc45fa 100644 --- a/django/didgeridoo/didgeridoo/settings.py +++ b/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/' diff --git a/django/didgeridoo/didgeridoo/urls.py b/django/webshop/webshop/urls.py similarity index 90% rename from django/didgeridoo/didgeridoo/urls.py rename to django/webshop/webshop/urls.py index 9782dee..325d37e 100644 --- a/django/didgeridoo/didgeridoo/urls.py +++ b/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')), ] diff --git a/django/didgeridoo/didgeridoo/wsgi.py b/django/webshop/webshop/wsgi.py similarity index 73% rename from django/didgeridoo/didgeridoo/wsgi.py rename to django/webshop/webshop/wsgi.py index fe44040..a67fab6 100644 --- a/django/didgeridoo/didgeridoo/wsgi.py +++ b/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()