Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Alex Vandiver 2020-05-28 15:00:30 -07:00 committed by Tim Abbott
parent 080014abcc
commit 8b1d49dbc7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
puppet/zulip_ops/files/munin/apache.conf
View File

@ -27,9 +27,9 @@ Alias /munin /var/cache/munin/www
# #
AuthType Digest AuthType Digest
AuthName "wiki" AuthName "monitoring"
AuthDigestProvider file AuthDigestProvider file
AuthUserFile /etc/apache2/users/wiki AuthUserFile /etc/apache2/users/monitoring
Require valid-user Require valid-user
# This next part requires mod_expires to be enabled. # 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 ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
<Location /munin-cgi/munin-cgi-graph> <Location /munin-cgi/munin-cgi-graph>
AuthType Digest AuthType Digest
AuthName "wiki" AuthName "monitoring"
AuthDigestProvider file AuthDigestProvider file
AuthUserFile /etc/apache2/users/wiki AuthUserFile /etc/apache2/users/monitoring
Require valid-user Require valid-user
<IfModule mod_fcgid.c> <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 ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
<Location /munin-cgi/munin-cgi-html> <Location /munin-cgi/munin-cgi-html>
AuthType Digest AuthType Digest
AuthName "wiki" AuthName "monitoring"
AuthDigestProvider file AuthDigestProvider file
AuthUserFile /etc/apache2/users/wiki AuthUserFile /etc/apache2/users/monitoring
Require valid-user Require valid-user
<IfModule mod_fcgid.c> <IfModule mod_fcgid.c>

2
puppet/zulip_ops/manifests/apache.pp
View File

@ -18,7 +18,7 @@ class zulip_ops::apache {
mode => '0600', mode => '0600',
} }
file { '/etc/apache2/users/wiki': file { '/etc/apache2/users/monitoring':
ensure => file, ensure => file,
require => File['/etc/apache2/users/'], require => File['/etc/apache2/users/'],
owner => 'www-data', owner => 'www-data',

4
puppet/zulip_ops/templates/nagios_apache_site.conf.template.erb
View File

@ -27,9 +27,9 @@
<Location "/"> <Location "/">
AuthType Digest AuthType Digest
AuthName "wiki" AuthName "monitoring"
AuthDigestProvider file AuthDigestProvider file
AuthUserFile /etc/apache2/users/wiki AuthUserFile /etc/apache2/users/monitoring
Require valid-user Require valid-user
</Location> </Location>