Change Request: Have fedoracommunity.org work with genshi

Sijis Aviles sijis at fedoraproject.org
Wed Aug 18 04:01:54 UTC 2010


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?

Thanks,

Sijis

[1] - http://duffy.fedorapeople.org/webdesign/fedoracommunity.org/html/16Aug2010/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fedoracommunity.org-languages.conf
Type: application/octet-stream
Size: 4010 bytes
Desc: not available
Url : http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20100817/e45806b8/attachment.obj 


More information about the infrastructure mailing list