Merge branch 'master' of https://github.com/wyrie/puppet-backuppc
diff --git a/README.markdown b/README.markdown
index ccecb90..8f928b5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,14 +1,25 @@
# BackupPC Module
+####Table of Contents
+
+1. [Overview](#overview)
+2. [Module Description - What the module does and why it is useful](#module-description)
+3. [Usage - Configuration options and additional functionality](#usage)
+4. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
+5. [Limitations - OS compatibility, etc.](#limitations)
+6. [Development - Guide for contributing to the module](#development)
+
+##Overview
+
This module will install and configure a BackupPC server and allow you to add other puppet managed nodes as clients/hosts. It
uses exported resources to create the client's configuration file, add it to the hosts file and setup ssh access if needed.
This module started as a fork of https://github.com/codec/puppet-backuppc.
-## Description
+##Module Description
BackupPC has many configuration options and this module should provide you access to most of them. BackupPC's global configuration
-file is managed by backuppc::server and is intended to setup useful defaults that can be overridden by the client if needed.
+file is managed by backuppc::server and is intended to setup useful defaults that can be overridden by the client if needed.
Where BackupPC's configuration file uses camel case for the config variables the module's class parameters would use the same names but
replacing the uppercase characters with lowercase and an underscore prefix.
@@ -91,6 +102,18 @@
Debian by default installs a 'localhost' host, but if you want to managed it with puppet or if you're on Centos/RHEL this example will use the tar method to backup
the paths you sepcify. The example uses sudo which is not configured in the module itself.
+##Reference
+
+###Classes
+
+####Public Classes
+
+* backuppc:server: Class used to install backuppc.
+* backuppc::client: Configures host for backup through backuppc.
+
+####Private Classes
+
+* backuppc::params: Default values.
## Limitations
diff --git a/manifests/client.pp b/manifests/client.pp
index df82ba2..6d4bcc5 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -314,7 +314,7 @@
if ! empty($system_additional_commands) {
$additional_sudo_commands = join($system_additional_commands, ', ')
- $sudo_commands = "${additional_sudo_commands}"
+ $sudo_commands = $additional_sudo_commands
}
if ! empty($system_additional_commands_noexec) {
@@ -364,10 +364,10 @@
}
file { "${system_home_directory}/.ssh":
- ensure => directory,
- mode => '0700',
- owner => $system_account,
- group => $system_account,
+ ensure => directory,
+ mode => '0700',
+ owner => $system_account,
+ group => $system_account,
}
file { "${system_home_directory}/backuppc.sh":
@@ -395,11 +395,11 @@
}
@@file_line { "backuppc_host_${::fqdn}":
- ensure => $ensure,
- path => $backuppc::params::hosts,
- match => "^${::fqdn}.*$",
- line => "${::fqdn} ${hosts_file_dhcp} backuppc ${hosts_file_more_users}\n",
- tag => "backuppc_hosts_${backuppc_hostname}",
+ ensure => $ensure,
+ path => $backuppc::params::hosts,
+ match => "^${::fqdn}.*$",
+ line => "${::fqdn} ${hosts_file_dhcp} backuppc ${hosts_file_more_users}\n",
+ tag => "backuppc_hosts_${backuppc_hostname}",
}
@@file { "${backuppc::params::config_directory}/pc/${::fqdn}.pl":
diff --git a/manifests/server.pp b/manifests/server.pp
index d15f611..262c71b 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -302,8 +302,8 @@
# Include preseeding for debian packages
if $::osfamily == 'Debian' {
file { '/var/cache/debconf/backuppc.seeds':
- ensure => $ensure,
- source => 'puppet:///modules/backuppc/backuppc.preseed',
+ ensure => $ensure,
+ source => 'puppet:///modules/backuppc/backuppc.preseed',
}
}
