Dzahn has submitted this change and it was merged.
Change subject: delete ircyall module and role
..
delete ircyall module and role
This module and role is apparently not used on any labs instance
anymore, and the labs project has been deleted(?).
Bug:T1357
Change-Id: I96e8b5fe46e81b9d1546dd63bc14eabdde58dc2d
---
D modules/ircyall/files/ircyall-upstart.conf
D modules/ircyall/manifests/init.pp
D modules/ircyall/templates/ircyall-web.nginx.erb
D modules/role/manifests/ircyall/init.pp
4 files changed, 0 insertions(+), 90 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Paladox: Looks good to me, but someone else must approve
Hashar: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ircyall/files/ircyall-upstart.conf
b/modules/ircyall/files/ircyall-upstart.conf
deleted file mode 100644
index ffa80c8..000
--- a/modules/ircyall/files/ircyall-upstart.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-description "Relay for ircyall, notifies to IRC from the web"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-setuid www-data
-setgid www-data
-
-respawn
-respawn limit 10 5
-
-script
-/usr/bin/ircyall
-end script
diff --git a/modules/ircyall/manifests/init.pp
b/modules/ircyall/manifests/init.pp
deleted file mode 100644
index 2df5aeb..000
--- a/modules/ircyall/manifests/init.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-# = Class: ircyall
-#
-# Sets up an ircyall instance that can take authenticated
-# requests via HTTP and relay them to different IRC channels.
-#
-# = Parameters
-# [*web_port*]
-# Port number to use for ircyall web listener
-class ircyall(
-$web_port = 80,
-) {
-
-redis::instance { 6379:
-settings => {
-appendonly => true,
-appendfilename => "${::hostname}-6379.aof",
-},
-}
-
-package { [
-'python3-flask',
-'python3-redis',
-'python3-irc3',
-'python3-asyncio-redis',
-'python3-ircyall',
-]:
-ensure => present
-}
-
-uwsgi::app { 'ircyall-web':
-settings => {
-uwsgi => {
-'plugins' => 'python3',
-'master'=> true,
-'processes' => 8,
-'module'=> 'ircyall.web2redis',
-'callable' => 'app',
-'socket'=> '/run/uwsgi/ircyall-web.sock',
-}
-},
-require => Package['python3-ircyall'],
-}
-
-nginx::site { 'ircyall-web-nginx':
-require => Uwsgi::App['ircyall-web'],
-content => template('ircyall/ircyall-web.nginx.erb'),
-}
-
-file { '/etc/init/ircyall.conf':
-ensure => present,
-source => 'puppet:///modules/ircyall/ircyall-upstart.conf',
-}
-
-service { 'ircyall':
-ensure => running,
-require => [Package['python3-ircyall'], File['/etc/init/ircyall.conf']]
-}
-}
diff --git a/modules/ircyall/templates/ircyall-web.nginx.erb
b/modules/ircyall/templates/ircyall-web.nginx.erb
deleted file mode 100644
index d1e5868..000
--- a/modules/ircyall/templates/ircyall-web.nginx.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-upstream quarry {
-server unix:/run/uwsgi/ircyall-web.sock;
-}
-
-server {
-listen <%= @web_port %>;
-
-location / {
-include uwsgi_params;
-uwsgi_pass quarry;
-}
-}
diff --git a/modules/role/manifests/ircyall/init.pp
b/modules/role/manifests/ircyall/init.pp
deleted file mode 100644
index ea3fd6a..000
--- a/modules/role/manifests/ircyall/init.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# = Class: role::ircyall
-#
-# Sets up an ircyall instance
-class role::ircyall {
-include ::ircyall
-}
--
To view, visit https://gerrit.wikimedia.org/r/310692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96e8b5fe46e81b9d1546dd63bc14eabdde58dc2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Chasemp
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
