linaro-license-protection

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

  1. bug1208756-configs
  2. Merge into 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
1=== modified file 'django/settings_releases.py'
2--- django/settings_releases.py 2012-10-24 09:45:58 +0000
3+++ django/settings_releases.py 2013-08-06 12:21:36 +0000
4@@ -21,7 +21,9 @@
5 os.path.join(PROJECT_ROOT, "templates_releases" ),
6 os.path.join(PROJECT_ROOT, "templates" ),
7 )
8+
9 SERVED_PATHS = ['/srv/releases.linaro.org/www']
10+UPLOAD_PATH = '/srv/releases.linaro.org/uploads'
11
12 # Render TEXTILE files settings.
13 LINUX_FILES = ('README.textile',
14
15=== modified file 'django/settings_snapshots.py'
16--- django/settings_snapshots.py 2012-10-24 09:45:58 +0000
17+++ django/settings_snapshots.py 2013-08-06 12:21:36 +0000
18@@ -21,7 +21,9 @@
19 os.path.join(PROJECT_ROOT, "templates_snapshots" ),
20 os.path.join(PROJECT_ROOT, "templates" ),
21 )
22+
23 SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
24+UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'
25
26 # Render TEXTILE files settings.
27 LINUX_FILES = ('README',
28
29=== modified file 'django/settings_staging_releases.py'
30--- django/settings_staging_releases.py 2012-10-23 16:16:08 +0000
31+++ django/settings_staging_releases.py 2013-08-06 12:21:36 +0000
32@@ -17,7 +17,9 @@
33 os.path.join(PROJECT_ROOT, "templates_releases" ),
34 os.path.join(PROJECT_ROOT, "templates" ),
35 )
36+
37 SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
38+UPLOAD_PATH = '/srv/staging.releases.linaro.org/uploads'
39
40 # Render TEXTILE files settings.
41 LINUX_FILES = ('README.textile',
42
43=== modified file 'django/settings_staging_snapshots.py'
44--- django/settings_staging_snapshots.py 2012-08-16 09:56:08 +0000
45+++ django/settings_staging_snapshots.py 2013-08-06 12:21:36 +0000
46@@ -17,4 +17,6 @@
47 os.path.join(PROJECT_ROOT, "templates_snapshots" ),
48 os.path.join(PROJECT_ROOT, "templates" ),
49 )
50+
51 SERVED_PATHS = ['/srv/staging.snapshots.linaro.org/www']
52+UPLOAD_PATH = '/srv/staging.snapshots.linaro.org/uploads'

Subscribers

People subscribed via source and target branches