diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-09 16:28:49 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-09 16:28:49 +0200 |
| commit | 5efc12d512bbc73c5f048d05f99f5db7a7711678 (patch) | |
| tree | 7b1b372336c0a21c8d5e4aa66f3765e65d862bb6 | |
| parent | 0271f7a3c4287f7659862c92abb37c1c1919ddd2 (diff) | |
| parent | b1072a4737c3583840a8dfa1a9496ef210909740 (diff) | |
| download | Puppet-5efc12d512bbc73c5f048d05f99f5db7a7711678.tar.gz Puppet-5efc12d512bbc73c5f048d05f99f5db7a7711678.tar.zst Puppet-5efc12d512bbc73c5f048d05f99f5db7a7711678.zip | |
Merge branch 'dev'
| -rw-r--r-- | modules/role/manifests/caldance.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp index 8d37df0..6bac0bc 100644 --- a/modules/role/manifests/caldance.pp +++ b/modules/role/manifests/caldance.pp | |||
| @@ -14,7 +14,6 @@ class role::caldance ( | |||
| 14 | Optional[String] $caldance_sha256 = undef, | 14 | Optional[String] $caldance_sha256 = undef, |
| 15 | ) { | 15 | ) { |
| 16 | $password_seed = lookup("base_installation::puppet_pass_seed") | 16 | $password_seed = lookup("base_installation::puppet_pass_seed") |
| 17 | $web_home = "/home/simon_descarpentries" | ||
| 18 | include "base_installation" | 17 | include "base_installation" |
| 19 | 18 | ||
| 20 | include "profile::tools" | 19 | include "profile::tools" |
| @@ -187,7 +186,7 @@ class role::caldance ( | |||
| 187 | require => "valid-user", | 186 | require => "valid-user", |
| 188 | auth_type => "Basic", | 187 | auth_type => "Basic", |
| 189 | auth_name => "Authentification requise", | 188 | auth_name => "Authentification requise", |
| 190 | auth_user_file => "$web_home/caldev/.htpasswd", | 189 | auth_user_file => "$home/htpasswd", |
| 191 | }, | 190 | }, |
| 192 | ], | 191 | ], |
| 193 | aliases => [ | 192 | aliases => [ |