diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
| commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
| tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/manifests/bootstrap/configurator.pp | |
| parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
| parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
| download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 | |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/manifests/bootstrap/configurator.pp')
| -rw-r--r-- | puppet/manifests/bootstrap/configurator.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/bootstrap/configurator.pp b/puppet/manifests/bootstrap/configurator.pp index d93a0ce..edcbe92 100644 --- a/puppet/manifests/bootstrap/configurator.pp +++ b/puppet/manifests/bootstrap/configurator.pp @@ -74,7 +74,7 @@ file { "$bootstrap_path/auth.conf": # # Basic users # -file { "$bootstrap_path/manifests/classes/users.pp": +file { "$bootstrap_path/modules/site_users/manifests/init.pp": ensure => present, mode => 0644, content => template("$templates/puppet/users.pp.erb"), |