rename the django project
|
@ -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
|
||||
|
@ -13,23 +10,27 @@ WSGIPythonPath /vagrant/django/webshop/
|
|||
|
||||
ServerAdmin webmaster@localhost
|
||||
|
||||
Alias /media/ /vagrant/django/webshop/media/
|
||||
Alias /static/ /vagrant/django/webshop/static/
|
||||
Alias /media/ /vagrant/django/didgeridoo/media/
|
||||
Alias /static/ /vagrant/django/didgeridoo/static/
|
||||
|
||||
<Directory /vagrant/django/webshop/webshop>
|
||||
<Directory /vagrant/django/didgeridoo/didgeridoo>
|
||||
<Files wsgi.py>
|
||||
Require all granted
|
||||
</Files>
|
||||
</Directory>
|
||||
|
||||
|
||||
<Directory /vagrant/django/webshop/media>
|
||||
Require all granted
|
||||
</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/static>
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
||||
# error, crit, alert, emerg.
|
||||
|
@ -47,5 +48,3 @@ WSGIPythonPath /vagrant/django/webshop/
|
|||
# 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
|
||||
|
|
|
@ -10,26 +10,26 @@
|
|||
|
||||
ServerAdmin webmaster@localhost
|
||||
|
||||
Alias /media/ /vagrant/django/webshop/media/
|
||||
Alias /static/ /vagrant/django/webshop/static/
|
||||
Alias /media/ /vagrant/django/didgeridoo/media/
|
||||
Alias /static/ /vagrant/django/didgeridoo/static/
|
||||
|
||||
<Directory /vagrant/django/webshop/webshop>
|
||||
<Directory /vagrant/django/didgeridoo/didgeridoo>
|
||||
<Files wsgi.py>
|
||||
Require all granted
|
||||
</Files>
|
||||
</Directory>
|
||||
|
||||
|
||||
<Directory /vagrant/django/webshop/media>
|
||||
<Directory /vagrant/django/didgeridoo/media>
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<Directory /vagrant/django/webshop/static>
|
||||
<Directory /vagrant/django/didgeridoo/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
|
||||
WSGIScriptAlias / /vagrant/django/didgeridoo/didgeridoo/wsgi.py
|
||||
WSGIDaemonProcess didgeridoo python-path=/vagrant/django/didgeridoo processes=2 threads=15 display-name=%{GROUP}
|
||||
WSGIProcessGroup didgeridoo
|
||||
|
||||
|
||||
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
||||
|
@ -48,5 +48,3 @@
|
|||
# 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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Django settings for webshop project.
|
||||
Django settings for didgeridoo project.
|
||||
|
||||
Generated by 'django-admin startproject' using Django 1.10.7.
|
||||
|
||||
|
@ -31,6 +31,7 @@ ALLOWED_HOSTS = []
|
|||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'webshop.apps.WebshopConfig',
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
|
@ -49,7 +50,7 @@ MIDDLEWARE = [
|
|||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'webshop.urls'
|
||||
ROOT_URLCONF = 'didgeridoo.urls'
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
|
@ -67,7 +68,7 @@ TEMPLATES = [
|
|||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'webshop.wsgi.application'
|
||||
WSGI_APPLICATION = 'didgeridoo.wsgi.application'
|
||||
|
||||
|
||||
# Database
|
||||
|
@ -76,8 +77,8 @@ WSGI_APPLICATION = 'webshop.wsgi.application'
|
|||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.mysql',
|
||||
'NAME': 'webshopdb',
|
||||
'USER': 'webshop',
|
||||
'NAME': 'didgeridoodb',
|
||||
'USER': 'didgeridoo',
|
||||
'PASSWORD': '2YKtY53F3HDDzPyExAaSh3jdVNh6VN',
|
||||
'HOST': '127.0.0.1',
|
||||
'PORT': '3306',
|
||||
|
@ -125,4 +126,4 @@ USE_TZ = True
|
|||
# https://docs.djangoproject.com/en/1.10/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = '/vagrant/django/webshop/static/'
|
||||
STATIC_ROOT = '/vagrant/django/didgeridoo/static/'
|
|
@ -1,4 +1,4 @@
|
|||
"""webshop URL Configuration
|
||||
"""didgeridoo 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,4 +18,5 @@ from django.contrib import admin
|
|||
|
||||
urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^webshop/', include('webshop.urls')),
|
||||
]
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
WSGI config for webshop project.
|
||||
WSGI config for didgeridoo 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", "webshop.settings")
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "didgeridoo.settings")
|
||||
|
||||
application = get_wsgi_application()
|
|
@ -3,7 +3,7 @@ import os
|
|||
import sys
|
||||
|
||||
if __name__ == "__main__":
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webshop.settings")
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "didgeridoo.settings")
|
||||
try:
|
||||
from django.core.management import execute_from_command_line
|
||||
except ImportError:
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 504 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 560 B |
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 655 B |
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 655 B |
Before Width: | Height: | Size: 436 B After Width: | Height: | Size: 436 B |
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 560 B |
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 280 B After Width: | Height: | Size: 280 B |
|
@ -0,0 +1,3 @@
|
|||
from django.contrib import admin
|
||||
|
||||
# Register your models here.
|
|
@ -0,0 +1,5 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class WebshopConfig(AppConfig):
|
||||
name = 'webshop'
|
|
@ -0,0 +1,3 @@
|
|||
from django.db import models
|
||||
|
||||
# Create your models here.
|
|
@ -0,0 +1,3 @@
|
|||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
|
@ -0,0 +1,3 @@
|
|||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|