Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Remove NFS dependency from proxies
......................................................................
toollabs: Remove NFS dependency from proxies
Should just do manual deploys for tools.admin
Change-Id: I80b6d0054c1831664d23108dd23872f4095011b3
---
A modules/toollabs/files/favicon.ico
M modules/toollabs/manifests/proxy.pp
2 files changed, 2 insertions(+), 18 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
Merlijn van Deen: Looks good to me, but someone else must approve
diff --git a/modules/toollabs/files/favicon.ico
b/modules/toollabs/files/favicon.ico
new file mode 100644
index 0000000..656d807
--- /dev/null
+++ b/modules/toollabs/files/favicon.ico
Binary files differ
diff --git a/modules/toollabs/manifests/proxy.pp
b/modules/toollabs/manifests/proxy.pp
index 1e56fb4..469b9a2 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -76,26 +76,10 @@
desc => 'Proxylistener port, open to just labs'
}
- # Deploy root web.
- git::clone { 'labs/toollabs':
- ensure => latest,
- directory => '/data/project/admin/toollabs',
- owner => "${::labsproject}.admin",
- group => "${::labsproject}.admin",
- mode => '2755',
- }
-
- file { '/data/project/admin/public_html':
- ensure => link,
- force => true,
- target => 'toollabs/www',
- require => Git::Clone['labs/toollabs'],
- }
-
file { '/var/www/error/favicon.ico':
ensure => file,
- source => '/data/project/admin/toollabs/www/favicon.ico',
- require => [File['/var/www/error'], Git::Clone['labs/toollabs']]
+ source => 'puppet:///modules/toollabs/favico.ico',
+ require => File['/var/www/error'],
}
file { '/var/www/error/tool-labs-logo.png':
--
To view, visit https://gerrit.wikimedia.org/r/260424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80b6d0054c1831664d23108dd23872f4095011b3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
