1
0
mirror of https://github.com/dev-sec/ansible-nginx-hardening.git synced 2024-11-26 11:13:45 +01:00

remove eol'd OS and add new (#22)

* remove eol'd OS and add new

Signed-off-by: Sebastian Gumprich <github@gumpri.ch>

* remove amazon and fedora

Signed-off-by: Sebastian Gumprich <github@gumpri.ch>
This commit is contained in:
Sebastian Gumprich 2019-04-30 14:33:07 +02:00 committed by GitHub
parent 15f3313cca
commit f879dcbb88
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 67 deletions

@ -25,47 +25,30 @@ transport:
max_ssh_sessions: 5 max_ssh_sessions: 5
platforms: platforms:
- name: ubuntu-12.04
driver_config:
box: opscode-ubuntu-12.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
- name: ubuntu-14.04
driver_config:
box: opscode-ubuntu-14.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
- name: ubuntu-16.04 - name: ubuntu-16.04
driver_config: driver_config:
box: opscode-ubuntu-16.04 box: bento/ubuntu-16.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box - name: ubuntu-18.04
- name: centos-6.4
driver_config: driver_config:
box: opscode-centos-6.4 box: bento/ubuntu-18.04
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box - name: centos-6
- name: centos-6.5
driver_config: driver_config:
box: opscode-centos-6.5 box: bento/centos-6
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
- name: centos-6.8
driver_config:
box: bento/centos-6.8
- name: centos-7 - name: centos-7
driver_config: driver_config:
box: bento/centos-7.2 box: bento/centos-7
- name: oracle-6.4 - name: oracle-6
driver_config: driver_config:
box: oracle-6.4 box: bento/oracle-6
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
- name: oracle-6.5
driver_config:
box: oracle-6.5
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
- name: oracle-7 - name: oracle-7
driver_config: driver_config:
box: boxcutter/ol72 box: bento/oracle-7
- name: debian-8 - name: debian-9
driver_config: driver_config:
box: debian-8 box: bento/debian-9
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box - name: amazon
driver_config:
box: bento/amazonlinux-2
verifier: verifier:
name: inspec name: inspec

@ -50,10 +50,6 @@ platforms:
provision_command: provision_command:
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config - sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
- systemctl enable sshd.service - systemctl enable sshd.service
- name: ubuntu1404-ansible-latest
driver:
image: rndmh3ro/docker-ubuntu1404-ansible:latest
platform: ubuntu
- name: ubuntu1604-ansible-latest - name: ubuntu1604-ansible-latest
driver: driver:
image: rndmh3ro/docker-ubuntu1604-ansible:latest image: rndmh3ro/docker-ubuntu1604-ansible:latest
@ -68,10 +64,6 @@ platforms:
run_command: /sbin/init run_command: /sbin/init
provision_command: provision_command:
- systemctl enable ssh.service - systemctl enable ssh.service
- name: debian8-ansible-latest
driver:
image: rndmh3ro/docker-debian8-ansible:latest
platform: debian
- name: debian9-ansible-latest - name: debian9-ansible-latest
driver: driver:
image: rndmh3ro/docker-debian9-ansible:latest image: rndmh3ro/docker-debian9-ansible:latest

@ -18,11 +18,6 @@ env:
init: /sbin/init init: /sbin/init
test_playbook: test.yml test_playbook: test.yml
- distro: ubuntu1404
version: latest
init: /sbin/init
test_playbook: test.yml
- distro: ubuntu1604 - distro: ubuntu1604
version: latest version: latest
init: /lib/systemd/systemd init: /lib/systemd/systemd
@ -35,18 +30,24 @@ env:
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: test.yml test_playbook: test.yml
- distro: debian8
version: latest
init: /sbin/init
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: test.yml
- distro: debian9 - distro: debian9
version: latest version: latest
init: /lib/systemd/systemd init: /lib/systemd/systemd
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: test.yml test_playbook: test.yml
# - distro: amazon
# init: /lib/systemd/systemd
# version: latest
# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
# test_playbook: test.yml
#
# - distro: fedora
# init: /lib/systemd/systemd
# version: latest
# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
# test_playbook: test.yml
- distro: centos6 - distro: centos6
version: latest version: latest
init: /sbin/init init: /sbin/init
@ -64,11 +65,6 @@ env:
init: /sbin/init init: /sbin/init
test_playbook: official-nginx-role-redhat.yml test_playbook: official-nginx-role-redhat.yml
- distro: ubuntu1404
version: latest
init: /sbin/init
test_playbook: official-nginx-role-debian.yml
- distro: ubuntu1604 - distro: ubuntu1604
version: latest version: latest
init: /lib/systemd/systemd init: /lib/systemd/systemd
@ -81,18 +77,24 @@ env:
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: official-nginx-role-debian.yml test_playbook: official-nginx-role-debian.yml
- distro: debian8
version: latest
init: /sbin/init
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: official-nginx-role-debian.yml
- distro: debian9 - distro: debian9
version: latest version: latest
init: /lib/systemd/systemd init: /lib/systemd/systemd
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
test_playbook: official-nginx-role-debian.yml test_playbook: official-nginx-role-debian.yml
# - distro: amazon
# init: /lib/systemd/systemd
# version: latest
# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
# test_playbook: official-nginx-role-debian.yml
#
# - distro: fedora
# init: /lib/systemd/systemd
# version: latest
# run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
# test_playbook: official-nginx-role-debian.yml
before_install: before_install:
# Pull container # Pull container

@ -12,14 +12,10 @@ galaxy_info:
- 7 - 7
- name: Ubuntu - name: Ubuntu
versions: versions:
- precise
- trusty
- xenial - xenial
- bionic - bionic
- name: Debian - name: Debian
versions: versions:
- wheezy
- jessie
- stretch - stretch
galaxy_tags: galaxy_tags:
- system - system