aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-19 17:11:37 +0000
committerMichael Scherer <misc@mageia.org>2012-03-19 17:11:37 +0000
commit77423467c387b1ca0e0c5aa85a9bdd52e3372bb7 (patch)
treef67a0cb1c57819ec65b54020cca491227d6d5b48
parent265eda109afc3ce3dc4d4d97d108be7d5bfb7976 (diff)
downloadpuppet-77423467c387b1ca0e0c5aa85a9bdd52e3372bb7.tar
puppet-77423467c387b1ca0e0c5aa85a9bdd52e3372bb7.tar.gz
puppet-77423467c387b1ca0e0c5aa85a9bdd52e3372bb7.tar.bz2
puppet-77423467c387b1ca0e0c5aa85a9bdd52e3372bb7.tar.xz
puppet-77423467c387b1ca0e0c5aa85a9bdd52e3372bb7.zip
split gnupg::client in a separate file, and clean it
-rw-r--r--modules/gnupg/manifests/client.pp11
-rw-r--r--modules/gnupg/manifests/init.pp14
2 files changed, 11 insertions, 14 deletions
diff --git a/modules/gnupg/manifests/client.pp b/modules/gnupg/manifests/client.pp
new file mode 100644
index 00000000..1c8f6210
--- /dev/null
+++ b/modules/gnupg/manifests/client.pp
@@ -0,0 +1,11 @@
+class gnupg::client {
+ package {['gnupg',
+ 'rng-utils']:
+ }
+
+ local_script { 'create_gnupg_keys.sh':
+ content => template('gnupg/create_gnupg_keys.sh')
+ }
+}
+
+
diff --git a/modules/gnupg/manifests/init.pp b/modules/gnupg/manifests/init.pp
index 0c183c56..c2237264 100644
--- a/modules/gnupg/manifests/init.pp
+++ b/modules/gnupg/manifests/init.pp
@@ -1,18 +1,4 @@
class gnupg {
- class client {
- package { ["gnupg","rng-utils"]:
- ensure => present,
- }
-
- file { "/usr/local/bin/create_gnupg_keys.sh":
- ensure => present,
- owner => root,
- group => root,
- mode => 755,
- content => template('gnupg/create_gnupg_keys.sh')
- }
- }
-
# debian recommend SHA2, with 4096
# http://wiki.debian.org/Keysigning
# as they are heavy users of gpg, I will tend