django-repositories/fabric
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified: modules/conf_setup.py

Browse source 
modified:   templates/meta/staging.yml
This commit is contained in:
Ronny Abraham 2016-09-09 06:23:49 +03:00
parent 829b1d3cb0
commit 12ab59b33e
2 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
modules/conf_setup.py
View file

@ -116,45 +116,60 @@ def _modify_configuration(branch):
# #
# basic project configuration # basic project configuration
config_yaml['project']['name'] = "PROJECT_NAME" branch = config_yaml['project']['branch']
config_yaml['project']['paths']['home'] = "PROJECT_NAME.prj"
config_yaml['project']['user'] = "BRANCH_USER" config_yaml['project']['name'] = "\"PROJECT_NAME\""
config_yaml['project']['group'] = "BRANCH_GROUP"
# we don't use 'paths/home' in anything other than dev
if branch == 'development':
config_yaml['project']['paths']['home'] = "\"PROJECT_NAME.prj\""
config_yaml['project']['user'] = '"BRANCH_USER"'
config_yaml['project']['group'] = '"BRANCH_GROUP"'
config_yaml['project']['extension'] = '"BRANCH_NAME"'
if config_yaml['project']['host'] != 'localhost': if config_yaml['project']['host'] != 'localhost':
config_yaml['project']['host'] = "PROJECT_IP" config_yaml['project']['host'] = '"PROJECT_IP"'
# #
# database configuration # database configuration
config_yaml['database']['name'] = "PROJECT_NAME_" + \ config_yaml['database']['name'] = '"PROJECT_NAME_{{branch}}"'.format(
config_yaml['project']['extension'] branch=config_yaml['project']['extension'])
if config_yaml['database']['host'] == "docker": if config_yaml['database']['host'] == "docker":
config_yaml['database']['port'] = "DOCKER_PORT" config_yaml['database']['port'] = '"DOCKER_PORT"'
else: else:
config_yaml['database']['host'] = "DATABASE_IP" config_yaml['database']['host'] = '"DATABASE_IP"'
# #
# database user name values # database user name values
config_yaml['database']['users']['admin']['name'] = "DATABASE_ADMIN_NAME" config_yaml['database']['users']['admin']['name'] = \
config_yaml['database']['users']['admin']['pass'] = "DATABASE_ADMIN_PASS" '"DATABASE_ADMIN_NAME"'
config_yaml['database']['users']['default']['name'] = "DATABASE_USER_NAME" config_yaml['database']['users']['admin']['pass'] = \
config_yaml['database']['users']['default']['pass'] = "DATABASE_USER_PASS" '"DATABASE_ADMIN_PASS"'
config_yaml['database']['users']['default']['name'] = \
'"DATABASE_USER_NAME"'
config_yaml['database']['users']['default']['pass'] = \
'"DATABASE_USER_PASS"'
# #
# django configuration # django configuration
config_yaml['django']['port'] = "DJANGO_PORT" config_yaml['django']['port'] = '"DJANGO_PORT"'
config_yaml['django']['host'] = "DJANGO_IP" config_yaml['django']['host'] = '"DJANGO_IP"'
# #
# nginx and virtualenv configuration # nginx and virtualenv configuration
config_yaml['nginx']['port'] = "NGINX_PORT" config_yaml['nginx']['port'] = '"NGINX_PORT"'
config_yaml['virtualenv']['name'] = "PROJECT_NAME"
if hasattr(config_yaml['virtualenv'], 'name'):
config_yaml['virtualenv']['name'] = '"PROJECT_NAME"'
return config_yaml return config_yaml

27
templates/meta/staging.yml
View file

@ -1,8 +1,20 @@
project:
name: PROJECT_NAME
branch: BRANCH_NAME
extension: BRANCH_EXT
host: PROJECT_IP
paths: {root: /home/website}
user: BRANCH_USER
group: BRANCH_GROUP
sudo: true
database: database:
backend: postgresql_psycopg2
host: DATABASE_IP
name: PROJECT_NAME_stg
port: 5432 port: 5432
name: PROJECT_NAME_BRANCH_EXT
host: DATABASE_IP
backend: postgresql_psycopg2
users: users:
admin: {name: DATABASE_ADMIN_NAME, pass: DATABASE_ADMIN_PASS} admin: {name: DATABASE_ADMIN_NAME, pass: DATABASE_ADMIN_PASS}
default: {name: DATABASE_USER_NAME, pass: DATABASE_USER_PASS} default: {name: DATABASE_USER_NAME, pass: DATABASE_USER_PASS}
@ -25,15 +37,6 @@ nginx:
paths: {available: sites-available, enabled: sites-enabled, root: /etc/nginx} paths: {available: sites-available, enabled: sites-enabled, root: /etc/nginx}
port: NGINX_PORT port: NGINX_PORT
overrides: [null] overrides: [null]
project:
branch: staging
extension: stg
group: BRANCH_GROUP
host: PROJECT_IP
name: PROJECT_NAME
paths: {root: /home/website}
sudo: true
user: BRANCH_USER
rootpath: /var/www rootpath: /var/www
supervisor: supervisor:
paths: {conf: /etc/supervisor/conf.d} paths: {conf: /etc/supervisor/conf.d}