Ryan Lane has submitted this change and it was merged.
Change subject: Rename labsproxy module to dynamicproxy
......................................................................
Rename labsproxy module to dynamicproxy
Because that is what it does. Also same module should be
customized for both general labsproxy as well as a toollabs
specific proxy
Change-Id: If4944db7518b0d6a10aece82fb1b8811b5832069
---
M manifests/role/labs.pp
M manifests/role/labsproxy.pp
R modules/dynamicproxy/files/proxy.conf
R modules/dynamicproxy/files/proxy.lua
R modules/dynamicproxy/files/redis.lua
R modules/dynamicproxy/manifests/init.pp
6 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index f79fc72..b741cc5 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -51,7 +51,7 @@
class proxy inherits role::labs::tools::config {
system_role { "role::labs::tools::proxy": description => "Tool labs
generic web proxy" }
- class { '::labsproxy': }
+ class { '::dynamicproxy': }
class { 'toollabs::infrastructure': }
}
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 66e7248..295f5c2 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -60,5 +60,5 @@
# A dynamic HTTP routing proxy, based on nginx+lua+redis
class role::proxy-project {
- class { '::labsproxy': }
+ class { '::dynamicproxy': }
}
diff --git a/modules/labsproxy/files/proxy.conf
b/modules/dynamicproxy/files/proxy.conf
similarity index 100%
rename from modules/labsproxy/files/proxy.conf
rename to modules/dynamicproxy/files/proxy.conf
diff --git a/modules/labsproxy/files/proxy.lua
b/modules/dynamicproxy/files/proxy.lua
similarity index 100%
rename from modules/labsproxy/files/proxy.lua
rename to modules/dynamicproxy/files/proxy.lua
diff --git a/modules/labsproxy/files/redis.lua
b/modules/dynamicproxy/files/redis.lua
similarity index 100%
rename from modules/labsproxy/files/redis.lua
rename to modules/dynamicproxy/files/redis.lua
diff --git a/modules/labsproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
similarity index 79%
rename from modules/labsproxy/manifests/init.pp
rename to modules/dynamicproxy/manifests/init.pp
index ed233f0..644eb52 100644
--- a/modules/labsproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -1,4 +1,4 @@
-class labsproxy ($redis_maxmemory="512MB") {
+class dynamicproxy ($redis_maxmemory="512MB") {
class { '::redis':
persist => "aof",
dir => "/var/lib/redis",
@@ -14,7 +14,7 @@
file { '/etc/nginx/sites-available/default':
ensure => 'file',
- source => 'puppet:///modules/labsproxy/proxy.conf',
+ source => 'puppet:///modules/dynamicproxy/proxy.conf',
require => Package['nginx-extras'],
notify => Service['nginx']
}
@@ -26,7 +26,7 @@
file { '/etc/nginx/lua/proxy.lua':
ensure => 'file',
- source => 'puppet:///modules/labsproxy/proxy.lua',
+ source => 'puppet:///modules/dynamicproxy/proxy.lua',
require => File['/etc/nginx/lua'],
notify => Service['nginx']
}
@@ -39,6 +39,6 @@
file { '/etc/nginx/lua/resty/redis.lua':
ensure => 'file',
require => File['/etc/nginx/lua/resty'],
- source => 'puppet:///modules/labsproxy/redis.lua'
+ source => 'puppet:///modules/dynamicproxy/redis.lua'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/83127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4944db7518b0d6a10aece82fb1b8811b5832069
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Ryan Lane <rl...@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
