From 9da000c6511e85e030e431b7d951d325c2c98681 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 2 Oct 2013 10:28:01 +0200 Subject: Improve the overall experience of the module. - Extending the README - Add a trocla::yaml class for a simple quickstart. - Fixes issues: #4 & #5 --- manifests/yaml.pp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 manifests/yaml.pp (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp new file mode 100644 index 0000000..4650a5a --- /dev/null +++ b/manifests/yaml.pp @@ -0,0 +1,22 @@ +class trocla::yaml( + $password_length = 16 + $random_passwords = true, + $data_file = "{$settings::server_datadir}/trocla_data.yaml", +) { + + class{'trocla::config': + password_length => $password_length, + random_passwords => $random_passwords, + adapter => 'YAML', + adapter_options => { + file => $data_file, + }, + } + + file{$data_file: + ensure => file, + owner => puppet, + group => 0, + mode => 0600; + } +} -- cgit v1.2.3 From db287f27fc099659ecb8f84a20259519321d6993 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 2 Oct 2013 10:32:20 +0200 Subject: typo --- manifests/yaml.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp index 4650a5a..8b05135 100644 --- a/manifests/yaml.pp +++ b/manifests/yaml.pp @@ -1,5 +1,5 @@ class trocla::yaml( - $password_length = 16 + $password_length = 16, $random_passwords = true, $data_file = "{$settings::server_datadir}/trocla_data.yaml", ) { -- cgit v1.2.3 From 2446ca831ff1a8609333d820a920a37e842ac852 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 2 Oct 2013 11:05:34 +0200 Subject: linting --- manifests/yaml.pp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp index 8b05135..dc20c2e 100644 --- a/manifests/yaml.pp +++ b/manifests/yaml.pp @@ -1,7 +1,17 @@ +# A class for an eady start with trocla. +# This will install and configure trocla with the +# default yaml storage. +# +# [*password_length*] The default length of new passwords: 16 +# [*random_passwords*] Whether trocla should generate random +# passwords or not. Default: true +# [*data_file*] Where to store the passwords. +# Default: {$settings::server_datadir}/trocla_data.yaml" +# This will likely be: /var/lib/puppet/server_data/trocla_data.yaml class trocla::yaml( $password_length = 16, $random_passwords = true, - $data_file = "{$settings::server_datadir}/trocla_data.yaml", + $data_file = "${settings::server_datadir}/trocla_data.yaml", ) { class{'trocla::config': @@ -17,6 +27,6 @@ class trocla::yaml( ensure => file, owner => puppet, group => 0, - mode => 0600; + mode => '0600'; } } -- cgit v1.2.3 From 8ca75f6d074b83ee48d9ce713cdb3e28e57d2cf8 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Jan 2016 00:55:26 +0100 Subject: update module to make it work with all the new features of trocla 0.2.2 --- manifests/yaml.pp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp index dc20c2e..8ac0071 100644 --- a/manifests/yaml.pp +++ b/manifests/yaml.pp @@ -2,24 +2,20 @@ # This will install and configure trocla with the # default yaml storage. # -# [*password_length*] The default length of new passwords: 16 -# [*random_passwords*] Whether trocla should generate random -# passwords or not. Default: true # [*data_file*] Where to store the passwords. -# Default: {$settings::server_datadir}/trocla_data.yaml" -# This will likely be: /var/lib/puppet/server_data/trocla_data.yaml +# Default: /var/lib/trocla/trocla_data.yaml +# This should be managed using the package. class trocla::yaml( - $password_length = 16, - $random_passwords = true, - $data_file = "${settings::server_datadir}/trocla_data.yaml", + $data_file = '/var/lib/trocla/trocla_data.yaml', ) { class{'trocla::config': - password_length => $password_length, - random_passwords => $random_passwords, - adapter => 'YAML', - adapter_options => { - file => $data_file, + store => 'moneta', + store_options => { + adapter => 'YAML', + adapter_options => { + file => $data_file, + }, }, } -- cgit v1.2.3 From b478a4eb162d5a3a117c44ef9b49f20462facf50 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 29 Jan 2016 19:14:12 +0100 Subject: also manage directory as puppet user needs write perms as well --- manifests/yaml.pp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp index 8ac0071..aca164b 100644 --- a/manifests/yaml.pp +++ b/manifests/yaml.pp @@ -6,7 +6,8 @@ # Default: /var/lib/trocla/trocla_data.yaml # This should be managed using the package. class trocla::yaml( - $data_file = '/var/lib/trocla/trocla_data.yaml', + $manage_data_dir = true, + $data_file = '/var/lib/trocla/trocla_data.yaml', ) { class{'trocla::config': @@ -19,10 +20,20 @@ class trocla::yaml( }, } - file{$data_file: - ensure => file, - owner => puppet, - group => 0, - mode => '0600'; + if $manage_data_dir { + $data_dir = dirname($data_file) + file{$data_dir: + ensure => directory, + owner => puppet, + group => 0, + mode => '0600'; + } + } + file{ + $data_file: + ensure => file, + owner => puppet, + group => 0, + mode => '0600'; } } -- cgit v1.2.3 From 9af8b4274e47b9c89be3368fa6981fd6ab464cb9 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 29 Jan 2016 19:33:23 +0100 Subject: make sure we manage things after the package --- manifests/yaml.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'manifests/yaml.pp') diff --git a/manifests/yaml.pp b/manifests/yaml.pp index aca164b..7727219 100644 --- a/manifests/yaml.pp +++ b/manifests/yaml.pp @@ -26,7 +26,8 @@ class trocla::yaml( ensure => directory, owner => puppet, group => 0, - mode => '0600'; + mode => '0600', + require => Package['trocla']; } } file{ @@ -34,6 +35,7 @@ class trocla::yaml( ensure => file, owner => puppet, group => 0, - mode => '0600'; + mode => '0600', + require => Package['trocla']; } } -- cgit v1.2.3