Skip to content

Commit 3b50d92

Browse files
authored
Merge pull request #217 from dev-sec/remove_eol_os
remove eol'd OS and add new
2 parents 2b037fc + 1455b6e commit 3b50d92

File tree

5 files changed

+48
-53
lines changed

5 files changed

+48
-53
lines changed

.kitchen.vagrant.yml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,30 @@ transport:
2424
max_ssh_sessions: 5
2525

2626
platforms:
27-
- name: ubuntu14.04
27+
- name: ubuntu-16.04
2828
driver_config:
29-
box: opscode-ubuntu-14.04
30-
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
31-
- name: ubuntu16.04
29+
box: bento/ubuntu-16.04
30+
- name: ubuntu-18.04
3231
driver_config:
33-
box: opscode-ubuntu-16.04
34-
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box
35-
- name: ubuntu18.04
32+
box: bento/ubuntu-18.04
33+
- name: centos-6
3634
driver_config:
37-
box: ubuntu/bionic64
38-
- name: centos6
35+
box: bento/centos-6.7
36+
- name: centos-7
3937
driver_config:
40-
box: bento/centos-6.9
41-
- name: centos7
38+
box: bento/centos-7
39+
- name: oracle-6
4240
driver_config:
43-
box: bento/centos-7.3
44-
- name: oracle6
41+
box: bento/oracle-6
42+
- name: oracle-7
4543
driver_config:
46-
box: oracle-6.5
47-
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
48-
- name: oracle7
44+
box: bento/oracle-7
45+
- name: debian-9
4946
driver_config:
50-
box: boxcutter/ol72
51-
- name: debian7
47+
box: bento/debian-9
48+
- name: amazon
5249
driver_config:
53-
box: bento/debian-7.11
54-
- name: debian8
55-
driver_config:
56-
box: bento/debian-8.8
57-
- name: debian9
58-
driver_config:
59-
box: bento/debian-9.0
50+
box: bento/amazonlinux-2
6051

6152
verifier:
6253
name: inspec

.kitchen.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ platforms:
4848
provision_command:
4949
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
5050
- systemctl enable sshd.service
51-
- name: ubuntu1404-ansible-latest
52-
driver:
53-
image: rndmh3ro/docker-ubuntu1404-ansible:latest
54-
platform: ubuntu
5551
- name: ubuntu1604-ansible-latest
5652
driver:
5753
image: rndmh3ro/docker-ubuntu1604-ansible:latest
@@ -66,14 +62,6 @@ platforms:
6662
run_command: /sbin/init
6763
provision_command:
6864
- systemctl enable ssh.service
69-
- name: debian7-ansible-latest
70-
driver:
71-
image: rndmh3ro/docker-debian7-ansible:latest
72-
platform: debian
73-
- name: debian8-ansible-latest
74-
driver:
75-
image: rndmh3ro/docker-debian8-ansible:latest
76-
platform: debian
7765
- name: debian9-ansible-latest
7866
driver:
7967
image: rndmh3ro/docker-debian9-ansible:latest

.travis.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ env:
2525
# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
2626
# version: latest
2727

28-
- distro: ubuntu1404
29-
version: latest
30-
init: /sbin/init
31-
3228
- distro: ubuntu1604
3329
version: latest
3430
init: /lib/systemd/systemd
@@ -39,15 +35,6 @@ env:
3935
init: /lib/systemd/systemd
4036
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
4137

42-
- distro: debian7
43-
version: latest
44-
init: /sbin/init
45-
46-
- distro: debian8
47-
version: latest
48-
init: /sbin/init
49-
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
50-
5138
- distro: debian9
5239
version: latest
5340
init: /lib/systemd/systemd

meta/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ galaxy_info:
1212
- 7
1313
- name: Ubuntu
1414
versions:
15-
- precise
16-
- trusty
1715
- xenial
1816
- bionic
1917
- name: Debian
2018
versions:
21-
- wheezy
2219
- jessie
2320
- name: Amazon
21+
- name: Fedora
2422
galaxy_tags:
2523
- system
2624
- security

vars/Fedora.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
3+
modprobe_package: 'module-init-tools'
4+
auditd_package: 'audit'
5+
6+
os_packages_pam_ccreds: 'pam_ccreds'
7+
os_packages_pam_passwdqc: 'pam_passwdqc'
8+
os_packages_pam_cracklib: 'pam_cracklib'
9+
os_nologin_shell_path: '/sbin/nologin'
10+
11+
# Different distros use different standards for /etc/shadow perms, e.g.
12+
# RHEL derivatives use root:root 0000, whereas Debian-based use root:shadow 0640.
13+
# You must provide key/value pairs for owner, group, and mode if overriding.
14+
os_shadow_perms:
15+
owner: root
16+
group: root
17+
mode: '0000'
18+
19+
os_passwd_perms:
20+
owner: root
21+
group: root
22+
mode: '0644'
23+
24+
os_env_umask: '027'
25+
26+
os_auth_uid_min: 1000
27+
os_auth_gid_min: 1000
28+
os_auth_sys_uid_min: 201
29+
os_auth_sys_uid_max: 999
30+
os_auth_sys_gid_min: 201
31+
os_auth_sys_gid_max: 999

0 commit comments

Comments
 (0)