Reviewed and looks good
On Tuesday, May 19, 2015 01:53:44 PM Kevin Fenzi wrote:
> I'm sending this freeze break now, but likely won't apply it until
> later in the week. Also, there will be one more change before actual
> release when websites folks merge f22 branch to master (changing the
> puppet syncStatic.sh to pull labs and arm from master instead of f22
> branch. They currently don't exist in master).
>
> This is needed to bring on line the labs.fedoraproject.org and
> arm.fedoraproject.org sites for f22 release.
>
> +1s?
>
> kevin
> --
> In puppet:
>
> diff --git a/modules/fedora-web/files/syncStatic.sh
> b/modules/fedora-web/files/syncStatic.sh index de2845c..cba346c 100644
> --- a/modules/fedora-web/files/syncStatic.sh
> +++ b/modules/fedora-web/files/syncStatic.sh
> @@ -45,11 +45,11 @@ cd /srv/web/fedora-web
>
> /usr/bin/git clean -q -fdx || exit 1
> /usr/bin/git reset -q --hard || exit 1
> -/usr/bin/git checkout -q master || exit 1
> +/usr/bin/git checkout -q f22 || exit 1
>
> /usr/bin/git pull -q --ff-only || exit 1
> -build getfedora.org
> -build spins.fedoraproject.org
> +build labs.fedoraproject.org
> +build arm.fedoraproject.org
>
> pushd mirrors.fedoraproject.org > /dev/null
> rsync -qa --delete-after --delay-updates .
> /srv/web/mirrors.fedoraproject.org/ @@ -62,8 +62,9 @@ popd > /dev/null
>
> /usr/bin/git pull -q --ff-only || exit 1
>
> +build getfedora.org
> +build spins.fedoraproject.org
> build boot.fedoraproject.org
> build fedoracommunity.org
> build fudcon.fedoraproject.org
> build start.fedoraproject.org
>
> in ansible:
>
> diff --git a/playbooks/include/proxies-fedora-web.yml
> b/playbooks/include/proxies-fedora-web.yml index d714a53..2170e42 100644
> --- a/playbooks/include/proxies-fedora-web.yml
> +++ b/playbooks/include/proxies-fedora-web.yml
> @@ -33,10 +33,8 @@
> website: getfedora.org
> - role: fedora-web/labs
> website: labs.fedoraproject.org
> - when: env == "staging"
> - role: fedora-web/arm
> website: arm.fedoraproject.org
> - when: env == "staging"
>
> # Some other static content, not strictly part of "fedora-web" goes below
> here - role: fedora-docs/proxy
> diff --git a/playbooks/include/proxies-websites.yml
> b/playbooks/include/proxies-websites.yml index 34fa6d6..c398a23 100644
> --- a/playbooks/include/proxies-websites.yml
> +++ b/playbooks/include/proxies-websites.yml
> @@ -184,14 +184,12 @@
> server_aliases:
> - labs.stg.fedoraproject.org
> cert_name: "{{wildcard_cert_name}}"
> - when: env == "staging"
>
> - role: httpd/website
> name: arm.fedoraproject.org
> server_aliases:
> - arm.stg.fedoraproject.org
> cert_name: "{{wildcard_cert_name}}"
> - when: env == "staging"
>
> - role: httpd/website
> name: boot.fedoraproject.org
+1 from me
Dennis
_______________________________________________
infrastructure mailing list
infrastructure@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/infrastructure