From 40b92de076d1526b761bf997ec449c14ebe904bb Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 17 Feb 2019 19:53:59 +0100
Subject: [PATCH] Decommission kantuser (RT#7583)

---
 hieradata/common.yaml                                      | 3 ---
 modules/debian_org/files/misc/local.yaml                   | 1 -
 modules/multipath/templates/multipath-ubc-ganeti2.conf.erb | 5 -----
 modules/roles/manifests/init.pp                            | 6 ------
 modules/sudo/files/sudoers                                 | 1 -
 5 files changed, 16 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ca1650b10..ae2a2d465 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -323,7 +323,6 @@ roles:
     - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
-    - kantuser.debian.org
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
@@ -368,7 +367,5 @@ roles:
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
-  kanboard:
-    - kantuser.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index 10ce3d268..25a7c99e8 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -42,7 +42,6 @@ nameinfo:
   hier.debian.org: Ethel Glenn Hier (June 25th, 1889 - January 14th, 1971)
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
   jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980)
-  kantuser.debian.org: Bozidar Kantuser (December 5, 1921 - May 9, 1999)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
   lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index e21f7312e..db402695c 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -94,11 +94,6 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
-        # kantuser
-        multipath {
-                wwid 3600c0ff00027786c6cfa165a01000000
-                alias kantuser
-        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e6d6d0643..3aaccfa01 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -383,10 +383,4 @@ class roles {
 		include roles::anonscm
 	}
 
-	if has_role('kanboard') {
-		include apache2
-		package {'php-gd': ensure => installed }
-		package {'php-pgsql': ensure => installed }
-		package {'libapache2-mod-php': ensure => installed }
-	}
 }
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 76a345e13..9042142aa 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -184,7 +184,6 @@ git		godard=(salsa-pages)	NOPASSWD: ALL
 %debsso		diabelli=(debsso)	ALL
 %debsso-web	diabelli=(debsso-web)	ALL
 %debconf-web	debussy=(debconf-web)	ALL
-%kanboard	kantuser=(kanboard)	ALL
 
 # the dak user gets to run stuff as dak-unpriv (for things like lintian checks)
 %ftptrainee	FTPHOSTS=(dak-unpriv)	NOPASSWD: /usr/bin/lintian
-- 
2.20.1