From e20c77707cd137139b6968dddc8df3cf042cefae Mon Sep 17 00:00:00 2001
From: Daniel Levy <daniell@aptivate.org>
Date: Tue, 9 Jun 2015 09:25:38 +0100
Subject: [PATCH] Change the default branch on staging to 'staging'
The default branch on staging was set to 'master'. This led to the
staging server not working because the wrong branch had been deployed.
---
deploy/project_settings.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/deploy/project_settings.py b/deploy/project_settings.py
index ae3af4f0..73972a46 100644
--- a/deploy/project_settings.py
+++ b/deploy/project_settings.py
@@ -13,12 +13,12 @@ from os import path
project_name = "internewshid"
# repository type can be "cvs", "svn" or "git"
-#repo_type = "svn"
-#repository = 'https://svn.aptivate.org/svn/' + project_name + '/dev'
+# repo_type = "svn"
+# repository = 'https://svn.aptivate.org/svn/' + project_name + '/dev'
repo_type = "git"
repository = 'git@git.aptivate.org:' + project_name + '.git'
-#repository = 'git@github.com:aptivate/' + project_name + '.git'
+# repository = 'git@github.com:aptivate/' + project_name + '.git'
##################################################################
# THESE SETTINGS MAY WELL BE CORRECT FOR A STANDARD DJANGO PROJECT
@@ -57,8 +57,8 @@ requirements_per_env = False
local_requirements_file = path.join(local_deploy_dir, 'pip_packages.txt')
# the requirements directory
-#requirements_per_env = True
-#local_requirements_dir = path.join(local_deploy_dir, 'requirements')
+# requirements_per_env = True
+# local_requirements_dir = path.join(local_deploy_dir, 'requirements')
# and the files should be path.join(requirements_dir, '%s.txt' % environment)
test_cmd = ' manage.py test'
@@ -72,7 +72,7 @@ host_list = {
# this is the default git branch to use on each server
default_branch = {
'production': 'master',
- 'staging': 'master',
+ 'staging': 'staging',
}
# where on the server the django apps are deployed
@@ -97,5 +97,5 @@ if socket.getfqdn().endswith('.fen.aptivate.org'):
# if you have an ssh key and particular user you need to use
# then uncomment the next 2 lines
-#user = "root"
-#key_filename = ["/home/shared/keypair.rsa"]
+# user = "root"
+# key_filename = ["/home/shared/keypair.rsa"]
--
GitLab