We ran into an issue today with the developer.fedoraproject.org site.
Every once in a while it would show up with some really old blog
content.
Turns out we pull the site from github at :25 after the hour, and then
only update the rss feeds at :45 after the hour. This results in 20min
of having the old content from the repo and general confusion.
This change removes the seperate cron job for this and just adds the
update to the cron that pulls the site so they are always in sync.
+1s?
kevin
--
diff --git a/roles/developer/build/files/developer-rss-update.cron b/roles/developer/build/files/developer-rss-update.cron
deleted file mode 100644
index 98232b2..0000000
--- a/roles/developer/build/files/developer-rss-update.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-MAILTO=web-members@xxxxxxxxxxxxxxxxx
-45 * * * * apache /usr/local/bin/rss.py /srv/web/developer.fedoraproject.org/index.html
diff --git a/roles/developer/build/files/syncDeveloper.sh b/roles/developer/build/files/syncDeveloper.sh
index f8e7d48..91adb80 100644
--- a/roles/developer/build/files/syncDeveloper.sh
+++ b/roles/developer/build/files/syncDeveloper.sh
@@ -11,3 +11,6 @@ cd /srv/web/developer.fedoraproject.org
/usr/bin/git reset -q --hard || exit 1
/usr/bin/git checkout -q master || exit 1
/usr/bin/git pull -q --ff-only || exit 1
+
+# Now we update the blog content
+/usr/local/bin/rss.py /srv/web/developer.fedoraproject.org/index.html
diff --git a/roles/developer/build/tasks/main.yml b/roles/developer/build/tasks/main.yml
index 8b99578..eb46bbf 100644
--- a/roles/developer/build/tasks/main.yml
+++ b/roles/developer/build/tasks/main.yml
@@ -29,13 +29,12 @@
tags:
- developer.fedoraproject.org
-- name: Install the syncDeveloper and rss feed update jobs
+- name: Install the syncDeveloper cron job
copy: >
src={{item}}.cron dest=/etc/cron.d/{{item}}.cron
owner=root group=root mode=0644
with_items:
- syncDeveloper
- - developer-rss-update
tags:
- developer.fedoraproject.org
- cron
Attachment:
pgp0ksO_Ghm74.pgp
Description: OpenPGP digital signature
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx http://lists.fedoraproject.org/admin/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
