Merge lp:~milo/linaro-license-protection/bug1208756-configs into lp:linaro-license-protection/configs

Proposed by Milo Casagrande
Status: Merged
Merged at revision: 33
Proposed branch: lp:~milo/linaro-license-protection/bug1208756-configs
Merge into: lp:linaro-license-protection/configs
Diff against target: 52 lines (+8/-0)
4 files modified
django/settings_releases.py (+2/-0)
django/settings_snapshots.py (+2/-0)
django/settings_staging_releases.py (+2/-0)
django/settings_staging_snapshots.py (+2/-0)
To merge this branch: bzr merge lp:~milo/linaro-license-protection/bug1208756-configs
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Linaro Automation & Validation Pending
Review via email: mp+178739@code.launchpad.net

Description of the change

This merge proposal adds a sane value for UPLOAD_PATH setting for the different specialized settings we use.

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

+1 - ship it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django/settings_releases.py'
--- django/settings_releases.py 2012-10-24 09:45:58 +0000
+++ django/settings_releases.py 2013-08-06 12:21:36 +0000
@@ -21,7 +21,9 @@
21 os.path.join(PROJECT_ROOT, "templates_releases" ),21 os.path.join(PROJECT_ROOT, "templates_releases" ),
22 os.path.join(PROJECT_ROOT, "templates" ),22 os.path.join(PROJECT_ROOT, "templates" ),
23 )23 )
24
24SERVED_PATHS = ['/srv/releases.linaro.org/www']25SERVED_PATHS = ['/srv/releases.linaro.org/www']
26UPLOAD_PATH = '/srv/releases.linaro.org/uploads'
2527
26# Render TEXTILE files settings.28# Render TEXTILE files settings.
27LINUX_FILES = ('README.textile',29LINUX_FILES = ('README.textile',
2830
=== modified file 'django/settings_snapshots.py'
--- django/settings_snapshots.py 2012-10-24 09:45:58 +0000
+++ django/settings_snapshots.py 2013-08-06 12:21:36 +0000
@@ -21,7 +21,9 @@
21 os.path.join(PROJECT_ROOT, "templates_snapshots" ),21 os.path.join(PROJECT_ROOT, "templates_snapshots" ),
22 os.path.join(PROJECT_ROOT, "templates" ),22 os.path.join(PROJECT_ROOT, "templates" ),
23 )23 )
24
24SERVED_PATHS = ['/srv/snapshots.linaro.org/www']25SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
26UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'
2527
26# Render TEXTILE files settings.28# Render TEXTILE files settings.
27LINUX_FILES = ('README',29LINUX_FILES = ('README',
2830
=== modified file 'django/settings_staging_releases.py'
--- django/settings_staging_releases.py 2012-10-23 16:16:08 +0000
+++ django/settings_staging_releases.py 2013-08-06 12:21:36 +0000
@@ -17,7 +17,9 @@
17 os.path.join(PROJECT_ROOT, "templates_releases" ),17 os.path.join(PROJECT_ROOT, "templates_releases" ),
18 os.path.join(PROJECT_ROOT, "templates" ),18 os.path.join(PROJECT_ROOT, "templates" ),
19 )19 )
20
20SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']21SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
22UPLOAD_PATH = '/srv/staging.releases.linaro.org/uploads'
2123
22# Render TEXTILE files settings.24# Render TEXTILE files settings.
23LINUX_FILES = ('README.textile',25LINUX_FILES = ('README.textile',
2426
=== modified file 'django/settings_staging_snapshots.py'
--- django/settings_staging_snapshots.py 2012-08-16 09:56:08 +0000
+++ django/settings_staging_snapshots.py 2013-08-06 12:21:36 +0000
@@ -17,4 +17,6 @@
17 os.path.join(PROJECT_ROOT, "templates_snapshots" ),17 os.path.join(PROJECT_ROOT, "templates_snapshots" ),
18 os.path.join(PROJECT_ROOT, "templates" ),18 os.path.join(PROJECT_ROOT, "templates" ),
19 )19 )
20
20SERVED_PATHS = ['/srv/staging.snapshots.linaro.org/www']21SERVED_PATHS = ['/srv/staging.snapshots.linaro.org/www']
22UPLOAD_PATH = '/srv/staging.snapshots.linaro.org/uploads'

Subscribers

People subscribed via source and target branches