summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apache/staging.conf6
-rw-r--r--apache/staging.wsgi2
-rw-r--r--settings.py4
-rw-r--r--urls.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/apache/staging.conf b/apache/staging.conf
index 919a3d6..ec81a1e 100644
--- a/apache/staging.conf
+++ b/apache/staging.conf
@@ -6,7 +6,7 @@
WSGIApplicationGroup caktus_website-staging
WSGIPassAuthorization On
- WSGIScriptAlias / /var/www/generic_django/apache/staging.wsgi/
+ WSGIScriptAlias / /var/www/fooz/apache/staging.wsgi/
<Location "/">
Order Allow,Deny
@@ -17,13 +17,13 @@
SetHandler None
</Location>
- Alias /media /var/www/staging/generic_django/media
+ Alias /media /var/www/staging/fooz/media
<Location "/adminmedia">
SetHandler None
</Location>
- Alias /adminmedia /var/www/staging/generic_django/media/admin
+ Alias /adminmedia /var/www/staging/fooz/media/admin
ErrorLog /var/www/log/error.log
LogLevel info
diff --git a/apache/staging.wsgi b/apache/staging.wsgi
index 33e898a..5462d0b 100644
--- a/apache/staging.wsgi
+++ b/apache/staging.wsgi
@@ -6,7 +6,7 @@ PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
site_packages = os.path.join(PROJECT_ROOT, 'env/lib/python2.6/site-packages')
site.addsitedir(os.path.abspath(site_packages))
sys.path.insert(0, PROJECT_ROOT)
-os.environ['DJANGO_SETTINGS_MODULE'] = 'generic_django.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'fooz.settings'
import django.core.handlers.wsgi
application = django.core.handlers.wsgi.WSGIHandler() \ No newline at end of file
diff --git a/settings.py b/settings.py
index ab09e9b..4302900 100644
--- a/settings.py
+++ b/settings.py
@@ -67,7 +67,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware',
)
-ROOT_URLCONF = 'generic_django.urls'
+ROOT_URLCONF = 'fooz.urls'
TEMPLATE_DIRS = (
os.path.join(SITE_ROOT, 'templates'),
@@ -89,6 +89,6 @@ INSTALLED_APPS = (
'django.contrib.markup',
'django.contrib.sessions',
'django.contrib.sites',
- 'generic_django.main',
+ 'fooz.main',
)
diff --git a/urls.py b/urls.py
index 2caeb67..e953a41 100644
--- a/urls.py
+++ b/urls.py
@@ -6,9 +6,9 @@ from django.conf import settings
# admin.autodiscover()
urlpatterns = patterns('',
- (r'^$', 'generic_django.main.views.index'),
+ (r'^$', 'fooz.main.views.index'),
# Example:
- # (r'^generic_django/', include('generic_django.foo.urls')),
+ # (r'^fooz/', include('fooz.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
# (r'^admin/doc/', include('django.contrib.admindocs.urls')),