coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89417
Change subject: Tool Labs: lighttpd: move to final paths
......................................................................
Tool Labs: lighttpd: move to final paths
Change-Id: Ib23f3ac0b34e8cb3d7987920376ba1234f080927
---
M modules/toollabs/files/portgranter
M modules/toollabs/files/tool-lighttpd
M modules/toollabs/manifests/webnode.pp
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/89417/1
diff --git a/modules/toollabs/files/portgranter
b/modules/toollabs/files/portgranter
index 11d356e..f09632d 100755
--- a/modules/toollabs/files/portgranter
+++ b/modules/toollabs/files/portgranter
@@ -19,7 +19,7 @@
use File::NFSLock;
use Fcntl qw(LOCK_EX LOCK_NB);
-my $scoreboard = "/tmp/dynamic";
+my $scoreboard = "/data/project/.system/dynamic";
my $sockname = "/tmp/sock.portgranter";
my $uaddr = sockaddr_un($sockname);
diff --git a/modules/toollabs/files/tool-lighttpd
b/modules/toollabs/files/tool-lighttpd
index 357b2b0..70ad892 100755
--- a/modules/toollabs/files/tool-lighttpd
+++ b/modules/toollabs/files/tool-lighttpd
@@ -16,4 +16,4 @@
#
tool=$(/usr/bin/id -nu|sed -e 's/^local-//')
-exec /usr/local/sbin/portgrabber "$tool" /usr/local/sbin/lighttpd-starter
"$tool"
+exec /usr/local/bin/portgrabber "$tool" /usr/local/bin/lighttpd-starter "$tool"
diff --git a/modules/toollabs/manifests/webnode.pp
b/modules/toollabs/manifests/webnode.pp
index 56bd874..eb75ea0 100644
--- a/modules/toollabs/manifests/webnode.pp
+++ b/modules/toollabs/manifests/webnode.pp
@@ -78,7 +78,7 @@
package { 'lighttpd': ensure => present }
package { 'apache2.2-common': ensure => absent }
- file { "/usr/local/sbin/tool-lighttpd":
+ file { "/usr/local/bin/tool-lighttpd":
ensure => file,
owner => 'root',
group => 'root',
@@ -86,7 +86,7 @@
source => "puppet:///modules/toollabs/tool-lighttpd",
}
- file { "/usr/local/sbin/lighttpd-starter":
+ file { "/usr/local/bin/lighttpd-starter":
ensure => file,
owner => 'root',
group => 'root',
@@ -94,7 +94,7 @@
source => "puppet:///modules/toollabs/lighttpd-starter",
}
- file { "/usr/local/sbin/portgrabber":
+ file { "/usr/local/bin/portgrabber":
ensure => file,
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/89417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib23f3ac0b34e8cb3d7987920376ba1234f080927
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
