JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/181952
Change subject: Delete unused classes and templates. ...................................................................... Delete unused classes and templates. Those services are now behind the misc cluster, thus their ngix is not used anymore. Change-Id: Ibf30269eccb8a859c42aa73799acdcd31f300d97 --- D modules/gdash/manifests/nginx.pp D modules/gdash/templates/gdash.nginx.erb D modules/grafana/manifests/web/nginx.pp D modules/grafana/templates/grafana.nginx.erb D modules/graphite/manifests/web/nginx.pp D modules/graphite/templates/graphite.nginx.erb 6 files changed, 0 insertions(+), 156 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/52/181952/1 diff --git a/modules/gdash/manifests/nginx.pp b/modules/gdash/manifests/nginx.pp deleted file mode 100644 index 1c30212..0000000 --- a/modules/gdash/manifests/nginx.pp +++ /dev/null @@ -1,18 +0,0 @@ -# == Class: gdash::nginx -# -# Provisions Nginx as reverse-proxy for Gdash running under uWSGI. -# -# === Parameters -# -# [*server_name*] -# Name of virtual server. May contain wildcards. -# See <http://nginx.org/en/docs/http/server_names.html>. -# Defaults to '_', which is catch-all. -# -class gdash::nginx( - $server_name = '_', -) { - nginx::site { 'gdash': - content => template('gdash/gdash.nginx.erb'), - } -} diff --git a/modules/gdash/templates/gdash.nginx.erb b/modules/gdash/templates/gdash.nginx.erb deleted file mode 100644 index eee4ec6..0000000 --- a/modules/gdash/templates/gdash.nginx.erb +++ /dev/null @@ -1,32 +0,0 @@ -# Nginx configuration for Gdash -# This file is managed by Puppet - -upstream gdash { - server unix:/run/uwsgi/gdash.sock; -} - -server { - listen 80; - server_name <%= @server_name %>; - - ## Static files ## - - location /js { - alias /srv/deployment/gdash/gdash/public/js; - expires 30d; - } - - location /lib { - alias /srv/deployment/gdash/gdash/public/lib; - expires 30d; - } - - ## uWSGI ## - - location / { - include uwsgi_params; - uwsgi_pass gdash; - root /srv/deployment/gdash/gdash/public; - uwsgi_modifier1 7; # see <http://tinyurl.com/rack-uwsgi-modifier> - } -} diff --git a/modules/grafana/manifests/web/nginx.pp b/modules/grafana/manifests/web/nginx.pp deleted file mode 100644 index 110f4f1..0000000 --- a/modules/grafana/manifests/web/nginx.pp +++ /dev/null @@ -1,31 +0,0 @@ -# == Class: grafana::web::nginx -# -# Configures Nginx to serve Grafana. -# -# === Parameters -# -# [*server_name*] -# Name of virtual server. May contain wildcards. -# See <http://nginx.org/en/docs/http/server_names.html>. -# Defaults to '_', which is catch-all. -# -# [*listen*] -# Interface / port to listen on (default: 80). -# See <http://nginx.org/en/docs/http/ngx_http_core_module.html#listen>. -# -# === Examples -# -# class { 'grafana::web::nginx': -# server_name => 'grafana.wikimedia.org', -# } -# -class grafana::web::nginx( - $ensure = present, - $server_name = '_', - $listen = 80, -) { - nginx::site { 'grafana': - ensure => $ensure, - content => template('grafana/grafana.nginx.erb'), - } -} diff --git a/modules/grafana/templates/grafana.nginx.erb b/modules/grafana/templates/grafana.nginx.erb deleted file mode 100644 index 2b7367f..0000000 --- a/modules/grafana/templates/grafana.nginx.erb +++ /dev/null @@ -1,16 +0,0 @@ -# Nginx configuration for Grafana -# This file is managed by Puppet - -server { - listen <%= @listen %>; - server_name <%= @server_name %>; - root /srv/deployment/grafana/grafana/src; - - location / { - expires 30d; - } - - location /config.js { - alias /etc/grafana/config.js; - } -} diff --git a/modules/graphite/manifests/web/nginx.pp b/modules/graphite/manifests/web/nginx.pp deleted file mode 100644 index 08cd416..0000000 --- a/modules/graphite/manifests/web/nginx.pp +++ /dev/null @@ -1,27 +0,0 @@ -# == Class: graphite::web::nginx -# -# Configures Nginx to act as a reverse proxy for Graphite. -# -# === Parameters -# -# [*server_name*] -# Name of virtual server. May contain wildcards. -# See <http://nginx.org/en/docs/http/server_names.html>. -# Defaults to '_', which is catch-all. -# -# === Examples -# -# class { 'graphite::web::nginx': -# server_name => 'graphite.wikimedia.org', -# } -# -class graphite::web::nginx( - $ensure = present, - $server_name = '_', -) { - nginx::site { 'graphite': - ensure => $ensure, - content => template('graphite/graphite.nginx.erb'), - } -} - diff --git a/modules/graphite/templates/graphite.nginx.erb b/modules/graphite/templates/graphite.nginx.erb deleted file mode 100644 index 2fc0828..0000000 --- a/modules/graphite/templates/graphite.nginx.erb +++ /dev/null @@ -1,32 +0,0 @@ -# Nginx configuration for Graphite webapp -# This file is managed by Puppet - -upstream graphite_web { - server unix:/run/uwsgi/graphite-web.sock; -} - -server { - listen 80; - server_name <%= @server_name %>; - - ## Static files ## - - location /content { - alias /usr/share/graphite-web/static; - expires 30d; - } - - location /media { - alias /usr/share/pyshared/django/contrib/admin/media; - expires 30d; - } - - - ## uWSGI ## - - location / { - root /usr/share/pyshared/graphite; - uwsgi_pass graphite_web; - include uwsgi_params; - } -} -- To view, visit https://gerrit.wikimedia.org/r/181952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf30269eccb8a859c42aa73799acdcd31f300d97 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: JanZerebecki <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
