Skip to content

Commit e10bd6e

Browse files
authored
Merge pull request #23 from twc-openstack/client-fqdn
Make client fqdn configurable for server config
2 parents 45aaa55 + 713db1a commit e10bd6e

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ the cronjobs needed to run backups.
264264

265265
```puppet
266266
rsnapshot::server::config { 'backupclient.example.com':
267+
fqdn => $name,
267268
server => $::fqdn,
268269
config_path => '/etc/rsnapshot',
269270
backup_path => '/backups/rsnapshot',

manifests/server/config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define rsnapshot::server::config (
2-
2+
$fqdn = $name,
33
$config_path = $rsnapshot::params::server_config_path,
44
$backup_path = $rsnapshot::params::server_backup_path,
55
$log_path = $rsnapshot::params::server_log_path,

templates/config.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ exclude <%= value %>
101101
###############################
102102

103103
<% @directories.each do |source_dir| -%>
104-
backup <%= @client_user %>@<%= @name %>:<%= source_dir.gsub(/\/$/, '') %>/<%= "\t" %><%= "\t\t." %>
104+
backup <%= @client_user %>@<%= @fqdn %>:<%= source_dir.gsub(/\/$/, '') %>/<%= "\t" %><%= "\t\t." %>
105105
<% end -%>

0 commit comments

Comments
 (0)