Commit graph

60 commits

Author SHA1 Message Date
Ronny Abraham
23bf2b7c9c staging and production project config files use specific gunicorn and nginx templates, changed the directory of those templates from scripts/conf to usr/etc
modified:   staging.yml
2016-09-21 17:10:14 +03:00
Ronny Abraham
7653bc692a added service name to top of jinja file when I saw I was getting
recraete conflicts
 Changes to be committed:
	modified:   share/templates/conf/docker/files/database.jinja2
2016-09-21 01:18:02 +03:00
Ronny Abraham
30094184b9 slight changes for PEP compliance
modified:   share/templates/conf/django/files/settings.jinja2
	modified:   share/templates/conf/gunicorn/files/settings.jinja2
2016-09-16 13:33:07 +03:00
Ronny Abraham
fd0e14b1b8 updated settings for the django 1.10
new file:   share/templates/conf/django/files/settings.1.9.jinja2
	modified:   share/templates/conf/django/files/settings.jinja2
	new file:   share/templates/conf/gunicorn/files/settings.1.9.jinja2
	modified:   share/templates/conf/gunicorn/files/settings.jinja2
2016-09-16 13:29:20 +03:00
Ronny Abraham
c8212df554 reflect changes of project/media to project/share/media
modified:   share/templates/conf/django/files/local.jinja2
	modified:   share/templates/conf/gunicorn/files/local.jinja2
2016-09-16 12:32:55 +03:00
Ronny Abraham
e91f62b794 major changes to layout
modified:   modules/conf_setup.py
	modified:   modules/docker.py
	modified:   modules/initialize.py
	modified:   modules/maintenance.py
	modified:   share/templates/conf/django/files/settings.jinja2
	modified:   share/templates/conf/gunicorn/files/settings.jinja2
	modified:   share/templates/meta/development.yml
	modified:   share/templates/meta/layout.yml
2016-09-15 22:15:57 +03:00
Ronny Abraham
ab69f72aff fixed project.branch variable storage
modified:   modules/conf_setup.py
	modified:   share/templates/meta/staging.yml
2016-09-15 21:15:32 +03:00
Ronny Abraham
596b6e7da3 fixed conf_setup backup so it has proper values it was using ' and " too much
modified:   modules/conf_setup.py
	modified:   share/templates/meta/development.yml
	modified:   share/templates/meta/layout.yml
	modified:   share/templates/meta/staging.yml
2016-09-15 20:36:20 +03:00
Ronny Abraham
85d28a6bb1 moved the configuration file to share directory
renamed:    conf/fabric.yml -> share/fabric.yml
2016-09-15 20:27:38 +03:00
Ronny Abraham
0a7632c7fb moved templates to share directory
renamed:    templates/conf/database/files/db.drop_all.sql.jinja2 -> share/templates/conf/database/files/db.drop_all.sql.jinja2
	renamed:    templates/conf/database/files/db.drop_db.sql.jinja2 -> share/templates/conf/database/files/db.drop_db.sql.jinja2
	renamed:    templates/conf/database/files/db.init.sql.jinja2 -> share/templates/conf/database/files/db.init.sql.jinja2
	renamed:    templates/conf/database/files/db.re_init.sql.jinja2 -> share/templates/conf/database/files/db.re_init.sql.jinja2
	renamed:    templates/conf/gunicorn/files/gunicorn.jinja2 -> share/templates/conf/django/files/gunicorn.jinja2
	renamed:    templates/conf/gunicorn/files/gunicorn.unixsocket.jinja2 -> share/templates/conf/django/files/gunicorn.unixsocket.jinja2
	renamed:    templates/conf/gunicorn/files/local.jinja2 -> share/templates/conf/django/files/local.jinja2
	renamed:    templates/conf/gunicorn/files/settings.jinja2 -> share/templates/conf/django/files/settings.jinja2
	renamed:    templates/conf/gunicorn/files/settings18.jinja2 -> share/templates/conf/django/files/settings18.jinja2
	renamed:    templates/conf/gunicorn/files/wsgi.jinja2 -> share/templates/conf/django/files/wsgi.jinja2
	renamed:    templates/conf/gunicorn/files/wsgi.py -> share/templates/conf/django/files/wsgi.py
	renamed:    templates/conf/docker/files/database.jinja2 -> share/templates/conf/docker/files/database.jinja2
	renamed:    templates/conf/django/files/gunicorn.jinja2 -> share/templates/conf/gunicorn/files/gunicorn.jinja2
	renamed:    templates/conf/django/files/gunicorn.unixsocket.jinja2 -> share/templates/conf/gunicorn/files/gunicorn.unixsocket.jinja2
	renamed:    templates/conf/django/files/local.jinja2 -> share/templates/conf/gunicorn/files/local.jinja2
	renamed:    templates/conf/django/files/settings.jinja2 -> share/templates/conf/gunicorn/files/settings.jinja2
	renamed:    templates/conf/django/files/settings18.jinja2 -> share/templates/conf/gunicorn/files/settings18.jinja2
	renamed:    templates/conf/django/files/wsgi.jinja2 -> share/templates/conf/gunicorn/files/wsgi.jinja2
	renamed:    templates/conf/django/files/wsgi.py -> share/templates/conf/gunicorn/files/wsgi.py
	renamed:    templates/conf/nginx/files/default.conf.jinja2 -> share/templates/conf/nginx/files/default.conf.jinja2
	renamed:    templates/conf/nginx/files/unixsocket.jinja2 -> share/templates/conf/nginx/files/unixsocket.jinja2
	renamed:    templates/conf/supervisor/files/conf_old -> share/templates/conf/supervisor/files/conf_old
	renamed:    templates/conf/supervisor/files/supervisor.jinja2 -> share/templates/conf/supervisor/files/supervisor.jinja2
	renamed:    templates/meta/development.yml -> share/templates/meta/development.yml
	renamed:    templates/meta/layout.yml -> share/templates/meta/layout.yml
	renamed:    templates/meta/staging.yml -> share/templates/meta/staging.yml
	renamed:    templates/readmes/aws.md -> share/templates/readmes/aws.md
	renamed:    templates/readmes/gandi.md -> share/templates/readmes/gandi.md
	renamed:    templates/readmes/reset_migrations.md -> share/templates/readmes/reset_migrations.md
	renamed:    templates/readmes/setup_gandi.md -> share/templates/readmes/setup_gandi.md
	renamed:    templates/readmes/translations.md -> share/templates/readmes/translations.md
	renamed:    templates/readmes/update_images.md -> share/templates/readmes/update_images.md
2016-09-15 20:26:39 +03:00