diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-11-14 11:43:23 -0800 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-11-14 11:43:23 -0800 |
| commit | e92a9065c99e4ab1c8b98521f77a1ddd0e0dad9a (patch) | |
| tree | e139885c6eaa15762978512883a128e1f464cee3 | |
| parent | 71d83211a7ff02aa4b2dd1cefc6e699d0aaf3460 (diff) | |
Move the uploads folder to another directory (outside of this repo)parabolaweb-2012-11-14
| -rw-r--r-- | local_settings.py.example | 18 | ||||
| -rwxr-xr-x | sitestatic/devs/aurelien.png | bin | 13049 -> 0 bytes | |||
| -rwxr-xr-x | sitestatic/devs/gtklocker.png | bin | 27710 -> 0 bytes | |||
| -rwxr-xr-x | sitestatic/devs/me001-crop.png | bin | 17884 -> 0 bytes | |||
| -rw-r--r-- | sitestatic/devs/silhouette.png | bin | 2411 -> 0 bytes | |||
| -rw-r--r--[l---------] | sitestatic/silhouette.png | bin | 19 -> 2411 bytes |
6 files changed, 9 insertions, 9 deletions
diff --git a/local_settings.py.example b/local_settings.py.example index 366af0a5..5316d67c 100644 --- a/local_settings.py.example +++ b/local_settings.py.example @@ -13,30 +13,30 @@ ADMINS = ( # ('Joe Admin', 'joeadmin@example.com'), ) -## MySQL Database settings +## PostgreSQL Database settings DATABASES = { 'default': { - 'ENGINE' : 'django.db.backends.mysql', + 'ENGINE' : 'django.db.backends.postgresql_psycopg2', 'NAME' : 'parabola', 'USER' : 'parabola', 'PASSWORD': 'parabola', 'HOST' : '', 'PORT' : '', - # InnoDB WILL NOT work - 'OPTIONS' : {'init_command': 'SET storage_engine=MyISAM'}, + 'OPTIONS' : {}, }, } -## PostgreSQL Database settings +## MySQL Database settings #DATABASES = { # 'default': { -# 'ENGINE' : 'django.db.backends.postgresql_psycopg2', +# 'ENGINE' : 'django.db.backends.mysql', # 'NAME' : 'parabola', # 'USER' : 'parabola', # 'PASSWORD': 'parabola', # 'HOST' : '', # 'PORT' : '', -# 'OPTIONS' : {}, +# # InnoDB WILL NOT work +# 'OPTIONS' : {'init_command': 'SET storage_engine=MyISAM'}, # }, #} @@ -65,10 +65,10 @@ CACHE_MIDDLEWARE_SECONDS = 300 SESSION_COOKIE_SECURE = False ## location for saving dev pictures (the 'devs' folder should be inside of this) -MEDIA_ROOT = '/srv/http/web/collected_static' +MEDIA_ROOT = '/srv/http/web-uploads' ## web url for serving image files (the 'devs' folder should be inside of this) -MEDIA_URL = '/static/' +MEDIA_URL = '/img/' ## Make this unique, and don't share it with anybody. SECRET_KEY = '00000000000000000000000000000000000000000000000' diff --git a/sitestatic/devs/aurelien.png b/sitestatic/devs/aurelien.png Binary files differdeleted file mode 100755 index 6b126f77..00000000 --- a/sitestatic/devs/aurelien.png +++ /dev/null diff --git a/sitestatic/devs/gtklocker.png b/sitestatic/devs/gtklocker.png Binary files differdeleted file mode 100755 index 58283900..00000000 --- a/sitestatic/devs/gtklocker.png +++ /dev/null diff --git a/sitestatic/devs/me001-crop.png b/sitestatic/devs/me001-crop.png Binary files differdeleted file mode 100755 index 8595008a..00000000 --- a/sitestatic/devs/me001-crop.png +++ /dev/null diff --git a/sitestatic/devs/silhouette.png b/sitestatic/devs/silhouette.png Binary files differdeleted file mode 100644 index c957292e..00000000 --- a/sitestatic/devs/silhouette.png +++ /dev/null diff --git a/sitestatic/silhouette.png b/sitestatic/silhouette.png Binary files differindex 4617a418..c957292e 120000..100644 --- a/sitestatic/silhouette.png +++ b/sitestatic/silhouette.png |
