linaro-license-protection

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

configs.capture-openid-groups
Merge into configs

Proposed by Paul Sokolovsky on 2013-03-18

Status:	Merged
Merged at revision:	30
Proposed branch:	lp://qastaging/~pfalcon/linaro-license-protection/configs.capture-openid-groups
Merge into:	lp://qastaging/linaro-license-protection/configs
Diff against target:	80 lines (+19/-0) 11 files modified README (+3/-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)
To merge this branch:	bzr merge lp://qastaging/~pfalcon/linaro-license-protection/configs.capture-openid-groups
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Georgy Redkozubov	2013-03-18	Approve on 2013-03-19
Данило Шеган (community)	2013-03-18	Approve on 2013-03-18
Philip Colmer	2013-03-18	Pending
Review via email: mp+153859@code.qastaging.launchpad.net

This proposal supersedes 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.

Revision history for this message

Данило Шеган (danilo) wrote on 2013-03-18:

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

Revision history for this message

Georgy Redkozubov (gesha) wrote on 2013-03-19:

Looks good to reflect current state.

review: Approve

Revision history for this message

Paul Sokolovsky (pfalcon) wrote on 2013-03-19:

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.