|
@ -1,3 +1,6 @@
|
||||||
|
WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
|
||||||
|
WSGIPythonPath /vagrant/django/webshop/
|
||||||
|
|
||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
# The ServerName directive sets the request scheme, hostname and port that
|
# The ServerName directive sets the request scheme, hostname and port that
|
||||||
# the server uses to identify itself. This is used when creating
|
# the server uses to identify itself. This is used when creating
|
||||||
|
@ -10,27 +13,23 @@
|
||||||
|
|
||||||
ServerAdmin webmaster@localhost
|
ServerAdmin webmaster@localhost
|
||||||
|
|
||||||
Alias /media/ /vagrant/django/didgeridoo/media/
|
Alias /media/ /vagrant/django/webshop/media/
|
||||||
Alias /static/ /vagrant/django/didgeridoo/static/
|
Alias /static/ /vagrant/django/webshop/static/
|
||||||
|
|
||||||
<Directory /vagrant/django/didgeridoo/didgeridoo>
|
<Directory /vagrant/django/webshop/webshop>
|
||||||
<Files wsgi.py>
|
<Files wsgi.py>
|
||||||
Require all granted
|
Require all granted
|
||||||
</Files>
|
</Files>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
|
|
||||||
<Directory /vagrant/django/didgeridoo/media>
|
<Directory /vagrant/django/webshop/media>
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</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,
|
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
||||||
# error, crit, alert, emerg.
|
# error, crit, alert, emerg.
|
||||||
|
@ -48,3 +47,5 @@
|
||||||
# after it has been globally disabled with "a2disconf".
|
# after it has been globally disabled with "a2disconf".
|
||||||
#Include conf-available/serve-cgi-bin.conf
|
#Include conf-available/serve-cgi-bin.conf
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
||||||
|
|
|
@ -10,26 +10,26 @@
|
||||||
|
|
||||||
ServerAdmin webmaster@localhost
|
ServerAdmin webmaster@localhost
|
||||||
|
|
||||||
Alias /media/ /vagrant/django/didgeridoo/media/
|
Alias /media/ /vagrant/django/webshop/media/
|
||||||
Alias /static/ /vagrant/django/didgeridoo/static/
|
Alias /static/ /vagrant/django/webshop/static/
|
||||||
|
|
||||||
<Directory /vagrant/django/didgeridoo/didgeridoo>
|
<Directory /vagrant/django/webshop/webshop>
|
||||||
<Files wsgi.py>
|
<Files wsgi.py>
|
||||||
Require all granted
|
Require all granted
|
||||||
</Files>
|
</Files>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
|
|
||||||
<Directory /vagrant/django/didgeridoo/media>
|
<Directory /vagrant/django/webshop/media>
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Directory /vagrant/django/didgeridoo/static>
|
<Directory /vagrant/django/webshop/static>
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
WSGIScriptAlias / /vagrant/django/didgeridoo/didgeridoo/wsgi.py
|
WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
|
||||||
WSGIDaemonProcess didgeridoo python-path=/vagrant/django/didgeridoo processes=2 threads=15 display-name=%{GROUP}
|
WSGIDaemonProcess webshop python-path=/vagrant/django/webshop processes=2 threads=15 display-name=%{GROUP}
|
||||||
WSGIProcessGroup didgeridoo
|
WSGIProcessGroup webshop
|
||||||
|
|
||||||
|
|
||||||
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
||||||
|
@ -48,3 +48,5 @@
|
||||||
# after it has been globally disabled with "a2disconf".
|
# after it has been globally disabled with "a2disconf".
|
||||||
#Include conf-available/serve-cgi-bin.conf
|
#Include conf-available/serve-cgi-bin.conf
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
from django.contrib import admin
|
|
||||||
|
|
||||||
# Register your models here.
|
|
|
@ -1,5 +0,0 @@
|
||||||
from django.apps import AppConfig
|
|
||||||
|
|
||||||
|
|
||||||
class WebshopConfig(AppConfig):
|
|
||||||
name = 'webshop'
|
|
|
@ -1,3 +0,0 @@
|
||||||
from django.db import models
|
|
||||||
|
|
||||||
# Create your models here.
|
|
|
@ -1,3 +0,0 @@
|
||||||
from django.test import TestCase
|
|
||||||
|
|
||||||
# Create your tests here.
|
|
|
@ -1,3 +0,0 @@
|
||||||
from django.shortcuts import render
|
|
||||||
|
|
||||||
# Create your views here.
|
|
|
@ -3,7 +3,7 @@ import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "didgeridoo.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webshop.settings")
|
||||||
try:
|
try:
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
except ImportError:
|
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 |
|
@ -1,5 +1,5 @@
|
||||||
"""
|
"""
|
||||||
Django settings for didgeridoo project.
|
Django settings for webshop project.
|
||||||
|
|
||||||
Generated by 'django-admin startproject' using Django 1.10.7.
|
Generated by 'django-admin startproject' using Django 1.10.7.
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@ ALLOWED_HOSTS = []
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
'webshop.apps.WebshopConfig',
|
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
|
@ -50,7 +49,7 @@ MIDDLEWARE = [
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = 'didgeridoo.urls'
|
ROOT_URLCONF = 'webshop.urls'
|
||||||
|
|
||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
|
@ -68,7 +67,7 @@ TEMPLATES = [
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
WSGI_APPLICATION = 'didgeridoo.wsgi.application'
|
WSGI_APPLICATION = 'webshop.wsgi.application'
|
||||||
|
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
|
@ -77,8 +76,8 @@ WSGI_APPLICATION = 'didgeridoo.wsgi.application'
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.mysql',
|
'ENGINE': 'django.db.backends.mysql',
|
||||||
'NAME': 'didgeridoodb',
|
'NAME': 'webshopdb',
|
||||||
'USER': 'didgeridoo',
|
'USER': 'webshop',
|
||||||
'PASSWORD': '2YKtY53F3HDDzPyExAaSh3jdVNh6VN',
|
'PASSWORD': '2YKtY53F3HDDzPyExAaSh3jdVNh6VN',
|
||||||
'HOST': '127.0.0.1',
|
'HOST': '127.0.0.1',
|
||||||
'PORT': '3306',
|
'PORT': '3306',
|
||||||
|
@ -126,4 +125,4 @@ USE_TZ = True
|
||||||
# https://docs.djangoproject.com/en/1.10/howto/static-files/
|
# https://docs.djangoproject.com/en/1.10/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
STATIC_ROOT = '/vagrant/django/didgeridoo/static/'
|
STATIC_ROOT = '/vagrant/django/webshop/static/'
|
|
@ -1,4 +1,4 @@
|
||||||
"""didgeridoo URL Configuration
|
"""webshop URL Configuration
|
||||||
|
|
||||||
The `urlpatterns` list routes URLs to views. For more information please see:
|
The `urlpatterns` list routes URLs to views. For more information please see:
|
||||||
https://docs.djangoproject.com/en/1.10/topics/http/urls/
|
https://docs.djangoproject.com/en/1.10/topics/http/urls/
|
||||||
|
@ -18,5 +18,4 @@ from django.contrib import admin
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^admin/', admin.site.urls),
|
url(r'^admin/', admin.site.urls),
|
||||||
url(r'^webshop/', include('webshop.urls')),
|
|
||||||
]
|
]
|
|
@ -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``.
|
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
|
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()
|
application = get_wsgi_application()
|