Change Request: Have fedoracommunity.org work with genshi
Toshio Kuratomi
a.badger at gmail.com
Wed Aug 18 05:12:41 UTC 2010
On Tue, Aug 17, 2010 at 11:01:54PM -0500, Sijis Aviles wrote:
> Hi,
>
> I'm requesting this change so that we can start putting the mocked up
> site[1] together with genshi on the fedora-web repo.
>
> ====
> diff --git a/modules/fedora-web/files/syncStatic.sh
> b/modules/fedora-web/files/syncStatic.sh
> index 9f1d8a6..f5f2005 100644
> --- a/modules/fedora-web/files/syncStatic.sh
> +++ b/modules/fedora-web/files/syncStatic.sh
> @@ -58,5 +58,6 @@ rsync -qa --delete-after --delay-updates .
> /srv/web/mirrors.fedoraproject.org/
> popd > /dev/null
>
> pushd fedoracommunity.org > /dev/null
> -rsync -qa --delete-after --delay-updates . /srv/web/fedoracommunity.org/
> +make > /dev/null 2>&1
> +rsync -qa --delete-after --delay-updates out/ /srv/web/fedoracommunity.org/
> popd > /dev/null
> diff --git a/modules/fedora-web/manifests/init.pp
> b/modules/fedora-web/manifests/init.pp
> index 5f39a7d..ba7a98b 100644
> --- a/modules/fedora-web/manifests/init.pp
> +++ b/modules/fedora-web/manifests/init.pp
> @@ -288,4 +288,15 @@ define fedora-web::fedoracommunity-org::proxy($website) {
> notify => Service["httpd"],
> require => Httpd::Website[$website],
> }
> +
> + file { "/etc/httpd/conf.d/$website/languages.conf":
> + owner => "root",
> + group => "root",
> + mode => 0644,
> + source => "puppet:///fedora-web/fedoracommunity.org-languages.conf",
> + notify => Service["httpd"],
> + require => Httpd::Website[$website],
> + }
> +
> +
> }
> ====
>
> I'm also attaching the "fedoracommunity.org-languages.conf" file.
>
> I would also make necessary changes in fedora-web.git for this to work
> correctly.
>
> Could I get the approvals (2 +1's) needed to do this?
>
What's the risk/benefit? Which servers does this run on? Is it very easy
to revert or do you have to revert a bunch of commits in fedora-web as well
if this breaks? Is starting on the mockups time critical? Can we not use
staging for this?
Other risk/benefit things you can think of.
-Toshio
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
Url : http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20100818/46a70573/attachment.bin
More information about the infrastructure
mailing list