[PATCH] Enabling the wrapper script and removing F10

[Mike McGrath]

This was requested by jesse and will ensure the sync script is only running once and
is no longer syncing F10
---
 configs/system/fedora-updates-push |    2 +-
 manifests/services/mirrormaster.pp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/system/fedora-updates-push b/configs/system/fedora-updates-push
index 94105d5..45346b1 100755
--- a/configs/system/fedora-updates-push
+++ b/configs/system/fedora-updates-push
@@ -3,7 +3,7 @@
 SOURCE=/mnt/koji/mash/updates
 DEST=/pub/fedora/linux/updates/
 
-for rel in 10 11 12; do
+for rel in 11 12; do
 
 rsync -rlptDvHh --delay-updates $RSYNC_OPTS --exclude "repodata/*" \
         $SOURCE/f$rel-updates/ $DEST/$rel/ &>/dev/null
diff --git a/manifests/services/mirrormaster.pp b/manifests/services/mirrormaster.pp
index 513157a..001aec2 100644
--- a/manifests/services/mirrormaster.pp
+++ b/manifests/services/mirrormaster.pp
@@ -49,7 +49,7 @@ class mirrormaster::fedora {
     include mirrormaster
 
     cron { updates-sync:
-        command => "/usr/local/bin/fedora-updates-push &&
/usr/local/bin/update-fullfilelist fedora",
+        command => "/usr/local/bin/lock-wrapper fedora-updates-push
'/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfilelist
fedora'",
         user => ftpsync,
         minute => [ 15, 45 ],
         ensure => present,
-- 
1.6.6

[Jesse Keating]

On Wed, 2010-02-17 at 15:40 -0600, Mike McGrath wrote:
>  This was requested by jesse and will ensure the sync script is only
> running once and
>  is no longer syncing F10
>  ---
>   configs/system/fedora-updates-push |    2 +-
>   manifests/services/mirrormaster.pp |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/configs/system/fedora-updates-push b/configs/system/fedora-updates-push
>  index 94105d5..45346b1 100755
>  --- a/configs/system/fedora-updates-push
>  +++ b/configs/system/fedora-updates-push
>  @@ -3,7 +3,7 @@
>   SOURCE=/mnt/koji/mash/updates
>   DEST=/pub/fedora/linux/updates/
>   
>  -for rel in 10 11 12; do
>  +for rel in 11 12; do
>   
>   rsync -rlptDvHh --delay-updates $RSYNC_OPTS --exclude "repodata/*" \
>           $SOURCE/f$rel-updates/ $DEST/$rel/ &>/dev/null
>  diff --git a/manifests/services/mirrormaster.pp b/manifests/services/mirrormaster.pp
>  index 513157a..001aec2 100644
>  --- a/manifests/services/mirrormaster.pp
>  +++ b/manifests/services/mirrormaster.pp
>  @@ -49,7 +49,7 @@ class mirrormaster::fedora {
>       include mirrormaster
>   
>       cron { updates-sync:
>  -        command => "/usr/local/bin/fedora-updates-push &&
> /usr/local/bin/update-fullfilelist fedora",
>  +        command => "/usr/local/bin/lock-wrapper fedora-updates-push
> '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfilelist
> fedora'",
>           user => ftpsync,
>           minute => [ 15, 45 ],
>           ensure => present, 
+1.  I'll re-do my patch to add 13 once this goes in.

-- 
Jesse Keating
Fedora -- Freedom² is a feature!
identi.ca: http://identi.ca/jkeating

[Matt Domsch]

On Wed, Feb 17, 2010 at 03:40:19PM -0600, Mike McGrath wrote:
>  This was requested by jesse and will ensure the sync script is only
> running once and
>  is no longer syncing F10 
+1

-- 
Matt Domsch
Technology Strategist, Dell Office of the CTO
linux.dell.com & www.dell.com/linux