summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2020-05-13 20:18:09 +0200
committerJan Dittberner <jandd@cacert.org>2020-05-13 20:18:09 +0200
commit426c8a03b9f021c84ddad8e8723420ca5d25f873 (patch)
tree9b73126df72f3ca2baa0e0f2901278d360ec24fa
parentc3739cba1cbd572ed661f2062c252a34c82c4154 (diff)
downloadcacert-puppet-426c8a03b9f021c84ddad8e8723420ca5d25f873.tar.gz
cacert-puppet-426c8a03b9f021c84ddad8e8723420ca5d25f873.tar.xz
cacert-puppet-426c8a03b9f021c84ddad8e8723420ca5d25f873.zip
Fix paths for RoundCube plugin archives
-rw-r--r--sitemodules/profiles/manifests/roundcube.pp18
1 files changed, 12 insertions, 6 deletions
diff --git a/sitemodules/profiles/manifests/roundcube.pp b/sitemodules/profiles/manifests/roundcube.pp
index 338197e..0f30adf 100644
--- a/sitemodules/profiles/manifests/roundcube.pp
+++ b/sitemodules/profiles/manifests/roundcube.pp
@@ -136,16 +136,22 @@ class profiles::roundcube (
mode => '0755',
}
- archive { 'dovecot_impersonate-2.1.tar.gz':
- source => 'puppet://modules/profiles/roundcube/dovecot_impersonate-2.1.tar.gz',
+ $dovecot_impersonate_archive = 'dovecot_impersonate-2.1.tar.gz'
+
+ archive { $dovecot_impersonate_archive:
+ path => "/tmp/${dovecot_impersonate_archive}",
+ source => "puppet://modules/profiles/roundcube/${dovecot_impersonate_archive}",
extract => true,
extract_path => $roundcube_local_plugins,
creates => "${roundcube_local_plugins}/dovecot_impersonate-2.1",
require => File[$roundcube_local_plugins],
}
- archive { 'twofactor_gauthenticator-1.3.9-version.tar.gz':
- source => 'puppet://modules/profiles/roundcube/twofactor_gauthenticator-1.3.9-version.tar.gz',
+ $twofactor_gauthenticator_archive = 'twofactor_gauthenticator-1.3.9-version.tar.gz'
+
+ archive { $twofactor_gauthenticator_archive:
+ path => "/tmp/${twofactor_gauthenticator_archive}",
+ source => "puppet://modules/profiles/roundcube/${twofactor_gauthenticator_archive}",
extract => true,
extract_path => $roundcube_local_plugins,
creates => "${roundcube_local_plugins}/twofactor_gauthenticator-1.3.9-version",
@@ -157,7 +163,7 @@ class profiles::roundcube (
owner => 'root',
group => 'root',
target => "${roundcube_local_plugins}/dovecot_impersonate-2.1",
- require => Archive['dovecot_impersonate-2.1.tar.gz'],
+ require => Archive[$dovecot_impersonate_archive],
}
file { '/var/lib/roundcube/plugins/twofactor_gauthenticator':
@@ -165,6 +171,6 @@ class profiles::roundcube (
owner => 'root',
group => 'root',
target => "${roundcube_local_plugins}/twofactor_gauthenticator-1.3.9-version",
- require => Archive['twofactor_gauthenticator-1.3.9-version.tar.gz'],
+ require => Archive[$twofactor_gauthenticator_archive],
}
}