Move htpasswd to caldance home

[perso/Immae/Projets/Puppet.git] / modules / role / manifests / caldance.pp

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index df8b56fb2b53c59e5cc2a724d0a9b37144de2c1d..6bac0bcb924114a02d85389a403a7378a44082b0 100644 (file)
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -14,7 +14,6 @@ class role::caldance (
   Optional[String] $caldance_sha256  = undef,
 ) {
   $password_seed = lookup("base_installation::puppet_pass_seed")
-  $web_home = "/home/simon_descarpentries"
   include "base_installation"
 
   include "profile::tools"
@@ -52,7 +51,6 @@ class role::caldance (
     mode    => "0664",
     owner   => $user,
     group   => "http",
-    content => "",
   }
 
   file { $caldance_app:
@@ -87,7 +85,7 @@ class role::caldance (
     cwd         => $caldance_app,
     user        => $user,
     environment => concat(["HOME=${home}"], $shell_env),
-    command     => "/usr/bin/sed -i -e '/GDAL/d' requirements.txt && ${home}/virtualenv/bin/pip install -r requirements.txt",
+    command     => "/usr/bin/sed -i -e '/GDAL/d' requirements.txt && ${home}/virtualenv/bin/pip install -r requirements.txt --upgrade",
     require     => User["$user:"],
     refreshonly => true,
   } ~>
@@ -188,7 +186,7 @@ class role::caldance (
         require        => "valid-user",
         auth_type      => "Basic",
         auth_name      => "Authentification requise",
-        auth_user_file => "$web_home/caldev/.htpasswd",
+        auth_user_file => "$home/htpasswd",
       },
     ],
     aliases             => [