From 53bc00c74976c4a44eff47c8532424ac3ca646bd Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 15 Dec 2016 22:34:54 +0100 Subject: [PATCH] style fixes --- manifests/init.pp | 8 ++++---- manifests/install.pp | 6 +++--- manifests/params.pp | 42 +++++++++++++++++++++--------------------- metadata.json | 7 +++---- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 02a6c23..1df745c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,3 +1,7 @@ +# == Class onetimesecret +# +# Install, configure and run One-Time Secret +# class onetimesecret ( # service options Boolean $manage_service = $::onetimesecret::params::manage_service, @@ -8,7 +12,6 @@ String $service_ensure = $::onetimesecret::params::service_ensure, String $service_name = $::onetimesecret::params::service_name, String $service_provider = $::onetimesecret::params::service_provider, - # installation options Boolean $manage_package = $::onetimesecret::params::manage_package, Boolean $manage_additional_packages = $::onetimesecret::params::manage_additional_packages, @@ -19,7 +22,6 @@ String $install_dir = $::onetimesecret::params::install_dir, String $symlink_name = $::onetimesecret::params::symlink_name, Boolean $manage_symlink = $::onetimesecret::params::manage_symlink, - # user options Boolean $manage_user = $::onetimesecret::params::manage_user, String $root_group = $::onetimesecret::params::root_group, @@ -27,10 +29,8 @@ String $group = $::onetimesecret::params::group, $uid = undef, String $user = $::onetimesecret::params::user, - String $bundle_exec = $::onetimesecret::params::bundle_exec, String $redis_exec = $::onetimesecret::params::redis_exec, - # OTS configuration String $host = $::fqdn, String $domain = $::domain, diff --git a/manifests/install.pp b/manifests/install.pp index 7f4a0c5..f90404e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -41,9 +41,9 @@ file { [ $::onetimesecret::config_dir, $::onetimesecret::data_dir, $::onetimesecret::log_dir, $::onetimesecret::pid_dir]: - ensure => directory, - owner => $onetimesecret::user, - group => $onetimesecret::group, + ensure => directory, + owner => $onetimesecret::user, + group => $onetimesecret::group, } # We won't be able to build the app without these packages. diff --git a/manifests/params.pp b/manifests/params.pp index 39a4642..32e76c3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,12 +13,12 @@ $manage_user = true $manage_symlink = true $options = {} - $package_name = "${module_name}" + $package_name = $module_name # service parameters $manage_service = true $manage_service_file = true - $service_name = "${module_name}" + $service_name = $module_name $service_enable = true $service_ensure = 'running' $service_provider = 'init' @@ -78,7 +78,7 @@ 'site' => { 'host' => 'localhost:7143', 'domain' => $::domain, - 'ssl' => 'false', + 'ssl' => false, 'secret' => 'CHANGEME', }, 'redis' => { @@ -89,10 +89,10 @@ 'mode' => ':smtp', 'from' => "ots@${::domain}", 'host' => 'localhost', - 'port' => '25', + 'port' => 25, }, 'incoming' => { - 'enabled' => 'false', + 'enabled' => false, 'email' => 'example@onetimesecret.com', 'passphrase' => 'CHANGEME', 'regex' => '\A[a-zA-Z0-9]{6}\z', @@ -100,7 +100,7 @@ 'locales' => [ 'en', 'es', 'de', 'nl', 'ru' ], 'unsupported_locales' => [ 'fr', 'pt', 'jp', 'pt' ], 'stathat' => { - 'enabled' => 'false', + 'enabled' => false, 'apikey' => 'CHANGEME', 'default_chart' => 'CHANGEME', }, @@ -109,18 +109,18 @@ 'paid_recipient_text' => '\'Send the secret link via email\'', }, 'limits' => { - 'create_secret' => '250', - 'create_account' => '10', - 'update_account' => '10', - 'email_recipient' => '50', - 'send_feedback' => '10', - 'authenticate_session' => '5', - 'homepage' => '500', - 'dashboard' => '1000', - 'failed_passphrase' => '5', - 'show_metadata' => '1000', - 'show_secret' => '1000', - 'burn_secret' => '1000', + 'create_secret' => 250, + 'create_account' => 10, + 'update_account' => 10, + 'email_recipient' => 50, + 'send_feedback' => 10, + 'authenticate_session' => 5, + 'homepage' => 500, + 'dashboard' => 1000, + 'failed_passphrase' => 5, + 'show_metadata' => 1000, + 'show_secret' => 1000, + 'burn_secret' => 1000, }, } $redis_default_options = { @@ -131,9 +131,9 @@ 'appendfilename' => 'default.aof', 'requirepass' => 'CHANGEME', 'bind' => '127.0.0.1', - 'port' => '7179', - 'databases' => '16', - 'timeout' => '30', + 'port' => 7179, + 'databases' => 16, + 'timeout' => 30, 'daemonize' => 'yes', 'loglevel' => 'notice', 'save' => '157680000 1', diff --git a/metadata.json b/metadata.json index b9bc790..2321821 100644 --- a/metadata.json +++ b/metadata.json @@ -36,7 +36,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "12.04", "14.04", "16.04" ] @@ -44,9 +43,9 @@ { "operatingsystem": "FreeBSD", "operatingsystemrelease": [ - "9", - "10" + "10", + "11" ] - }, + } ] }