X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Frole%2Fmanifests%2Fcaldance.pp;h=6bac0bcb924114a02d85389a403a7378a44082b0;hb=b1072a4737c3583840a8dfa1a9496ef210909740;hp=df8b56fb2b53c59e5cc2a724d0a9b37144de2c1d;hpb=d3948290aadf6050d4ad89b4fb1be99c7451f0c8;p=perso%2FImmae%2FProjets%2FPuppet.git diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp index df8b56f..6bac0bc 100644 --- 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 => [