This repository has been archived by the owner on Nov 17, 2020. It is now read-only.
use new docker files #26
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,3 @@ | ||
| .kitchen | ||
| hosts | ||
| Gemfile.lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| --- | ||
| driver: | ||
| name: vagrant | ||
|
|
||
| provisioner: | ||
| name: ansible_playbook | ||
| hosts: all | ||
| require_ansible_repo: false | ||
| require_ansible_omnibus: true | ||
| require_chef_for_busser: false | ||
| require_ruby_for_busser: false | ||
| ansible_verbose: true | ||
| roles_path: ../ansible-mysql-hardening/ | ||
| playbook: default.yml | ||
| requirements_path: requirements.yml | ||
| sudo_command: 'sudo -E -H' | ||
|
|
||
| transport: | ||
| max_ssh_sessions: 5 | ||
|
|
||
| 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: | ||
|
There was a problem hiding this comment.
|
||
| 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 | ||
| driver_config: | ||
| box: opscode-ubuntu-16.04 | ||
| box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box | ||
| - name: centos-6.4 | ||
| driver_config: | ||
| box: opscode-centos-6.4 | ||
| box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box | ||
| - name: centos-6.5 | ||
| driver_config: | ||
| box: opscode-centos-6.5 | ||
| 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 | ||
| driver_config: | ||
| box: bento/centos-7.2 | ||
| - name: oracle-6.4 | ||
| driver_config: | ||
| box: oracle-6.4 | ||
| 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 | ||
| driver_config: | ||
| box: boxcutter/ol72 | ||
| - name: debian-7 | ||
| driver_config: | ||
| box: debian-7 | ||
| box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box | ||
| - name: debian-8 | ||
| driver_config: | ||
| box: debian-8 | ||
| box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box | ||
|
|
||
| verifier: | ||
| name: inspec | ||
| sudo: true | ||
| inspec_tests: | ||
| - https://github.com/dev-sec/mysql-baseline/ | ||
|
|
||
| suites: | ||
| - name: mysql | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,77 @@ | ||
| --- | ||
| driver: | ||
| name: docker | ||
|
There was a problem hiding this comment. Ẁhat's the difference and advantages? There was a problem hiding this comment. I took a look at https://github.com/someara/kitchen-dokken. There was a problem hiding this comment. Take a look at https://github.com/dev-sec/chef-mysql-hardening/blob/master/.kitchen.yml Your config looks like it works fine the way it is, so just a thought if you have time or for the future :) |
||
| privileged: true | ||
| use_sudo: false | ||
|
|
||
| transport: | ||
| max_ssh_sessions: 5 | ||
|
|
||
| provisioner: | ||
| name: ansible_playbook | ||
| hosts: all | ||
| require_ansible_repo: false | ||
| require_ansible_omnibus: true | ||
| require_chef_for_busser: false | ||
| require_ruby_for_busser: false | ||
| ansible_verbose: true | ||
| ansible_diff: true | ||
| hosts: all | ||
| roles_path: ../ansible-mysql-hardening/ | ||
| playbook: default.yml | ||
| requirements_path: requirements.yml | ||
| sudo_command: 'sudo -E -H' | ||
|
|
||
| platforms: | ||
| - name: centos6-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-centos6-ansible:latest | ||
|
There was a problem hiding this comment. docker stuff should be in There was a problem hiding this comment. Docker is the default testing method in this role. What else should be there then? There was a problem hiding this comment. hmm ok, looks like the other repos are non-standard as well so ignore this commend then :) There was a problem hiding this comment. Actually I'll change this to the bento boxes. I just discovered that bento has all of them. |
||
| platform: centos | ||
| - name: centos7-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-centos7-ansible:latest | ||
| platform: centos | ||
| - name: oracle6-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-oracle6-ansible:latest | ||
| platform: centos | ||
| - name: oracle7-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-oracle7-ansible:latest | ||
| platform: centos | ||
| - name: ubuntu1404-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-ubuntu1404-ansible:latest | ||
| platform: ubuntu | ||
| - name: ubuntu1604-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-ubuntu1604-ansible:latest | ||
| platform: ubuntu | ||
| - name: debian7-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-debian7-ansible:latest | ||
| platform: debian | ||
| intermediate_instructions: | ||
| - RUN /usr/bin/apt-get update | ||
| - RUN /usr/bin/apt-get install -y procps | ||
| - name: debian8-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-debian8-ansible:latest | ||
| platform: debian | ||
| intermediate_instructions: | ||
| - RUN /usr/bin/apt-get update | ||
| - RUN /usr/bin/apt-get install -y procps | ||
| pid_one_command: /bin/systemd | ||
| - name: debian9-ansible-latest | ||
| driver: | ||
| image: rndmh3ro/docker-debian9-ansible:latest | ||
| platform: debian | ||
|
|
||
| verifier: | ||
| name: inspec | ||
| sudo: true | ||
| inspec_tests: | ||
| - https://github.com/dev-sec/mysql-baseline | ||
|
|
||
| suites: | ||
| - name: mysql | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,75 @@ | ||
| --- | ||
| services: docker | ||
|
|
||
| env: | ||
| - distro: centos6 | ||
| version: latest | ||
| run_opts: "--privileged" | ||
| init: /sbin/init | ||
|
|
||
| - distro: centos7 | ||
| init: /usr/lib/systemd/systemd | ||
| run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" | ||
| version: latest | ||
|
|
||
| - distro: oracle6 | ||
| version: latest | ||
| run_opts: "--privileged" | ||
| init: /sbin/init | ||
|
|
||
| - distro: oracle7 | ||
| init: /usr/lib/systemd/systemd | ||
| run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" | ||
| version: latest | ||
|
|
||
| # see https://github.com/dev-sec/mysql-baseline/issues/35 | ||
| # - distro: ubuntu1604 | ||
| # version: latest | ||
| # init: /lib/systemd/systemd | ||
| # run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" | ||
|
|
||
| # - distro: ubuntu1404 | ||
| # version: latest | ||
| # run_opts: "--privileged" | ||
| # init: /sbin/init | ||
|
|
||
| - distro: debian7 | ||
| version: latest | ||
| run_opts: "--privileged" | ||
| init: /sbin/init | ||
|
|
||
| # - distro: debian8 | ||
| # version: latest | ||
| # init: /bin/systemd | ||
| # run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" | ||
|
|
||
| # - distro: debian9 | ||
| # version: latest | ||
| # init: /lib/systemd/systemd | ||
| # run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" | ||
|
|
||
| before_install: | ||
| # Pull container | ||
| - 'docker pull rndmh3ro/docker-${distro}-ansible:${version}' | ||
|
|
||
| script: | ||
| - container_id=$(mktemp) | ||
| # Run container in detached state. | ||
| - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/ansible-mysql-hardening:ro ${run_opts} rndmh3ro/docker-${distro}-ansible:${version} "${init}" > "${container_id}"' | ||
|
|
||
| # Install ansible galaxy requirements | ||
| - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/ansible-mysql-hardening/requirements.yml -p /etc/ansible/roles/' | ||
|
|
||
| # Test role. | ||
| - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/ansible-mysql-hardening/default.yml' | ||
|
|
||
| # Verify role | ||
| - 'inspec exec https://github.com/rndmh3ro/mysql-baseline/ -t docker://$(cat ${container_id})' | ||
|
|
||
| after_failure: | ||
| # Check MySQL settings. | ||
| - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log' | ||
| - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err' | ||
| - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.log' | ||
| notifications: | ||
| webhooks: https://galaxy.ansible.com/api/v1/notifications/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EOL'd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed.