I don't think the earlier lock-wrapper change will work, since the ftpsync user does not have write access to /var/lock. This patch adds the ftpsync user to the lock group, which should allow it to use lock-wrapper.
Alternatively, we can run lock-wrapper as root and use sudo to run the command as ftpsync.
--- manifests/services/mirrormaster.pp | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/manifests/services/mirrormaster.pp b/manifests/services/mirrormaster.pp index 001aec2..89af308 100644 --- a/manifests/services/mirrormaster.pp +++ b/manifests/services/mirrormaster.pp @@ -9,12 +9,13 @@ class mirrormaster {
user { ftpsync: require => Group['ftpsync'], - uid => 263, - gid => 263, - shell => '/bin/bash', - home => '/tmp', + uid => 263, + gid => 263, + groups => [ "lock" ], + shell => '/bin/bash', + home => '/tmp', comment => 'ftpsync account', - ensure => present, + ensure => present, }
script { "/usr/local/bin/update-fullfilelist":
On Wed, 2010-02-17 at 18:20 -0500, Ricky Zhou wrote:
ensure => present,
ensure => present,
Extra whitespace change here?
On 2010-02-17 03:34:24 PM, Jesse Keating wrote:
On Wed, 2010-02-17 at 18:20 -0500, Ricky Zhou wrote:
ensure => present,
ensure => present,
Extra whitespace change here?
Sorry, I'm using tmz's great vim syntax file, which automatically fixes indentation :-)
Actually, I spoke with Mike on IRC, and now we'd like to just modify lock-wrapper.sh to use /var/tmp for the lock directory instead of /var/lock. The patch is below, can we get 2 +1s?
diff --git a/modules/scripts/files/lock-wrapper.sh b/modules/scripts/files/lock-wrapper.sh index 9472299..4b3ea09 100755 --- a/modules/scripts/files/lock-wrapper.sh +++ b/modules/scripts/files/lock-wrapper.sh @@ -8,7 +8,7 @@ fi NAME=$1 SCRIPT=$2
-LOCKDIR="/var/lock/$NAME" +LOCKDIR="/var/tmp/$NAME" PIDFILE="$LOCKDIR/pid"
function cleanup {
Thanks, Ricky
On Wed, 2010-02-17 at 18:48 -0500, Ricky Zhou wrote:
Actually, I spoke with Mike on IRC, and now we'd like to just modify lock-wrapper.sh to use /var/tmp for the lock directory instead of /var/lock. The patch is below, can we get 2 +1s?
+1
On Wed, 17 Feb 2010, Jesse Keating wrote:
On Wed, 2010-02-17 at 18:48 -0500, Ricky Zhou wrote:
Actually, I spoke with Mike on IRC, and now we'd like to just modify lock-wrapper.sh to use /var/tmp for the lock directory instead of /var/lock. The patch is below, can we get 2 +1s?
+1
+1
-Mike
infrastructure@lists.fedoraproject.org