Changeset 1057 in main


Ignore:
Timestamp:
04/27/12 07:34:10 (7 years ago)
Author:
pcosquer
Message:

settings: change DATABASE_* settings to DATABASE ={...} versions
Note: if you update with svn, you can keep your conflicts (mc option)
--Cette ligne, et les suivantes ci-dessous, seront ignorés--

M openPLM/settings.py

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openPLM/settings.py

    r1049 r1057  
    1818MANAGERS = ADMINS 
    1919 
    20 DATABASE_ENGINE = 'postgresql_psycopg2'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 
    21 DATABASE_NAME = 'openplm'             # Or path to database file if using sqlite3. 
    22 DATABASE_USER = 'django'             # Not used with sqlite3. 
    23  
    24 #XYZ: should be the password set by the postgresql command  
    25 # "create role django with password 'MyPassword' login;" 
    26 DATABASE_PASSWORD = 'django#6'         # Not used with sqlite3. 
    27  
    28 DATABASE_HOST = 'localhost'             # Set to empty string for localhost. Not used with sqlite3. 
    29 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3. 
     20DATABASES = { 
     21    'default': { 
     22        'ENGINE': 'django.db.backends.postgresql_psycopg2', # or 'postgresql', 'mysql', 'sqlite3', 'oracle'. 
     23        'NAME': 'openplm',               # Or path to database file if using sqlite3. 
     24        'USER': 'django',                # Not used with sqlite3. 
     25        #XYZ: should be the password set by the postgresql command  
     26        # "create role django with password 'MyPassword' login;" 
     27        'PASSWORD': 'MyPassword',        # Not used with sqlite3. 
     28        'HOST': 'localhost',             # Set to empty string for localhost. Not used with sqlite3. 
     29        'PORT': '',                      # Set to empty string for default. Not used with sqlite3. 
     30    } 
     31} 
     32 
    3033 
    3134#XYZ: Local time zone for this installation. Choices can be found here: 
Note: See TracChangeset for help on using the changeset viewer.