Skip to content

Commit

Permalink
ubuntu 18
Browse files Browse the repository at this point in the history
  • Loading branch information
jordiprats committed Apr 17, 2019
1 parent 6b7d00d commit 1090e88
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.1.2

* Added Ubunut 18.04 support

## 0.1.1

* added **shadow::filemodes** to manage group- and passwd- file mode
Expand Down
2 changes: 0 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
$package_ensure = 'installed',
) inherits shadow::params{

validate_re($package_ensure, [ '^present$', '^installed$', '^absent$', '^purged$', '^held$', '^latest$' ], 'Not a supported package_ensure: present/absent/purged/held/latest')

class { '::shadow::install': }
-> class { '::shadow::config': }
-> Class['::shadow']
Expand Down
3 changes: 0 additions & 3 deletions manifests/logindefs.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
{
/^[6-7].*$/:
{
$package_name='shadow-utils'
$maildir_default = '/var/spool/mail'
}
default: { fail("Unsupported RHEL/CentOS version! - ${::operatingsystemrelease}") }
}
Expand All @@ -44,7 +42,6 @@
{
/^1[468].*$/:
{
fail('not implemented')
}
default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}") }
}
Expand Down
12 changes: 5 additions & 7 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,19 @@
{
'redhat':
{
$package_name='shadow-utils'
$maildir_default = '/var/spool/mail'
case $::operatingsystemrelease
{
/^[5-6].*$/:
{
$package_name='shadow-utils'
$maildir_default = '/var/spool/mail'
$sys_uid_min_default = undef
$sys_uid_max_default = undef
$sys_gid_min_default = undef
$sys_gid_max_default = undef
}
/^7.*$/:
{
$package_name='shadow-utils'
$maildir_default = '/var/spool/mail'
$sys_uid_min_default = '201'
$sys_uid_max_default = '999'
$sys_gid_min_default = '201'
Expand All @@ -52,10 +50,10 @@
{
case $::operatingsystemrelease
{
/^1[4-7].*$/:
/^1[468].*$/:
{
$package_name='passwd'
$maildir_default = '/var/spool/mail'
$package_name=[ 'passwd', 'login' ]
$maildir_default = '/var/mail'
#TODO sys_gid_min_default ...
}
default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}") }
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eyp-shadow",
"version": "0.1.1",
"version": "0.1.2",
"author": "eyp",
"summary": "manages useradd and login.defs defaults",
"license": "Apache-2.0",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "14.04", "16.04" ]
"operatingsystemrelease": [ "14.04", "16.04", "18.04" ]
},
{
"operatingsystem": "SLES",
Expand Down

0 comments on commit 1090e88

Please sign in to comment.