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

[Paul Sokolovsky]

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.

[Данило Шеган (danilo)]

Paul, what's the status of our move to using exclusively BUILD-INFO.txt for OpenID protection? If that's done, we should instead look at removing the apache-based openid stuff (not in this branch: just file a bug about it when needed).

Otherwise, these changes are good and we should keep the configs reflect the reality, so +1 from me.

review: Approve

[Georgy Redkozubov (gesha)]

Looks good to reflect current state.

review: Approve

[Paul Sokolovsky (pfalcon)]

Danilo: Is started with asking to migrate just as single subdir (as required for lp:1112620, and hopefully makes sense, as it's security related, and we first want to migrate subset and validate it), and there was no response from IS to https://rt.linaro.org/Ticket/Display.html?id=865 , so yes, IMHO we should not tie these 2 migrations together, at least not at this time, because it'll be just extra constraint to keep in mind.

=== modified file 'README'
--- README	2013-02-21 17:10:15 +0000
+++ README	2013-03-18 16:22:23 +0000
@@ -174,6 +174,9 @@
      /srv/staging.snapshots.linaro.org/configs/apache/staging.snapshots.linaro.org
    files to /etc/apache2/sites-available
 
+   Copy apache/security/ directory to /etc/apache2/security (it contains OpenID group
+   mappings, etc).
+
    Add appropriate NameVirtualHost directive to
 
      /etc/apache2/sites-enabled/000-default

=== added directory 'apache/security'
=== added file 'apache/security/all-private-hwpack-teams.txt'
--- apache/security/all-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/all-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,5 @@
+linaro-landing-team-freescale
+linaro-landing-team-samsung
+linaro-landing-team-ste
+linaro-landing-team-ti
+linaro-landing-team-arm

=== added file 'apache/security/allowed-ops.txt'
--- apache/security/allowed-ops.txt	1970-01-01 00:00:00 +0000
+++ apache/security/allowed-ops.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+Ubuntu=https://login.ubuntu.com

=== added file 'apache/security/arm-private-hwpack-teams.txt'
--- apache/security/arm-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/arm-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro-landing-team-arm

=== added file 'apache/security/freescale-private-hwpack-teams.txt'
--- apache/security/freescale-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/freescale-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro-landing-team-freescale

=== added file 'apache/security/linaro-android-teams.txt'
--- apache/security/linaro-android-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/linaro-android-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,2 @@
+linaro
+linaro-android-restricted

=== added file 'apache/security/linaro-teams.txt'
--- apache/security/linaro-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/linaro-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro

=== added file 'apache/security/mservices.linaro.org-teams.txt'
--- apache/security/mservices.linaro.org-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/mservices.linaro.org-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,2 @@
+linaro-member-services-leadership
+canonical-sysadmins

=== added file 'apache/security/samsung-private-hwpack-teams.txt'
--- apache/security/samsung-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/samsung-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro-landing-team-samsung

=== added file 'apache/security/ste-private-hwpack-teams.txt'
--- apache/security/ste-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/ste-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro-landing-team-ste

=== added file 'apache/security/ti-private-hwpack-teams.txt'
--- apache/security/ti-private-hwpack-teams.txt	1970-01-01 00:00:00 +0000
+++ apache/security/ti-private-hwpack-teams.txt	2013-03-18 16:22:23 +0000
@@ -0,0 +1,1 @@
+linaro-landing-team-ti