From 8c4e1ec96871a9fda431a977137b837a3dfc9e5d Mon Sep 17 00:00:00 2001 From: German Hoffman Date: Tue, 26 Apr 2016 16:47:09 -0300 Subject: [PATCH 1/3] Update requirements.txt --- deploy/roles/application/files/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/roles/application/files/requirements.txt b/deploy/roles/application/files/requirements.txt index 1a3424e..a10de53 100644 --- a/deploy/roles/application/files/requirements.txt +++ b/deploy/roles/application/files/requirements.txt @@ -1,4 +1,4 @@ -Django==1.7.3 +Django>=1.9,<1.9.99 psycopg2==2.5.4 argparse==1.3.0 From a783f9fcb582d1672d6f9df8d75ff192b8b71881 Mon Sep 17 00:00:00 2001 From: German Hoffman Date: Tue, 26 Apr 2016 17:06:09 -0300 Subject: [PATCH 2/3] database settings changed in Django 1.8 --- deploy/roles/application/templates/django/settings.py.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/roles/application/templates/django/settings.py.j2 b/deploy/roles/application/templates/django/settings.py.j2 index 90a4fc7..d1a2d31 100644 --- a/deploy/roles/application/templates/django/settings.py.j2 +++ b/deploy/roles/application/templates/django/settings.py.j2 @@ -102,7 +102,7 @@ DATABASES = { # Optimizes read heavy PG workload, install only if PG if '{{ settings_dbbackend }}' == 'postgresql_psycopg2': - DATABASES['default']['OPTIONS'] = {'autocommit': True} + DATABASES['default']['AUTOCOMMIT'] = True # Internationalization LANGUAGE_CODE = 'en-us' From 7289d36cb8ea8a2eb0037e499e045e98cc033695 Mon Sep 17 00:00:00 2001 From: German Hoffman Date: Tue, 24 May 2016 11:36:55 -0300 Subject: [PATCH 3/3] Update Vagrantfile Vagrant wants to change the default insecure key, this settings prevents this --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index 6f6e717..2a16f94 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,6 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.ssh.forward_agent = true config.ssh.private_key_path = "deploy/keys/vagrant" + config.ssh.insert_key = false config.vm.provider :virtualbox do |vb| vb.customize ["modifyvm", :id, "--memory", "1024"]