diff options
Diffstat (limited to 'install')
| -rwxr-xr-x | install/install.sh | 7 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/install/install.sh b/install/install.sh index 92d0684c6..e1476e7af 100755 --- a/install/install.sh +++ b/install/install.sh @@ -11,8 +11,8 @@ APP_NAME=${APP_NAME-default} [ -z $URL ] && ( echo 'URL empty. Default to: "localhost".' ; URL=localhost ; ); URL=${URL-localhost} -[ -z "$PROJECT_NAME" ] && ( echo 'PROJECT_NAME empty. Default to: "Test".' ; ); -PROJECT_NAME=${PROJECT_NAME-Test} +[ -z "$PROJECT_NAME" ] && ( echo 'PROJECT_NAME empty. Default to: "'$APP_NAME'".' ; ); +PROJECT_NAME=${PROJECT_NAME-$APP_NAME} DEFAULT_DATA='fr' # available data: 'fr' @@ -161,7 +161,8 @@ sed -s "s|#APP_NAME#|$APP_NAME|g;\ ln -s $INSTALL_PATH'/conf/local_settings.py' $APP_DIR'/local_settings.py' # rights -mkdir $APP_DIR'/media' +mkdir -p "$APP_DIR/media/imported" +mkdir -p "$APP_DIR/media/upload" chown -R root:www-data $APP_DIR'/media' chmod -R g+w $APP_DIR'/media' diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 3f37b0e72..459828c00 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -7,6 +7,7 @@ TEMPLATE_DEBUG = DEBUG SQL_DEBUG = False APP_NAME = u"#PROJECT_NAME#" +PROJECT_SLUG = u"#PROJECT_NAME#" ROOT_URLCONF = '#APP_NAME#.urls' STATIC_URL = '/static-#DATE#/' SECRET_KEY = "#SECRET_KEY#" @@ -25,7 +26,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': '#DB_NAME#', + 'NAME': '#DB_NAME#', 'HOST': '#DB_HOST#', 'PORT': '#DB_PORT#', 'USER': '#DB_NAME#', @@ -40,4 +41,3 @@ EXTRA_APPS = [ 'archaeological_warehouse', 'archaeological_finds', ] - |