mirror of
https://github.com/dev-sec/ansible-nginx-hardening.git
synced 2024-11-22 23:51:57 +01:00
fix linting issues
Signed-off-by: Martin Schurz <Martin.Schurz@t-systems.com>
This commit is contained in:
parent
cb407267c0
commit
7484f233d5
3
.github/workflows/release.yml
vendored
3
.github/workflows/release.yml
vendored
@ -1,6 +1,7 @@
|
||||
---
|
||||
name: New release
|
||||
|
||||
on:
|
||||
on: # yamllint disable-line rule:truthy
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
@ -25,31 +25,31 @@ transport:
|
||||
max_ssh_sessions: 5
|
||||
|
||||
platforms:
|
||||
- name: ubuntu-16.04
|
||||
- name: ubuntu-16.04
|
||||
driver_config:
|
||||
box: bento/ubuntu-16.04
|
||||
- name: ubuntu-18.04
|
||||
- name: ubuntu-18.04
|
||||
driver_config:
|
||||
box: bento/ubuntu-18.04
|
||||
- name: centos-6
|
||||
- name: centos-6
|
||||
driver_config:
|
||||
box: bento/centos-6
|
||||
- name: centos-7
|
||||
- name: centos-7
|
||||
driver_config:
|
||||
box: bento/centos-7
|
||||
- name: oracle-6
|
||||
- name: oracle-6
|
||||
driver_config:
|
||||
box: bento/oracle-6
|
||||
- name: oracle-7
|
||||
- name: oracle-7
|
||||
driver_config:
|
||||
box: bento/oracle-7
|
||||
- name: debian-9
|
||||
- name: debian-9
|
||||
driver_config:
|
||||
box: bento/debian-9
|
||||
- name: debian-10
|
||||
- name: debian-10
|
||||
driver_config:
|
||||
box: bento/debian-10
|
||||
- name: amazon
|
||||
- name: amazon
|
||||
driver_config:
|
||||
box: bento/amazonlinux-2
|
||||
|
||||
@ -60,4 +60,4 @@ verifier:
|
||||
- https://github.com/dev-sec/nginx-baseline/
|
||||
|
||||
suites:
|
||||
- name: nginx
|
||||
- name: nginx
|
||||
|
23
.kitchen.yml
23
.kitchen.yml
@ -26,11 +26,11 @@ provisioner:
|
||||
galaxy_ignore_certs: true
|
||||
|
||||
platforms:
|
||||
- name: centos6-ansible-latest
|
||||
- name: centos6-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-centos6-ansible:latest
|
||||
platform: centos
|
||||
- name: centos7-ansible-latest
|
||||
- name: centos7-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-centos7-ansible:latest
|
||||
platform: centos
|
||||
@ -38,11 +38,11 @@ platforms:
|
||||
provision_command:
|
||||
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
|
||||
- systemctl enable sshd.service
|
||||
- name: oracle6-ansible-latest
|
||||
- name: oracle6-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-oracle6-ansible:latest
|
||||
platform: centos
|
||||
- name: oracle7-ansible-latest
|
||||
- name: oracle7-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-oracle7-ansible:latest
|
||||
run_command: /sbin/init
|
||||
@ -50,21 +50,21 @@ platforms:
|
||||
provision_command:
|
||||
- sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
|
||||
- systemctl enable sshd.service
|
||||
- name: ubuntu1604-ansible-latest
|
||||
- name: ubuntu1604-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-ubuntu1604-ansible:latest
|
||||
platform: ubuntu
|
||||
run_command: /sbin/init
|
||||
provision_command:
|
||||
- systemctl enable ssh.service
|
||||
- name: ubuntu1804-ansible-latest
|
||||
- name: ubuntu1804-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-ubuntu1804-ansible:latest
|
||||
platform: ubuntu
|
||||
run_command: /sbin/init
|
||||
provision_command:
|
||||
- systemctl enable ssh.service
|
||||
- name: debian9-ansible-latest
|
||||
- name: debian9-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-debian9-ansible:latest
|
||||
platform: debian
|
||||
@ -72,7 +72,7 @@ platforms:
|
||||
provision_command:
|
||||
- apt install -y systemd-sysv
|
||||
- systemctl enable ssh.service
|
||||
- name: debian10-ansible-latest
|
||||
- name: debian10-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-debian10-ansible:latest
|
||||
platform: debian
|
||||
@ -80,7 +80,7 @@ platforms:
|
||||
provision_command:
|
||||
- apt install -y systemd-sysv
|
||||
- systemctl enable ssh.service
|
||||
- name: amazon-ansible-latest
|
||||
- name: amazon-ansible-latest
|
||||
driver:
|
||||
image: rndmh3ro/docker-amazon-ansible:latest
|
||||
platform: centos
|
||||
@ -93,8 +93,7 @@ verifier:
|
||||
name: inspec
|
||||
sudo: true
|
||||
inspec_tests:
|
||||
- ../nginx-baseline
|
||||
#- https://github.com/dev-sec/nginx-baseline
|
||||
- https://github.com/dev-sec/nginx-baseline
|
||||
controls:
|
||||
- nginx-01
|
||||
- nginx-02
|
||||
@ -113,4 +112,4 @@ verifier:
|
||||
- nginx-17
|
||||
|
||||
suites:
|
||||
- name: nginx
|
||||
- name: nginx
|
||||
|
35
.travis.yml
35
.travis.yml
@ -42,17 +42,17 @@ env:
|
||||
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
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: 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
|
||||
version: latest
|
||||
@ -89,19 +89,6 @@ env:
|
||||
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
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:
|
||||
# Pull container
|
||||
- 'docker pull rndmh3ro/docker-${distro}-ansible:${version}'
|
||||
|
@ -1,3 +1,4 @@
|
||||
---
|
||||
- name: restart nginx
|
||||
service:
|
||||
name: "nginx"
|
||||
|
@ -1,2 +1,3 @@
|
||||
---
|
||||
- src: nginxinc.nginx
|
||||
- src: geerlingguy.nginx
|
||||
|
@ -5,7 +5,7 @@
|
||||
mode: "o-rw"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
recurse: yes
|
||||
recurse: true
|
||||
|
||||
- name: create additional configuration
|
||||
template:
|
||||
|
Loading…
Reference in New Issue
Block a user