tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved BackupPC authentication configuration to htaccess file

Browse source
This commit is contained in:
Ossi Salmi 2012-02-08 17:14:09 +02:00
parent 1093ac1cf6
commit 7cb3953a96
4 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backuppc/files/backuppc-httpd.conf Normal file
View file

@ -0,0 +1,7 @@
<Directory /usr/share/BackupPC/sbin/>
AllowOverride AuthConfig
</Directory>
Alias /BackupPC/images /usr/share/BackupPC/html/
ScriptAlias /BackupPC /usr/share/BackupPC/sbin/BackupPC_Admin
ScriptAlias /backuppc /usr/share/BackupPC/sbin/BackupPC_Admin

5
backuppc/files/htaccess Normal file
View file

@ -0,0 +1,5 @@
AuthType Basic
AuthUserFile /etc/BackupPC/apache.users
AuthName "BackupPC"
require valid-user

21
backuppc/manifests/init.pp
View file

@ -83,7 +83,17 @@ class backuppc::server {
apache::configfile { "BackupPC.conf": apache::configfile { "BackupPC.conf":
http => false, http => false,
content => template("backuppc/BackupPC.conf.erb"), source => "puppet:///modules/backuppc/backuppc-httpd.conf",
require => Package["BackupPC"],
}
file { "/usr/share/BackupPC/sbin/.htaccess":
ensure => present,
mode => 0644,
owner => "root",
group => "root",
source => [ "puppet:///files/backuppc/htaccess",
"puppet:///modules/backuppc/htaccess", ],
require => Package["BackupPC"], require => Package["BackupPC"],
} }
@ -94,6 +104,15 @@ class backuppc::server {
group => $apache::sslserver::group, group => $apache::sslserver::group,
require => Package["BackupPC"], require => Package["BackupPC"],
} }
file { "/etc/BackupPC/apache.users":
ensure => present,
mode => 0640,
owner => "root",
group => $apache::sslserver::group,
require => Package["BackupPC"],
}
file { "/etc/BackupPC/config.pl": file { "/etc/BackupPC/config.pl":
ensure => present, ensure => present,
source => "puppet:///files/backuppc/config.pl", source => "puppet:///files/backuppc/config.pl",

26
backuppc/templates/BackupPC.conf.erb
View file

@ -1,26 +0,0 @@
<Directory /usr/share/BackupPC/sbin/>
# BackupPC requires valid authentication in order for the web interface to
# function properly. One can view the web interface without authentication
# though all functionality is disabled.
#
# htpasswd -c /etc/BackupPC/apache.users yourusername
#
#order deny,allow
#deny from all
#allow from 127.0.0.1
#AuthType Basic
#AuthUserFile /etc/BackupPC/apache.users
#AuthName "BackupPC
<%= backuppc_auth %>
<% backuppc_adminusers.each do |user| -%>
require user <%= user %>
<% end -%>
</Directory>
Alias /BackupPC/images /usr/share/BackupPC/html/
ScriptAlias /BackupPC /usr/share/BackupPC/sbin/BackupPC_Admin