Ronny Abraham
34e887e890
changed the way docker is initialized, the container name now defaults to the main docker name for the services in the <branch>.yml file
...
modified: initialize.py
2016-11-16 12:52:39 +02:00
Ronny Abraham
0f56f81bf3
fixed deploy.media initialize.environment call to get_config for the destination config, otherwise it overwrites the global env variable
...
modified: modules/deploy.py
2016-11-10 22:38:26 +02:00
Ronny Abraham
b006e3d419
added ability to hide output for database.backup
...
modified: modules/database.py
2016-11-10 22:37:11 +02:00
Ronny Abraham
9c032714c5
corrected problem with article items and the rectangle/triangle thing
...
modified: modules/deploy.py
2016-11-10 16:03:15 +02:00
Ronny Abraham
1fce8f0c54
commented out unnecessary code
...
modified: modules/deploy.py
2016-11-09 05:01:48 +02:00
Ronny Abraham
13fd4c962c
switched def sync back, now it syncs from source branch to the current branch
...
modified: modules/database.py
2016-11-08 19:42:47 +02:00
Ronny Abraham
28cc86f227
sync media files from current branch to destination branch
...
modified: modules/deploy.py
2016-11-08 19:36:25 +02:00
Ronny Abraham
7d6c179f6a
changed so sync now goes TO the destination branch, also changed variable name fro clarity
...
modified: modules/database.py
2016-11-08 19:33:49 +02:00
Ronny Abraham
441f8b4be6
streamlined code in database.backup
...
Changes to be committed:
modified: modules/database.py
2016-09-23 00:18:23 +03:00
Ronny Abraham
b74a15c9cc
got rid of some override code checking when doing debugging
...
Changes to be committed:
modified: ../../../modules/deploy.py
2016-09-21 17:12:11 +03:00
Ronny Abraham
f86404d634
added some debugging code in generate_gunicorn
...
Changes to be committed:
modified: ../../../modules/django.py
2016-09-21 17:11:34 +03:00
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
c6c062b333
modified: modules/django.py
2016-09-21 16:20:32 +03:00
Ronny Abraham
0ad9e5b772
Merge branch 'majorchange' of bitbucket.org:ronnyabraham/fabric into majorchange
2016-09-21 16:18:34 +03:00
Ronny Abraham
9cb2341aaa
added deploy.ssh method, also got rid of override
...
Changes to be committed:
modified: modules/deploy.py
modified: modules/initialize.py
2016-09-21 16:11:27 +03:00
Ronny Abraham
328de1596b
changed param in freeze to from default none to 'help'
...
modified: modules/pip.py
2016-09-21 16:10:46 +03:00
Ronny Abraham
b427df6924
Merge branch 'majorchange' of bitbucket.org:ronnyabraham/fabric into majorchange
2016-09-21 15:53:55 +03:00
Ronny Abraham
8a3a66a9fd
created copyto method
...
modified: modules/pip.py
2016-09-21 15:44:46 +03:00
Ronny Abraham
e4f80bf0ae
addying copy method to copy over pip requirements files from one branch to another
...
modified: modules/pip.py
2016-09-21 15:24:49 +03:00
Ronny Abraham
f411c576cf
changed virtualenv.requirments variable to a dict that holds local, remote, filename and full ppath filepath for each requirements file
...
modified: modules/initialize.py
2016-09-21 15:24:01 +03:00
Ronny Abraham
408a36d5a5
created new method printerr
...
modified: modules/utils.py
2016-09-21 15:23:28 +03:00
Ronny Abraham
bc289e78ea
fixed nginx port error for default dev value
...
Changes to be committed:
modified: bin/deploy_meta.py
2016-09-21 01:44:43 +03:00
Ronny Abraham
20ebbe21b8
Merge branch 'majorchange' of bitbucket.org:ronnyabraham/fabric into majorchange
2016-09-21 01:18:46 +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
384554b9af
Merge branch 'majorchange' of bitbucket.org:ronnyabraham/fabric into majorchange
2016-09-20 18:42:53 +03:00
Ronny Abraham
595f1ba09d
changed name of commandline method
...
modified: modules/django.py
2016-09-20 18:41:18 +03:00
Ronny Abraham
89643d3497
updated paths to meta/project
...
modified: deploy_meta.py
modified: test.py
2016-09-19 15:23:13 +03:00
Ronny Abraham
a56eabbdd4
changed storage for meta config files to meta/project
...
modified: modules/maintenance.py
2016-09-18 16:57:17 +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
d42f118ad6
got rid of unnecesary testing directory
2016-09-15 21:27:23 +03:00
Ronny Abraham
2a0179aa36
renamed conf_setup in display list
...
modified: api.py
2016-09-15 21:26:35 +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
23a8a0ac45
using gridlayout again
...
modified: deploy_meta.py
2016-09-15 21:15:03 +03:00
Ronny Abraham
dbec1a433e
tried using hbox and vbox layouts
...
modified: deploy_meta.py
2016-09-15 20:55:50 +03:00
Ronny Abraham
4b0768c534
adding means to deploy and test deployment of meta files
...
new file: bin/deploy_meta.py
new file: bin/test.py
2016-09-15 20:39:22 +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
12c57354f7
changed directory that fabric.yml gets found
...
modified: modules/maintenance.py
2016-09-15 20:28:07 +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
Ronny Abraham
8a77bfedd0
got rid of django 1.8 template debug error
...
modified: templates/conf/django/files/local.jinja2
modified: templates/conf/gunicorn/files/local.jinja2
2016-09-13 19:07:24 +03:00
Ronny Abraham
b3c1c251fa
deleted: resources/ronnyabraham.pem
2016-09-12 21:14:50 +03:00
Ronny Abraham
90137fd692
added media method to sync media files between branches
...
modified: modules/deploy.py
2016-09-12 20:47:52 +03:00
Ronny Abraham
12ab59b33e
modified: modules/conf_setup.py
...
modified: templates/meta/staging.yml
2016-09-09 06:23:49 +03:00
Ronny Abraham
829b1d3cb0
got rid pyc file
2016-09-08 19:41:55 +03:00
Ronny Abraham
23da1736ee
added some debug checking in gunicorn generate
...
modified: modules/django.py
2016-09-07 22:03:10 +03:00
Ronny Abraham
f1a4da7553
added check_app method, and fixtures method from debates_eu
...
modified: modules/django.py
2016-09-07 21:52:40 +03:00
Ronny Abraham
c1fc497547
added extendedname variable to gunciorn generation
...
modified: modules/django.py
2016-09-07 21:51:47 +03:00