1. Michael Ziegler
  2. webtex

Commits

Michael Ziegler  committed 0441c9b

moved settings.py to .dist and added it to hgignore

  • Participants
  • Parent commits e986fd5
  • Branches default

Comments (0)

Files changed (3)

File .hgignore

View file
 syntax: glob
 
 *.pyc
+settings.py

File pyweb/settings.py

-# -*- coding: utf-8 -*-
-# Django settings for pyweb project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-PROJECT_ROOT = None;
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'postgresql_psycopg2'	# 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'www_webtex'		# Or path to database file if using sqlite3.
-DATABASE_USER = 'webtex'		# Not used with sqlite3.
-DATABASE_PASSWORD = 'lAtExFtW'		# Not used with sqlite3.
-DATABASE_HOST = ''			# Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''			# Set to empty string for default. Not used with sqlite3.
-
-
-from os.path import join, dirname, abspath
-
-if not PROJECT_ROOT:
-	PROJECT_ROOT = dirname(dirname(abspath(__file__)));
-
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/Berlin'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = join( PROJECT_ROOT, 'htdocs' );
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/static/'
-
-HG_ROOT     = join( PROJECT_ROOT, "hg"  );
-HG_LAB      = join( PROJECT_ROOT, "lab" );
-HG_URL      = "https://hg.svedr.in/";
-HG_USERURL  = "https://{{username}}@hg.svedr.in/";
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '!d_qm0d0*gkr5goo@ddwie83e$0y$w7ld^0f=y47386wl_@(ye'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'pyweb.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    join( PROJECT_ROOT, "templates" )
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.admin',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'repos',
-)

File pyweb/settings.py.dist

View file
+# -*- coding: utf-8 -*-
+# Django settings for pyweb project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+PROJECT_ROOT = None;
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = 'postgresql_psycopg2'	# 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = 'www_webtex'		# Or path to database file if using sqlite3.
+DATABASE_USER = 'webtex'		# Not used with sqlite3.
+DATABASE_PASSWORD = 'lAtExFtW'		# Not used with sqlite3.
+DATABASE_HOST = ''			# Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''			# Set to empty string for default. Not used with sqlite3.
+
+
+from os.path import join, dirname, abspath
+
+if not PROJECT_ROOT:
+	PROJECT_ROOT = dirname(dirname(abspath(__file__)));
+
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'Europe/Berlin'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = join( PROJECT_ROOT, 'htdocs' );
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = '/static/'
+
+HG_ROOT     = join( PROJECT_ROOT, "hg"  );
+HG_LAB      = join( PROJECT_ROOT, "lab" );
+HG_URL      = "https://hg.svedr.in/";
+HG_USERURL  = "https://{{username}}@hg.svedr.in/";
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '!d_qm0d0*gkr5goo@ddwie83e$0y$w7ld^0f=y47386wl_@(ye'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+ROOT_URLCONF = 'pyweb.urls'
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    join( PROJECT_ROOT, "templates" )
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.admin',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'repos',
+)