From 9856bdc1b2a354a835619cef0da4e348f45960c5 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 18 Nov 2018 17:33:43 -0500 Subject: puppet lint --- .puppet-lint.rc | 4 ++++ modules/base/manifests/user.pp | 6 +++--- modules/base/manifests/users.pp | 4 ++-- modules/conf/manifests/user.pp | 4 ++-- modules/package/manifests/cargo.pp | 3 +++ modules/package/manifests/makepkg.pp | 3 +++ modules/partofme/manifests/backups.pp | 2 +- modules/samba/manifests/init.pp | 2 +- modules/secret/manifests/init.pp | 2 +- modules/smartmontools/manifests/init.pp | 2 +- modules/sshd/manifests/init.pp | 4 ++-- modules/syncthing/manifests/user.pp | 2 +- 12 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 .puppet-lint.rc diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 0000000..28bf37d --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1,4 @@ +--no-arrow_alignment-check +--no-documentation-check +--no-double_quoted_strings-check +--no-variables_not_enclosed-check diff --git a/modules/base/manifests/user.pp b/modules/base/manifests/user.pp index c532bc0..5c049d7 100644 --- a/modules/base/manifests/user.pp +++ b/modules/base/manifests/user.pp @@ -48,7 +48,7 @@ define base::user( } if $user != 'root' { - if $persistent_data != undef { + if $::persistent_data != undef { file { "$persistent_data/cargo/${user}": ensure => 'directory', @@ -76,7 +76,7 @@ define base::user( require => [ User[$user], Group[$group], - File["${home}"], + File[$home], ]; "${home}/.rustup": ensure => link, @@ -86,7 +86,7 @@ define base::user( require => [ User[$user], Group[$group], - File["${home}"], + File[$home], ]; } diff --git a/modules/base/manifests/users.pp b/modules/base/manifests/users.pp index 4592531..964c02e 100644 --- a/modules/base/manifests/users.pp +++ b/modules/base/manifests/users.pp @@ -3,11 +3,11 @@ class base::users { pwhash => secret::value('passwd/root'); } - base::user { $default_user: + base::user { $::default_user: pwhash => secret::value("passwd/$default_user"), extra_groups => ['wheel'], homedir_mode => '0701'; } - Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |> + Base::User[$::default_user] -> Package::Makepkg<| build_user == $::default_user |> } diff --git a/modules/conf/manifests/user.pp b/modules/conf/manifests/user.pp index 4ca2f02..cbcca5d 100644 --- a/modules/conf/manifests/user.pp +++ b/modules/conf/manifests/user.pp @@ -5,9 +5,9 @@ define conf::user($user=$name) { if $user != 'root' { package::cargo { "fancy-prompt for $user": - package => 'fancy-prompt', - user => $user, ensure => installed, + user => $user, + package => 'fancy-prompt', require => Package["cmake"], } } diff --git a/modules/package/manifests/cargo.pp b/modules/package/manifests/cargo.pp index f24e06c..7e7fd3d 100644 --- a/modules/package/manifests/cargo.pp +++ b/modules/package/manifests/cargo.pp @@ -25,5 +25,8 @@ define package::cargo($package, $user, $ensure) { ]; } } + default: { + fail("unimplemented ensure $ensure") + } } } diff --git a/modules/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp index c9d0318..3f4a8ba 100644 --- a/modules/package/manifests/makepkg.pp +++ b/modules/package/manifests/makepkg.pp @@ -37,5 +37,8 @@ define package::makepkg($ensure, $build_user, $asdeps=false) { path => "/usr/bin"; } } + default: { + fail("unimplemented ensure $ensure") + } } } diff --git a/modules/partofme/manifests/backups.pp b/modules/partofme/manifests/backups.pp index 4b665e7..080596c 100644 --- a/modules/partofme/manifests/backups.pp +++ b/modules/partofme/manifests/backups.pp @@ -1,7 +1,7 @@ class partofme::backups { include duplicati - syncthing::user { $default_user: + syncthing::user { $::default_user: } file { '/usr/local/bin/sftp-only': diff --git a/modules/samba/manifests/init.pp b/modules/samba/manifests/init.pp index cd131aa..49e015d 100644 --- a/modules/samba/manifests/init.pp +++ b/modules/samba/manifests/init.pp @@ -4,8 +4,8 @@ class samba { } service { ['smb', 'nmb']: - enable => true, ensure => running, + enable => true, require => Package['samba']; } } diff --git a/modules/secret/manifests/init.pp b/modules/secret/manifests/init.pp index 054a71d..b0cb77e 100644 --- a/modules/secret/manifests/init.pp +++ b/modules/secret/manifests/init.pp @@ -1,5 +1,5 @@ define secret($source, $path=$name, $owner=undef, $group=undef, $mode='0600') { - file { "$path": + file { $path: source => "puppet:///modules/secret/$source", owner => $owner, group => $group, diff --git a/modules/smartmontools/manifests/init.pp b/modules/smartmontools/manifests/init.pp index 76bc09b..b79c1a2 100644 --- a/modules/smartmontools/manifests/init.pp +++ b/modules/smartmontools/manifests/init.pp @@ -8,8 +8,8 @@ class smartmontools { } service { 'smartd': - enable => true, ensure => running, + enable => true, require => [ Package['smartmontools'], File['/etc/smartd.conf'], diff --git a/modules/sshd/manifests/init.pp b/modules/sshd/manifests/init.pp index 3b894ac..ac6bb48 100644 --- a/modules/sshd/manifests/init.pp +++ b/modules/sshd/manifests/init.pp @@ -4,8 +4,8 @@ class sshd { } service { 'sshd': - enable => true, - ensure => running; + ensure => running, + enable => true; } file { diff --git a/modules/syncthing/manifests/user.pp b/modules/syncthing/manifests/user.pp index 5987f6f..877513a 100644 --- a/modules/syncthing/manifests/user.pp +++ b/modules/syncthing/manifests/user.pp @@ -2,8 +2,8 @@ define syncthing::user { include syncthing service { "syncthing@$name": - enable => true, ensure => running, + enable => true, require => Class['syncthing']; } } -- cgit v1.2.3-54-g00ecf