From 8b1d49dbc7bbd84e2196da1a881da88d6139c2a4 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alex@chmrr.net>
Date: Thu, 28 May 2020 15:00:30 -0700
Subject: [PATCH] puppet: Rename "wiki" realm to "monitoring".

This is vestigial.

It requires manually altering the `htdigest` file (not stored in this
repo) to change the digest realm from `wiki` to `monitoring`, and will
re-prompt users for their passwords if the browsers currently store
them.
---
 puppet/zulip_ops/files/munin/apache.conf             | 12 ++++++------
 puppet/zulip_ops/manifests/apache.pp                 |  2 +-
 .../templates/nagios_apache_site.conf.template.erb   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/puppet/zulip_ops/files/munin/apache.conf b/puppet/zulip_ops/files/munin/apache.conf
index c6f30e7f25..69de0d756b 100644
--- a/puppet/zulip_ops/files/munin/apache.conf
+++ b/puppet/zulip_ops/files/munin/apache.conf
@@ -27,9 +27,9 @@ Alias /munin /var/cache/munin/www
 	#
 
         AuthType Digest
-        AuthName "wiki"
+        AuthName "monitoring"
         AuthDigestProvider file
-        AuthUserFile /etc/apache2/users/wiki
+        AuthUserFile /etc/apache2/users/monitoring
         Require valid-user
 
 	# This next part requires mod_expires to be enabled.
@@ -62,9 +62,9 @@ Alias /munin /var/cache/munin/www
 ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
 <Location /munin-cgi/munin-cgi-graph>
         AuthType Digest
-        AuthName "wiki"
+        AuthName "monitoring"
         AuthDigestProvider file
-        AuthUserFile /etc/apache2/users/wiki
+        AuthUserFile /etc/apache2/users/monitoring
         Require valid-user
 
 	<IfModule mod_fcgid.c>
@@ -78,9 +78,9 @@ ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
 ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
 <Location /munin-cgi/munin-cgi-html>
         AuthType Digest
-        AuthName "wiki"
+        AuthName "monitoring"
         AuthDigestProvider file
-        AuthUserFile /etc/apache2/users/wiki
+        AuthUserFile /etc/apache2/users/monitoring
         Require valid-user
 
 	<IfModule mod_fcgid.c>
diff --git a/puppet/zulip_ops/manifests/apache.pp b/puppet/zulip_ops/manifests/apache.pp
index f97e83e1ee..5b3d6ea210 100644
--- a/puppet/zulip_ops/manifests/apache.pp
+++ b/puppet/zulip_ops/manifests/apache.pp
@@ -18,7 +18,7 @@ class zulip_ops::apache {
     mode    => '0600',
   }
 
-  file { '/etc/apache2/users/wiki':
+  file { '/etc/apache2/users/monitoring':
     ensure  => file,
     require => File['/etc/apache2/users/'],
     owner   => 'www-data',
diff --git a/puppet/zulip_ops/templates/nagios_apache_site.conf.template.erb b/puppet/zulip_ops/templates/nagios_apache_site.conf.template.erb
index 5d8790da67..bc7b64d24b 100644
--- a/puppet/zulip_ops/templates/nagios_apache_site.conf.template.erb
+++ b/puppet/zulip_ops/templates/nagios_apache_site.conf.template.erb
@@ -27,9 +27,9 @@
 
     <Location "/">
         AuthType Digest
-        AuthName "wiki"
+        AuthName "monitoring"
         AuthDigestProvider file
-        AuthUserFile /etc/apache2/users/wiki
+        AuthUserFile /etc/apache2/users/monitoring
         Require valid-user
     </Location>