diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-munin-el.conf | 6 | ||||
| -rw-r--r-- | config/awx-munin-ubuntu.conf | 26 |
2 files changed, 11 insertions, 21 deletions
diff --git a/config/awx-munin-el.conf b/config/awx-munin-el.conf index 41f6183bb6..ca4f4c39ad 100644 --- a/config/awx-munin-el.conf +++ b/config/awx-munin-el.conf @@ -2,4 +2,10 @@ Alias /munin /var/www/html/munin/ <Directory /var/www/html/munin/> Order Allow,Deny Allow from all + + AuthUserFile /var/lib/awx/.munin_htpasswd + AuthName "Munin" + AuthType Basic + require valid-user + </Directory> diff --git a/config/awx-munin-ubuntu.conf b/config/awx-munin-ubuntu.conf index 936eb706ca..90c479f77a 100644 --- a/config/awx-munin-ubuntu.conf +++ b/config/awx-munin-ubuntu.conf @@ -1,30 +1,14 @@ Alias /munin /var/cache/munin/www <Directory /var/cache/munin/www> - Order allow,deny + Order Allow,Deny Allow from all Options FollowSymLinks - # This file can be used as a .htaccess file, or a part of your apache - # config file. - # - # For the .htaccess file option to work the munin www directory - # (/var/cache/munin/www) must have "AllowOverride all" or something - # close to that set. - # - - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - - # This next part requires mod_expires to be enabled. - # - - # Set the default expiration time for files to 5 minutes 10 seconds from - # their creation (modification) time. There are probably new files by - # that time. - # + AuthUserFile /var/lib/awx/.munin_htpasswd + AuthName "Munin" + AuthType Basic + require valid-user <IfModule mod_expires.c> ExpiresActive On |