Merge lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Paul Sokolovsky
Status: Superseded
Proposed branch: lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 991 lines (+872/-0) (has conflicts)
23 files modified
README (+216/-0)
apache/releases.linaro.org (+39/-0)
apache/security/all-private-hwpack-teams.txt (+5/-0)
apache/security/allowed-ops.txt (+1/-0)
apache/security/arm-private-hwpack-teams.txt (+1/-0)
apache/security/freescale-private-hwpack-teams.txt (+1/-0)
apache/security/linaro-android-teams.txt (+2/-0)
apache/security/linaro-teams.txt (+1/-0)
apache/security/mservices.linaro.org-teams.txt (+2/-0)
apache/security/samsung-private-hwpack-teams.txt (+1/-0)
apache/security/ste-private-hwpack-teams.txt (+1/-0)
apache/security/ti-private-hwpack-teams.txt (+1/-0)
apache/snapshots.linaro.org (+165/-0)
apache/staging.releases.linaro.org (+39/-0)
apache/staging.snapshots.linaro.org (+154/-0)
django/settings_releases.py (+54/-0)
django/settings_snapshots.py (+54/-0)
django/settings_staging_releases.py (+39/-0)
django/settings_staging_snapshots.py (+20/-0)
wsgi/wsgi_releases.py (+19/-0)
wsgi/wsgi_snapshots.py (+19/-0)
wsgi/wsgi_staging_releases.py (+19/-0)
wsgi/wsgi_staging_snapshots.py (+19/-0)
Conflict adding file README.  Moved existing file to README.moved.
To merge this branch: bzr merge lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups
Reviewer Review Type Date Requested Status
Philip Colmer Pending
Данило Шеган Pending
Linaro Automation & Validation Pending
Review via email: mp+153857@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-18.

Description of the change

BP Ref: https://blueprints.launchpad.net/linaro-infrastructure-misc/+spec/prepare-snapshots-migration-ec2

Reviewing setup Philip did on ec2-54-242-19-2.compute-1.amazonaws.com, I see that we miss in our docs step of setting up files in /etc/apache2/security/ , which are referenced by site config files. So, this patch capture those files from snapshots.linaro.org host. I also compared it with what we have on staging.snapshots.linaro.org, and there, it's fewer files, and there're some textual differences:

$ diff -ur security security2
diff -ur security/allowed-ops.txt security2/allowed-ops.txt
--- security/allowed-ops.txt 2013-03-18 17:53:53.737577210 +0200
+++ security2/allowed-ops.txt 2013-03-18 17:50:06.000000000 +0200
@@ -1 +1 @@
-Ubuntu=https://login.ubuntu.com
+Ubuntu=https://login.launchpad.net
diff -ur security/all-private-hwpack-teams.txt security2/all-private-hwpack-teams.txt
--- security/all-private-hwpack-teams.txt 2013-03-18 17:53:53.849577329 +0200
+++ security2/all-private-hwpack-teams.txt 2013-03-18 17:50:07.000000000 +0200
@@ -1,4 +1,4 @@
-linaro-landing-team-freescale
+naro-landing-team-freescale
 linaro-landing-team-samsung
 linaro-landing-team-ste
 linaro-landing-team-ti
Only in security: linaro-android-teams.txt
Only in security: mservices.linaro.org-teams.txt

Note that last hunk looks like typo.

To post a comment you must log in.
30. By Paul Sokolovsky

Update README with steps for /etc/apache2/security/ population.

Unmerged revisions

30. By Paul Sokolovsky

Update README with steps for /etc/apache2/security/ population.

29. By Paul Sokolovsky

Capture /etc/apache2/security dir from snapshots.linaro.org

This nostly contains OpenID group lists. These files are referenced
from *snapshots.linaro.org Apache site config files.

28. By Paul Sokolovsky

Update name of deployment script.

27. By Georgy Redkozubov

Removed fallback support

26. By Georgy Redkozubov

[merge] Update LINUX_FILES according to spec

25. By Georgy Redkozubov

Remove HOWTO_flashfirmware.txt from mandatory files

24. By Stevan Radaković

Move textile constants to settings so we can change them for releases.*.

23. By Данило Шеган

Update the snapshots.linaro.org to match the actual production config.

22. By Данило Шеган

Use python2.6 for production.

21. By Данило Шеган

Sync the configs with mombin IPs.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'README'
2--- README 1970-01-01 00:00:00 +0000
3+++ README 2013-03-18 16:19:18 +0000
4@@ -0,0 +1,216 @@
5+Linaro License Protection configuration
6+=======================================
7+
8+This branch contains current production configuration for
9+
10+ * releases.linaro.org (hosted on mombin.canonical.com)
11+ * snapshots.linaro.org (mombin)
12+ * staging.releases.linaro.org (kahaku.canonical.com)
13+ * staging.snapshots.linaro.org (kahaku.canonical.com)
14+
15+
16+Dependencies
17+------------
18+
19+libapache2-mod-xsendfile >= 0.10
20+libapache2-mod-python
21+python-django >= 1.3.1
22+python-django-openid-auth
23+python-apache-openid
24+
25+python-apache-openid is needed until we migrate existing apache
26+openid-protected directories to the new setup.
27+
28+
29+Pushing framework on snapshots.linaro.org
30+-----------------------------------------
31+
32+Pushing/uploading side is currently implemented as a multi-system setup:
33+
34+ * configuration on jenkins
35+ * configuration of users on server
36+
37+Configuration of jenkins
38+........................
39+
40+ * We are using Publish-over-SSH plugin for jenkins
41+
42+ * We perform two build (not publish, to allow for LAVA to have known URLs)
43+ steps:
44+
45+ * publish artifacts over SSH (ends up on a private location on the server)
46+
47+ * call out a trigger script over SSH (to move files securely to a public
48+ location)
49+
50+ * We use strictly "push from master" in advanced settings of publish-over-ssh
51+ plugin, and keep private keys for both actions above on the master:
52+
53+ /home/ubuntu/snapshots-sync2/linaro-android-build-publish —
54+ linaro-android-build-publish
55+ /home/ubuntu/snapshots-sync2/linaro-android-build-publish-trigger —
56+ linaro-android-build-publish-trigger
57+
58+Configuration of users on the receiving server (snapshots.l.o)
59+..............................................................
60+
61+For the two actions above, we have two separate users for all hosts
62+accessing the system (two for android-build.linaro.org and another two
63+for ci.linaro.org at this time).
64+
65+One of the users is a sftp/push user, and another is the trigger user that
66+shuffles the files around.
67+
68+Current users and their configurations:
69+
70+ * linaro-android-build-publish
71+ /etc/ssh/user-authorized-keys/linaro-android-build-publish
72+
73+ command="/usr/lib/sftp-server",no-pty,no-port-forwarding,\
74+ no-X11-forwarding,no-agent-forwarding,from="50.17.250.69" \
75+ <PUBLIC-SSH-KEY-DATA>
76+
77+ (chrooted to /srv/snapshots.linaro.org/uploads/)
78+
79+ * linaro-android-build-publish-trigger:
80+
81+ /etc/ssh/user-authorized-keys/linaro-android-build-publish-trigger
82+
83+ command="/home/linaro-android-build-publish-trigger/scripts\
84+ /trigger-linaro-android-build-publish.sh \
85+ ${SSH_ORIGINAL_COMMAND#* }",\
86+ no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,
87+ from="50.17.250.69" <PUBLIC-SSH-KEY-DATA>
88+
89+ The script being executed passes parameters to publish_to_snapshots
90+ which moves files from /uploads/ into appropriate public directory:
91+
92+ #!/bin/sh
93+ if [ "$(id -un)" != "linaro-android-build-publish-trigger" ]; then
94+ echo "This script is designed to be run as linaro-android-build-publish-trigger user"
95+ exit 1
96+ fi
97+ sudo -u linaro-android-build-publish /home/linaro-android-build-publish/linaro-license-protection/scripts/publish_to_snapshots.py "$@"
98+
99+ * linaro-ci-publish
100+
101+ Exactly the same as linaro-android-build-publish, except for the IP
102+ (allowing ci.linaro.org from 50.17.200.206) and SSH key data.
103+
104+ * linaro-ci-publish-trigger
105+
106+ Like linaro-android-build-publish-trigger, with different IP
107+ and SSH key data. Script lives in
108+
109+ /home/linaro-ci-publish-trigger/scripts/trigger-linaro-ci-publish.sh
110+
111+ and is of similar structure to the one for the user
112+ linaro-android-build-publish-trigger.
113+
114+android-build.linaro.org
115+........................
116+
117+Runs Jenkins and uses SFTP plugin to access the above two users. Private
118+keys live in
119+
120+ /home/ubuntu/snapshots-sync2/linaro-android-build-publish —
121+ linaro-android-build-publish
122+ /home/ubuntu/snapshots-sync2/linaro-android-build-publish-trigger —
123+ linaro-android-build-publish-trigger
124+
125+To ensure serialization of steps, and allow LAVA submission, these happen as
126+build steps, and not as publishing steps.
127+
128+Deployment steps
129+----------------
130+
131+This documents our current deployment while at the same time representing
132+an example production deployment.
133+
134+1. Install the dependencies
135+ (see the "Dependencies" section)
136+
137+2. Get the code
138+
139+ mkdir -p /srv/shared-branches
140+ cd /srv/shared-branches
141+ bzr branch lp:linaro-license-protection
142+
143+ (we are actually using http URLs since lp: defaults to bzr+ssh which
144+ doesn't work on system accounts)
145+
146+3. Get the configuration
147+
148+ Configuration files for deploying to snapshots.linaro.org,
149+ releases.linaro.org, staging.snapshots.linaro.org
150+ and staging.releases.linaro.org all live in
151+
152+ lp:linaro-license-protection/configs
153+
154+ We need to branch that into /srv/shared-branches as well:
155+
156+ cd /srv/shared-branches
157+ bzr branch lp:linaro-license-protection/configs linaro-license-protection-configs
158+
159+4. Checkout branches for the services you want to use:
160+
161+ (cd /srv/staging.snapshots.linaro.org &&
162+ bzr checkout /srv/shared-branches/linaro-license-protection-configs configs &&
163+ bzr checkout /srv/shared-branches/linaro-license-protection)
164+
165+ Replace "/srv/staging.snapshots.linaro.org" with one of
166+ /srv/staging.releases.linaro.org
167+ /srv/snapshots.linaro.org
168+ /srv/releases.linaro.org
169+
170+ depending on the service you are deploying.
171+
172+ If you use these paths, none of the config files will need updating.
173+
174+5. Configure apache2
175+
176+ Make sure mod-xsendfile and mod-python are enabled.
177+ Copy appropriate
178+ /srv/staging.snapshots.linaro.org/configs/apache/staging.snapshots.linaro.org
179+ files to /etc/apache2/sites-available
180+
181+ Copy apache/security/ directory to /etc/apache2/security (it contains OpenID group
182+ mappings, etc).
183+
184+ Add appropriate NameVirtualHost directive to
185+
186+ /etc/apache2/sites-enabled/000-default
187+
188+ Run "a2ensite staging.snapshots.linaro.org".
189+
190+ You also need to set up SSL certificate for *snapshots.linaro.org.
191+
192+6. Create databases and set up static files
193+
194+ Make sure appropriate configs/django directory is in the PYTHONPATH
195+ and set DJANGO_SETTINGS_MODULE and then run django-admin:
196+
197+ export PYTHONPATH=/srv/staging.snapshots.linaro.org:/srv/staging.snapshots.linaro.org/linaro-license-protection:/srv/staging.snapshots.linaro.org/configs/django
198+ export DJANGO_SETTINGS_MODULE=settings_staging_snapshots
199+ mkdir -p /srv/staging.snapshots.linaro.org/db
200+ django-admin syncdb --noinput
201+ django-admin collectstatic --noinput
202+
203+7. Set up a cron job to keep code updating automatically
204+
205+ You may want to automatically keep code up to date (mostly for staging)
206+ instances.
207+
208+ There is
209+
210+ scripts/update-deployment.py
211+
212+ from lp:linaro-license-protection which can be run from a cronjob to keep
213+ the above deployment always up to date.
214+
215+8. Ensure license_protected_downloads/config.py contains relevant white-listed
216+ IP addresses:
217+
218+ For releases.linaro.org:
219+ * android-build.linaro.org (50.17.250.69)
220+ * validation.linaro.org (213.123.120.124)
221
222=== renamed file 'README' => 'README.moved'
223=== added directory 'apache'
224=== added file 'apache/releases.linaro.org'
225--- apache/releases.linaro.org 1970-01-01 00:00:00 +0000
226+++ apache/releases.linaro.org 2013-03-18 16:19:18 +0000
227@@ -0,0 +1,39 @@
228+<VirtualHost 91.189.95.16:80>
229+ Alias /static/ /srv/releases.linaro.org/linaro-license-protection/static/
230+ DocumentRoot /srv/releases.linaro.org/www
231+ ServerName releases.linaro.org
232+ ServerAdmin webmaster@linaro.org
233+ CustomLog /var/log/apache2/releases.linaro.org-access.log combined
234+ ErrorLog /var/log/apache2/releases.linaro.org-error.log
235+
236+ <Directory /srv/releases.linaro.org/linaro-license-protection/static>
237+ Order deny,allow
238+ Allow from all
239+ </Directory>
240+
241+ <Directory /srv/releases.linaro.org/www>
242+ Order deny,allow
243+ Allow from all
244+ </Directory>
245+
246+ XSendFile on
247+ XSendFilePath /srv/releases.linaro.org/www
248+
249+ WSGIScriptAlias / /srv/releases.linaro.org/configs/wsgi/wsgi_releases.py
250+ WSGIDaemonProcess linaro-license-protection-releases
251+
252+ <Directory /srv/releases.linaro.org/configs/wsgi>
253+ <Files wsgi_releases.py>
254+ Order deny,allow
255+ Allow from all
256+ </Files>
257+ </Directory>
258+
259+ <Directory />
260+ IndexOptions NameWidth=* +SuppressDescription
261+ Options +Indexes +FollowSymLinks
262+ IndexIgnore favicon.ico HEADER.html
263+ AllowOverride FileInfo Indexes
264+ </Directory>
265+
266+</VirtualHost>
267
268=== added directory 'apache/security'
269=== added file 'apache/security/all-private-hwpack-teams.txt'
270--- apache/security/all-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
271+++ apache/security/all-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
272@@ -0,0 +1,5 @@
273+linaro-landing-team-freescale
274+linaro-landing-team-samsung
275+linaro-landing-team-ste
276+linaro-landing-team-ti
277+linaro-landing-team-arm
278
279=== added file 'apache/security/allowed-ops.txt'
280--- apache/security/allowed-ops.txt 1970-01-01 00:00:00 +0000
281+++ apache/security/allowed-ops.txt 2013-03-18 16:19:18 +0000
282@@ -0,0 +1,1 @@
283+Ubuntu=https://login.ubuntu.com
284
285=== added file 'apache/security/arm-private-hwpack-teams.txt'
286--- apache/security/arm-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
287+++ apache/security/arm-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
288@@ -0,0 +1,1 @@
289+linaro-landing-team-arm
290
291=== added file 'apache/security/freescale-private-hwpack-teams.txt'
292--- apache/security/freescale-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
293+++ apache/security/freescale-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
294@@ -0,0 +1,1 @@
295+linaro-landing-team-freescale
296
297=== added file 'apache/security/linaro-android-teams.txt'
298--- apache/security/linaro-android-teams.txt 1970-01-01 00:00:00 +0000
299+++ apache/security/linaro-android-teams.txt 2013-03-18 16:19:18 +0000
300@@ -0,0 +1,2 @@
301+linaro
302+linaro-android-restricted
303
304=== added file 'apache/security/linaro-teams.txt'
305--- apache/security/linaro-teams.txt 1970-01-01 00:00:00 +0000
306+++ apache/security/linaro-teams.txt 2013-03-18 16:19:18 +0000
307@@ -0,0 +1,1 @@
308+linaro
309
310=== added file 'apache/security/mservices.linaro.org-teams.txt'
311--- apache/security/mservices.linaro.org-teams.txt 1970-01-01 00:00:00 +0000
312+++ apache/security/mservices.linaro.org-teams.txt 2013-03-18 16:19:18 +0000
313@@ -0,0 +1,2 @@
314+linaro-member-services-leadership
315+canonical-sysadmins
316
317=== added file 'apache/security/samsung-private-hwpack-teams.txt'
318--- apache/security/samsung-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
319+++ apache/security/samsung-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
320@@ -0,0 +1,1 @@
321+linaro-landing-team-samsung
322
323=== added file 'apache/security/ste-private-hwpack-teams.txt'
324--- apache/security/ste-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
325+++ apache/security/ste-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
326@@ -0,0 +1,1 @@
327+linaro-landing-team-ste
328
329=== added file 'apache/security/ti-private-hwpack-teams.txt'
330--- apache/security/ti-private-hwpack-teams.txt 1970-01-01 00:00:00 +0000
331+++ apache/security/ti-private-hwpack-teams.txt 2013-03-18 16:19:18 +0000
332@@ -0,0 +1,1 @@
333+linaro-landing-team-ti
334
335=== added file 'apache/snapshots.linaro.org'
336--- apache/snapshots.linaro.org 1970-01-01 00:00:00 +0000
337+++ apache/snapshots.linaro.org 2013-03-18 16:19:18 +0000
338@@ -0,0 +1,165 @@
339+<VirtualHost 91.189.95.16:80 91.189.95.247:80>
340+
341+ Alias /static/ /srv/snapshots.linaro.org/linaro-license-protection/static/
342+ DocumentRoot /srv/snapshots.linaro.org/www
343+ ServerName snapshots.linaro.org
344+ ServerAdmin webmaster@linaro.org
345+ CustomLog /var/log/apache2/snapshots.linaro.org-access.log combined
346+ ErrorLog /var/log/apache2/snapshots.linaro.org-error.log
347+
348+ # SSL + OpenID for these:
349+ Redirect /hwpacks https://snapshots.linaro.org/hwpacks
350+ Redirect /android/~linaro-android-private https://snapshots.linaro.org/android/~linaro-android-private
351+ Redirect /android/~linaro-android-restricted https://snapshots.linaro.org/android/~linaro-android-restricted
352+ Redirect /precise/restricted https://snapshots.linaro.org/precise/restricted
353+
354+ <Directory /srv/snapshots.linaro.org/linaro-license-protection/static>
355+ Order deny,allow
356+ Allow from all
357+ </Directory>
358+
359+ <Directory /srv/snapshots.linaro.org/www>
360+ Order deny,allow
361+ Allow from all
362+ </Directory>
363+
364+ XSendFile on
365+ XSendFilePath /srv/snapshots.linaro.org/www
366+
367+ WSGIScriptAlias / /srv/snapshots.linaro.org/configs/wsgi/wsgi_snapshots.py
368+ WSGIDaemonProcess linaro-license-protection-snapshots
369+
370+ <Directory /srv/snapshots.linaro.org/configs/wsgi>
371+ <Files wsgi_snapshots.py>
372+ Order deny,allow
373+ Allow from all
374+ </Files>
375+ </Directory>
376+
377+ <Directory />
378+ IndexOptions NameWidth=* +SuppressDescription
379+ Options +Indexes +FollowSymLinks
380+ IndexIgnore favicon.ico HEADER.html
381+ AllowOverride FileInfo Indexes
382+ </Directory>
383+
384+</VirtualHost>
385+
386+<VirtualHost 91.189.95.247:443>
387+
388+ Alias /static/ /srv/snapshots.linaro.org/linaro-license-protection/static/
389+ DocumentRoot /srv/snapshots.linaro.org/www
390+ ServerName snapshots.linaro.org
391+ ServerAdmin webmaster@linaro.org
392+ CustomLog /var/log/apache2/snapshots.linaro.org-access.log combined
393+ ErrorLog /var/log/apache2/snapshots.linaro.org-error.log
394+
395+ SSLEngine On
396+ SSLCertificateFile /etc/apache2/ssl/snapshots.linaro.org.crt
397+ SSLCertificateKeyFile /etc/apache2/ssl/snapshots.linaro.org.key
398+ SSLCertificateChainFile /etc/apache2/ssl/gd_bundle.crt
399+
400+ <Directory /srv/snapshots.linaro.org/linaro-license-protection/static>
401+ Order deny,allow
402+ Allow from all
403+ </Directory>
404+
405+ <Directory /srv/snapshots.linaro.org/www>
406+ Order deny,allow
407+ Allow from all
408+ </Directory>
409+
410+ XSendFile on
411+ XSendFilePath /srv/snapshots.linaro.org/www
412+
413+ WSGIScriptAlias / /srv/snapshots.linaro.org/configs/wsgi/wsgi_snapshots.py
414+ WSGIDaemonProcess linaro-license-protection-snapshots-ssl
415+
416+ <Directory /srv/snapshots.linaro.org/configs/wsgi>
417+ <Files wsgi_snapshots.py>
418+ Order deny,allow
419+ Allow from all
420+ </Files>
421+ </Directory>
422+
423+ <Directory />
424+ IndexOptions NameWidth=* +SuppressDescription
425+ Options +Indexes +FollowSymLinks
426+ IndexIgnore favicon.ico HEADER.html
427+ AllowOverride FileInfo Indexes
428+ </Directory>
429+
430+ <Location "/hwpacks">
431+ PythonAccessHandler apache_openid::protect
432+ PythonOption handler openidteams
433+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/all-private-hwpack-teams.txt"
434+ PythonOption action-path "/openid/"
435+ </Location>
436+
437+ <Location "/openid/">
438+ Allow from all
439+ SetHandler mod_python
440+ PythonAccessHandler apache_openid::protect
441+ PythonOption handler openidteams
442+ PythonOption store-type file
443+ PythonOption store-directory /var/cache/apache2/openid/
444+ PythonOption allowed-op-list-url "file:///etc/apache2/security/allowed-ops.txt"
445+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/all-private-hwpack-teams.txt"
446+ PythonOption action-path "/openid/"
447+ </Location>
448+
449+ <Location "/android/~linaro-android-restricted">
450+ PythonAccessHandler apache_openid::protect
451+ PythonOption handler openidteams
452+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/linaro-teams.txt"
453+ PythonOption action-path "/openid/"
454+ </Location>
455+
456+ <Location "/precise/restricted">
457+ PythonAccessHandler apache_openid::protect
458+ PythonOption handler openidteams
459+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/linaro-teams.txt"
460+ PythonOption action-path "/openid/"
461+ </Location>
462+
463+ Alias /hwpacks/freescale /srv/landing-teams/hwpacks/freescale
464+ <Location "/hwpacks/freescale">
465+ PythonAccessHandler apache_openid::protect
466+ PythonOption handler openidteams
467+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/freescale-private-hwpack-teams.txt"
468+ PythonOption action-path "/openid/"
469+ </Location>
470+
471+ Alias /hwpacks/samsung /srv/landing-teams/hwpacks/samsung
472+ <Location "/hwpacks/samsung">
473+ PythonAccessHandler apache_openid::protect
474+ PythonOption handler openidteams
475+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/samsung-private-hwpack-teams.txt"
476+ PythonOption action-path "/openid/"
477+ </Location>
478+
479+ Alias /hwpacks/ste /srv/landing-teams/hwpacks/ste
480+ <Location "/hwpacks/ste">
481+ PythonAccessHandler apache_openid::protect
482+ PythonOption handler openidteams
483+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/ste-private-hwpack-teams.txt"
484+ PythonOption action-path "/openid/"
485+ </Location>
486+
487+ Alias /hwpacks/ti /srv/landing-teams/hwpacks/ti
488+ <Location "/hwpacks/ti">
489+ PythonAccessHandler apache_openid::protect
490+ PythonOption handler openidteams
491+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/ti-private-hwpack-teams.txt"
492+ PythonOption action-path "/openid/"
493+ </Location>
494+
495+ Alias /hwpacks/arm /srv/landing-teams/hwpacks/arm
496+ <Location "/hwpacks/arm">
497+ PythonAccessHandler apache_openid::protect
498+ PythonOption handler openidteams
499+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/arm-private-hwpack-teams.txt"
500+ PythonOption action-path "/openid/"
501+ </Location>
502+
503+</VirtualHost>
504
505=== added file 'apache/staging.releases.linaro.org'
506--- apache/staging.releases.linaro.org 1970-01-01 00:00:00 +0000
507+++ apache/staging.releases.linaro.org 2013-03-18 16:19:18 +0000
508@@ -0,0 +1,39 @@
509+<VirtualHost 91.189.95.80:80>
510+ Alias /static/ /srv/staging.releases.linaro.org/linaro-license-protection/static/
511+ DocumentRoot /srv/staging.releases.linaro.org/www
512+ ServerName staging.releases.linaro.org
513+ ServerAdmin webmaster@linaro.org
514+ CustomLog /var/log/apache2/staging.releases.linaro.org-access.log combined
515+ ErrorLog /var/log/apache2/staging.releases.linaro.org-error.log
516+
517+ <Directory /srv/staging.releases.linaro.org/linaro-license-protection/static>
518+ Order deny,allow
519+ Allow from all
520+ </Directory>
521+
522+ <Directory /srv/staging.releases.linaro.org/www>
523+ Order deny,allow
524+ Allow from all
525+ </Directory>
526+
527+ XSendFile on
528+ XSendFilePath /srv/staging.releases.linaro.org/www
529+
530+ WSGIScriptAlias / /srv/staging.releases.linaro.org/configs/wsgi/wsgi_staging_releases.py
531+ WSGIDaemonProcess linaro-license-protection-staging-releases
532+
533+ <Directory /srv/staging.releases.linaro.org/configs/wsgi>
534+ <Files wsgi_staging_releases.py>
535+ Order deny,allow
536+ Allow from all
537+ </Files>
538+ </Directory>
539+
540+ <Directory />
541+ IndexOptions NameWidth=* +SuppressDescription
542+ Options +Indexes +FollowSymLinks
543+ IndexIgnore favicon.ico HEADER.html
544+ AllowOverride FileInfo Indexes
545+ </Directory>
546+
547+</VirtualHost>
548
549=== added file 'apache/staging.snapshots.linaro.org'
550--- apache/staging.snapshots.linaro.org 1970-01-01 00:00:00 +0000
551+++ apache/staging.snapshots.linaro.org 2013-03-18 16:19:18 +0000
552@@ -0,0 +1,154 @@
553+<VirtualHost 91.189.95.80:80>
554+
555+ Alias /static/ /srv/staging.snapshots.linaro.org/linaro-license-protection/static/
556+ DocumentRoot /srv/staging.snapshots.linaro.org/www
557+ ServerName staging.snapshots.linaro.org
558+ ServerAdmin webmaster@linaro.org
559+ CustomLog /var/log/apache2/staging.snapshots.linaro.org-access.log combined
560+ ErrorLog /var/log/apache2/staging.snapshots.linaro.org-error.log
561+
562+ Redirect /hwpacks https://staging.snapshots.linaro.org/hwpacks
563+ Redirect /precise/restricted https://staging.snapshots.linaro.org/precise/restricted
564+
565+ <Directory /srv/staging.snapshots.linaro.org/linaro-license-protection/static>
566+ Order deny,allow
567+ Allow from all
568+ </Directory>
569+
570+ <Directory /srv/staging.snapshots.linaro.org/www>
571+ Order deny,allow
572+ Allow from all
573+ </Directory>
574+
575+ XSendFile on
576+ XSendFilePath /srv/staging.snapshots.linaro.org/www
577+
578+ WSGIScriptAlias / /srv/staging.snapshots.linaro.org/configs/wsgi/wsgi_staging_snapshots.py
579+ WSGIDaemonProcess linaro-license-protection-staging-snapshots
580+
581+ <Directory /srv/staging.snapshots.linaro.org/configs/wsgi>
582+ <Files wsgi_staging_snapshots.py>
583+ Order deny,allow
584+ Allow from all
585+ </Files>
586+ </Directory>
587+
588+ <Directory />
589+ IndexOptions NameWidth=* +SuppressDescription
590+ Options +Indexes +FollowSymLinks
591+ IndexIgnore favicon.ico HEADER.html
592+ AllowOverride FileInfo Indexes
593+ </Directory>
594+
595+</VirtualHost>
596+
597+<VirtualHost 91.189.95.80:443>
598+
599+ Alias /static/ /srv/staging.snapshots.linaro.org/linaro-license-protection/static/
600+ DocumentRoot /srv/staging.snapshots.linaro.org/www
601+ ServerName staging.snapshots.linaro.org
602+ ServerAdmin webmaster@linaro.org
603+ CustomLog /var/log/apache2/staging.snapshots.linaro.org-access.log combined
604+ ErrorLog /var/log/apache2/staging.snapshots.linaro.org-error.log
605+
606+ SSLEngine On
607+ SSLCertificateFile /etc/apache2/ssl/staging.snapshots.linaro.org.pem
608+
609+ <Directory /srv/staging.snapshots.linaro.org/linaro-license-protection/static>
610+ Order deny,allow
611+ Allow from all
612+ </Directory>
613+
614+ <Directory /srv/staging.snapshots.linaro.org/www>
615+ Order deny,allow
616+ Allow from all
617+ </Directory>
618+
619+ XSendFile on
620+ XSendFilePath /srv/staging.snapshots.linaro.org/www
621+
622+ WSGIScriptAlias / /srv/staging.snapshots.linaro.org/configs/wsgi/wsgi_staging_snapshots.py
623+ WSGIDaemonProcess linaro-license-protection-staging-snapshots-ssl
624+
625+ <Directory /srv/staging.snapshots.linaro.org/configs/wsgi>
626+ <Files wsgi_staging_snapshots.py>
627+ Order deny,allow
628+ Allow from all
629+ </Files>
630+ </Directory>
631+
632+ <Directory />
633+ IndexOptions NameWidth=* +SuppressDescription
634+ Options +Indexes +FollowSymLinks
635+ IndexIgnore favicon.ico HEADER.html
636+ AllowOverride FileInfo Indexes
637+ </Directory>
638+
639+ <Location "/hwpacks">
640+ PythonAccessHandler apache_openid::protect
641+ PythonOption handler openidteams
642+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/all-private-hwpack-teams.txt"
643+ PythonOption action-path "/openid/"
644+ </Location>
645+
646+ <Location "/openid/">
647+ Allow from all
648+ SetHandler mod_python
649+ PythonAccessHandler apache_openid::protect
650+ PythonOption handler openidteams
651+ PythonOption store-type file
652+ PythonOption store-directory /var/cache/apache2/openid/
653+ PythonOption allowed-op-list-url "file:///etc/apache2/security/allowed-ops.txt"
654+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/all-private-hwpack-teams.txt"
655+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/linaro-teams.txt"
656+ PythonOption action-path "/openid/"
657+ </Location>
658+
659+ <Location "/precise/restricted">
660+ PythonAccessHandler apache_openid::protect
661+ PythonOption handler openidteams
662+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/linaro-teams.txt"
663+ PythonOption action-path "/openid/"
664+ </Location>
665+
666+ Alias /hwpacks/freescale /srv/landing-teams/hwpacks/freescale
667+ <Location "/hwpacks/freescale">
668+ PythonAccessHandler apache_openid::protect
669+ PythonOption handler openidteams
670+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/freescale-private-hwpack-teams.txt"
671+ PythonOption action-path "/openid/"
672+ </Location>
673+
674+ Alias /hwpacks/samsung /srv/landing-teams/hwpacks/samsung
675+ <Location "/hwpacks/samsung">
676+ PythonAccessHandler apache_openid::protect
677+ PythonOption handler openidteams
678+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/samsung-private-hwpack-teams.txt"
679+ PythonOption action-path "/openid/"
680+ </Location>
681+
682+ Alias /hwpacks/ste /srv/landing-teams/hwpacks/ste
683+ <Location "/hwpacks/ste">
684+ PythonAccessHandler apache_openid::protect
685+ PythonOption handler openidteams
686+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/ste-private-hwpack-teams.txt"
687+ PythonOption action-path "/openid/"
688+ </Location>
689+
690+ Alias /hwpacks/ti /srv/landing-teams/hwpacks/ti
691+ <Location "/hwpacks/ti">
692+ PythonAccessHandler apache_openid::protect
693+ PythonOption handler openidteams
694+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/ti-private-hwpack-teams.txt"
695+ PythonOption action-path "/openid/"
696+ </Location>
697+
698+ Alias /hwpacks/arm /srv/landing-teams/hwpacks/arm
699+ <Location "/hwpacks/arm">
700+ PythonAccessHandler apache_openid::protect
701+ PythonOption handler openidteams
702+ PythonOption authorized-teams-list-url "file:///etc/apache2/security/arm-private-hwpack-teams.txt"
703+ PythonOption action-path "/openid/"
704+ </Location>
705+
706+</VirtualHost>
707
708=== added directory 'django'
709=== added file 'django/settings_releases.py'
710--- django/settings_releases.py 1970-01-01 00:00:00 +0000
711+++ django/settings_releases.py 2013-03-18 16:19:18 +0000
712@@ -0,0 +1,54 @@
713+# Settings for releases.linaro.org.
714+
715+from settings import *
716+
717+DEBUG = False
718+
719+ROOT_URLCONF = 'urls'
720+
721+DATABASES = {
722+ 'default': {
723+ 'ENGINE': 'django.db.backends.sqlite3',
724+ 'NAME': '/srv/releases.linaro.org/db/licenses.db',
725+ 'USER': '',
726+ 'PASSWORD': '',
727+ 'HOST': '',
728+ 'PORT': '',
729+ }
730+}
731+
732+TEMPLATE_DIRS = (
733+ os.path.join(PROJECT_ROOT, "templates_releases" ),
734+ os.path.join(PROJECT_ROOT, "templates" ),
735+ )
736+SERVED_PATHS = ['/srv/releases.linaro.org/www']
737+
738+# Render TEXTILE files settings.
739+LINUX_FILES = ('README.textile',
740+ 'INSTALL.textile',
741+ 'HACKING.textile',
742+ 'FIRMWARE.textile',
743+ 'RTSM.textile')
744+
745+ANDROID_FILES = ('HOWTO_releasenotes.txt',
746+ 'HOWTO_install.txt',
747+ 'HOWTO_getsourceandbuild.txt',
748+ 'HOWTO_flashfirmware.txt',
749+ 'HOWTO_rtsm.txt')
750+
751+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
752+ 'HOWTO_install.txt': 'Binary Image Installation',
753+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
754+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
755+ 'HOWTO_rtsm.txt': 'RTSM',
756+ 'README.textile': 'Release Notes',
757+ 'INSTALL.textile': 'Binary Image Installation',
758+ 'HACKING.textile': 'Building From Source',
759+ 'FIRMWARE.textile': 'Firmware Update',
760+ 'RTSM.textile': 'RTSM'}
761+
762+TAB_PRIORITY = ['Release Notes',
763+ 'Binary Image Installation',
764+ 'Building From Source',
765+ 'Firmware Update',
766+ 'RTSM']
767
768=== added file 'django/settings_snapshots.py'
769--- django/settings_snapshots.py 1970-01-01 00:00:00 +0000
770+++ django/settings_snapshots.py 2013-03-18 16:19:18 +0000
771@@ -0,0 +1,54 @@
772+# Settings for snapshots.linaro.org.
773+
774+from settings import *
775+
776+DEBUG = False
777+
778+ROOT_URLCONF = 'urls'
779+
780+DATABASES = {
781+ 'default': {
782+ 'ENGINE': 'django.db.backends.sqlite3',
783+ 'NAME': '/srv/snapshots.linaro.org/db/licenses.db',
784+ 'USER': '',
785+ 'PASSWORD': '',
786+ 'HOST': '',
787+ 'PORT': '',
788+ }
789+}
790+
791+TEMPLATE_DIRS = (
792+ os.path.join(PROJECT_ROOT, "templates_snapshots" ),
793+ os.path.join(PROJECT_ROOT, "templates" ),
794+ )
795+SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
796+
797+# Render TEXTILE files settings.
798+LINUX_FILES = ('README',
799+ 'INSTALL',
800+ 'HACKING',
801+ 'FIRMWARE',
802+ 'RTSM')
803+
804+ANDROID_FILES = ('HOWTO_releasenotes.txt',
805+ 'HOWTO_install.txt',
806+ 'HOWTO_getsourceandbuild.txt',
807+ 'HOWTO_flashfirmware.txt',
808+ 'HOWTO_rtsm.txt')
809+
810+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
811+ 'HOWTO_install.txt': 'Binary Image Installation',
812+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
813+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
814+ 'HOWTO_rtsm.txt': 'RTSM',
815+ 'README': 'Release Notes',
816+ 'INSTALL': 'Binary Image Installation',
817+ 'HACKING': 'Building From Source',
818+ 'FIRMWARE': 'Firmware Update',
819+ 'RTSM': 'RTSM'}
820+
821+TAB_PRIORITY = ['Release Notes',
822+ 'Binary Image Installation',
823+ 'Building From Source',
824+ 'Firmware Update',
825+ 'RTSM']
826
827=== added file 'django/settings_staging_releases.py'
828--- django/settings_staging_releases.py 1970-01-01 00:00:00 +0000
829+++ django/settings_staging_releases.py 2013-03-18 16:19:18 +0000
830@@ -0,0 +1,39 @@
831+# Settings for staging.releases.linaro.org.
832+
833+from settings import *
834+
835+DATABASES = {
836+ 'default': {
837+ 'ENGINE': 'django.db.backends.sqlite3',
838+ 'NAME': '/srv/staging.releases.linaro.org/db/licenses.db',
839+ 'USER': '',
840+ 'PASSWORD': '',
841+ 'HOST': '',
842+ 'PORT': '',
843+ }
844+}
845+
846+TEMPLATE_DIRS = (
847+ os.path.join(PROJECT_ROOT, "templates_releases" ),
848+ os.path.join(PROJECT_ROOT, "templates" ),
849+ )
850+SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
851+
852+# Render TEXTILE files settings.
853+LINUX_FILES = ('README.textile',
854+ 'INSTALL.textile',
855+ 'HACKING.textile',
856+ 'FIRMWARE.textile',
857+ 'RTSM.textile')
858+
859+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
860+ 'HOWTO_install.txt': 'Binary Image Installation',
861+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
862+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
863+ 'HOWTO_rtsm.txt': 'RTSM',
864+ 'README.textile': 'Release Notes',
865+ 'INSTALL.textile': 'Binary Image Installation',
866+ 'HACKING.textile': 'Building From Source',
867+ 'FIRMWARE.textile': 'Firmware Update',
868+ 'RTSM.textile': 'RTSM'}
869+
870
871=== added file 'django/settings_staging_snapshots.py'
872--- django/settings_staging_snapshots.py 1970-01-01 00:00:00 +0000
873+++ django/settings_staging_snapshots.py 2013-03-18 16:19:18 +0000
874@@ -0,0 +1,20 @@
875+# Settings for staging.snapshots.linaro.org.
876+
877+from settings import *
878+
879+DATABASES = {
880+ 'default': {
881+ 'ENGINE': 'django.db.backends.sqlite3',
882+ 'NAME': '/srv/staging.snapshots.linaro.org/db/licenses.db',
883+ 'USER': '',
884+ 'PASSWORD': '',
885+ 'HOST': '',
886+ 'PORT': '',
887+ }
888+}
889+
890+TEMPLATE_DIRS = (
891+ os.path.join(PROJECT_ROOT, "templates_snapshots" ),
892+ os.path.join(PROJECT_ROOT, "templates" ),
893+ )
894+SERVED_PATHS = ['/srv/staging.snapshots.linaro.org/www']
895
896=== added directory 'wsgi'
897=== added file 'wsgi/wsgi_releases.py'
898--- wsgi/wsgi_releases.py 1970-01-01 00:00:00 +0000
899+++ wsgi/wsgi_releases.py 2013-03-18 16:19:18 +0000
900@@ -0,0 +1,19 @@
901+"""
902+WSGI config for license_protected_downloads project.
903+
904+This file configures WSGI for releases.linaro.org.
905+"""
906+import os
907+import sys
908+sys.path.append("/usr/lib/python2.6/dist-packages")
909+sys.path.append("/usr/lib/pymodules/python2.6")
910+sys.path.append("/usr/lib/python2.6")
911+
912+sys.path.append("/srv/releases.linaro.org")
913+sys.path.append("/srv/releases.linaro.org/linaro-license-protection")
914+sys.path.append("/srv/releases.linaro.org/configs/django")
915+
916+os.environ["DJANGO_SETTINGS_MODULE"] = "settings_releases"
917+
918+import django.core.handlers.wsgi
919+application = django.core.handlers.wsgi.WSGIHandler()
920
921=== added file 'wsgi/wsgi_snapshots.py'
922--- wsgi/wsgi_snapshots.py 1970-01-01 00:00:00 +0000
923+++ wsgi/wsgi_snapshots.py 2013-03-18 16:19:18 +0000
924@@ -0,0 +1,19 @@
925+"""
926+WSGI config for license_protected_downloads project.
927+
928+This file configures WSGI for snapshots.linaro.org.
929+"""
930+import os
931+import sys
932+sys.path.append("/usr/lib/python2.6/dist-packages")
933+sys.path.append("/usr/lib/pymodules/python2.6")
934+sys.path.append("/usr/lib/python2.6")
935+
936+sys.path.append("/srv/snapshots.linaro.org")
937+sys.path.append("/srv/snapshots.linaro.org/linaro-license-protection")
938+sys.path.append("/srv/snapshots.linaro.org/configs/django")
939+
940+os.environ["DJANGO_SETTINGS_MODULE"] = "settings_snapshots"
941+
942+import django.core.handlers.wsgi
943+application = django.core.handlers.wsgi.WSGIHandler()
944
945=== added file 'wsgi/wsgi_staging_releases.py'
946--- wsgi/wsgi_staging_releases.py 1970-01-01 00:00:00 +0000
947+++ wsgi/wsgi_staging_releases.py 2013-03-18 16:19:18 +0000
948@@ -0,0 +1,19 @@
949+"""
950+WSGI config for license_protected_downloads project.
951+
952+This file configures WSGI for staging.releases.linaro.org.
953+"""
954+import os
955+import sys
956+sys.path.append("/usr/lib/python2.7/dist-packages")
957+sys.path.append("/usr/lib/pymodules/python2.7")
958+sys.path.append("/usr/lib/python2.7")
959+
960+sys.path.append("/srv/staging.releases.linaro.org")
961+sys.path.append("/srv/staging.releases.linaro.org/linaro-license-protection")
962+sys.path.append("/srv/staging.releases.linaro.org/configs/django")
963+
964+os.environ["DJANGO_SETTINGS_MODULE"] = "settings_staging_releases"
965+
966+import django.core.handlers.wsgi
967+application = django.core.handlers.wsgi.WSGIHandler()
968
969=== added file 'wsgi/wsgi_staging_snapshots.py'
970--- wsgi/wsgi_staging_snapshots.py 1970-01-01 00:00:00 +0000
971+++ wsgi/wsgi_staging_snapshots.py 2013-03-18 16:19:18 +0000
972@@ -0,0 +1,19 @@
973+"""
974+WSGI config for license_protected_downloads project.
975+
976+This file configures WSGI for staging.snapshots.linaro.org.
977+"""
978+import os
979+import sys
980+sys.path.append("/usr/lib/python2.7/dist-packages")
981+sys.path.append("/usr/lib/pymodules/python2.7")
982+sys.path.append("/usr/lib/python2.7")
983+
984+sys.path.append("/srv/staging.snapshots.linaro.org")
985+sys.path.append("/srv/staging.snapshots.linaro.org/linaro-license-protection")
986+sys.path.append("/srv/staging.snapshots.linaro.org/configs/django")
987+
988+os.environ["DJANGO_SETTINGS_MODULE"] = "settings_staging_snapshots"
989+
990+import django.core.handlers.wsgi
991+application = django.core.handlers.wsgi.WSGIHandler()

Subscribers

People subscribed via source and target branches