Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120837
Change subject: Setting up simple nginx proxy to archiva on port 8080
......................................................................
Setting up simple nginx proxy to archiva on port 8080
Change-Id: I14de50039b5cca3cb4b9838449dc0123d89db057
---
M manifests/role/archiva.pp
A templates/nginx/sites/simple-proxy.erb
2 files changed, 32 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/120837/1
diff --git a/manifests/role/archiva.pp b/manifests/role/archiva.pp
index d074526..ae112ed 100644
--- a/manifests/role/archiva.pp
+++ b/manifests/role/archiva.pp
@@ -13,9 +13,25 @@
}
}
+ $archiva_port = 8080
class { '::archiva':
- port => 80,
+ port => $archiva_port,
require => Package['openjdk-7-jdk'],
}
- class { '::archiva::gitfat': }
+
+ class { '::archiva::gitfat':
+ require => Class['::archiva']
+ }
+
+ # Set up simple Nginx reverse proxy port 80 to port $archiva_port
+ # Set up simple Nginx proxy to proxy from port 80 to $archiva_port
+ $listen = 80
+ $proxy_pass = "http://127.0.0.1:${archiva_port}/";
+ class { '::nginx':
+ require => Class['::archiva'],
+ }
+ nginx::site { 'archiva':
+ content => template('nginx/sites/simple-proxy.erb'),
+ require => Class['::nginx'],
+ }
}
\ No newline at end of file
diff --git a/templates/nginx/sites/simple-proxy.erb
b/templates/nginx/sites/simple-proxy.erb
new file mode 100644
index 0000000..cfe84b1
--- /dev/null
+++ b/templates/nginx/sites/simple-proxy.erb
@@ -0,0 +1,14 @@
+<%
+#
+# Nginx ERb template for a simple reverse proxy site.
+# Parameters:
+# @listen - Example: host:port
+# @proxy_pass - Example: http://host:port/
+#
+-%>
+server {
+ listen <%= @listen_port %>;
+ location / {
+ proxy_pass <%= @proxy_pass %>;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/120837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14de50039b5cca3cb4b9838449dc0123d89db057
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
