bastian/deploy_home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ansible_fixes Replaced 'with_items' with 'loop'

Browse Source
This commit is contained in:
Bastian de Byl
2020-10-02 22:31:52 -04:00
parent 354a862420
commit c89079b810
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/tasks/security.yml
View File

@@ -5,7 +5,7 @@
path: /etc/ssh/sshd_config path: /etc/ssh/sshd_config
regexp: "{{ item.re }}" regexp: "{{ item.re }}"
line: "{{ item.li }}" line: "{{ item.li }}"
with_items: loop:
- {re: '^[# ]*PasswordAuthentication ', li: 'PasswordAuthentication no'} - {re: '^[# ]*PasswordAuthentication ', li: 'PasswordAuthentication no'}
- {re: '^[# ]*PermitEmptyPasswords ', li: 'PermitEmptyPasswords no'} - {re: '^[# ]*PermitEmptyPasswords ', li: 'PermitEmptyPasswords no'}
- {re: '^[# ]*PermitRootLogin ', li: 'PermitRootLogin no'} - {re: '^[# ]*PermitRootLogin ', li: 'PermitRootLogin no'}
@@ -18,7 +18,7 @@
src: files/fail2ban/jails/{{ item }} src: files/fail2ban/jails/{{ item }}
dest: /etc/fail2ban/jail.d/{{ item }} dest: /etc/fail2ban/jail.d/{{ item }}
mode: 0644 mode: 0644
with_items: "{{ fail2ban_jails }}" loop: "{{ fail2ban_jails }}"
notify: restart_fail2ban notify: restart_fail2ban
tags: security tags: security

6
ansible/roles/http/tasks/http.yml
View File

@@ -14,7 +14,7 @@
path: "/etc/nginx/{{ item }}" path: "/etc/nginx/{{ item }}"
state: directory state: directory
mode: 0644 mode: 0644
with_items: loop:
- sites-enabled - sites-enabled
- sites-available - sites-available
tags: http tags: http
@@ -43,7 +43,7 @@
src: "templates/nginx/sites/{{ item }}.j2" src: "templates/nginx/sites/{{ item }}.j2"
dest: "/etc/nginx/sites-available/{{ item }}" dest: "/etc/nginx/sites-available/{{ item }}"
mode: 0644 mode: 0644
with_items: loop:
- "{{ ci_server_name }}.http.conf" - "{{ ci_server_name }}.http.conf"
notify: restart_nginx notify: restart_nginx
tags: http tags: http
@@ -54,7 +54,7 @@
src: "/etc/nginx/sites-available/{{ item }}" src: "/etc/nginx/sites-available/{{ item }}"
dest: "/etc/nginx/sites-enabled/{{ item }}" dest: "/etc/nginx/sites-enabled/{{ item }}"
state: link state: link
with_items: loop:
- "{{ ci_server_name }}.http.conf" - "{{ ci_server_name }}.http.conf"
notify: restart_nginx notify: restart_nginx
tags: http tags: http

4
ansible/roles/http/tasks/https.yml
View File

@@ -5,7 +5,7 @@
src: "templates/nginx/sites/{{ item }}.j2" src: "templates/nginx/sites/{{ item }}.j2"
dest: "/etc/nginx/sites-available/{{ item }}" dest: "/etc/nginx/sites-available/{{ item }}"
mode: 0644 mode: 0644
with_items: loop:
- "{{ ci_server_name }}.https.conf" - "{{ ci_server_name }}.https.conf"
notify: restart_nginx notify: restart_nginx
tags: https tags: https
@@ -16,7 +16,7 @@
src: "/etc/nginx/sites-available/{{ item }}" src: "/etc/nginx/sites-available/{{ item }}"
dest: "/etc/nginx/sites-enabled/{{ item }}" dest: "/etc/nginx/sites-enabled/{{ item }}"
state: link state: link
with_items: loop:
- "{{ ci_server_name }}.https.conf" - "{{ ci_server_name }}.https.conf"
notify: restart_nginx notify: restart_nginx
tags: https tags: https

10
ansible/roles/http/tasks/modsec.yml
View File

@@ -7,7 +7,7 @@
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644
with_items: loop:
- "{{ nginx_conf_path }}" - "{{ nginx_conf_path }}"
- "{{ modsec_rules_path }}" - "{{ modsec_rules_path }}"
tags: modsec tags: modsec
@@ -28,7 +28,7 @@
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
update: false update: false
version: "{{ item.ver }}" version: "{{ item.ver }}"
with_items: "{{ modsec_git_urls }}" loop: "{{ modsec_git_urls }}"
notify: restart_nginx notify: restart_nginx
tags: modsec tags: modsec
@@ -40,7 +40,7 @@
state: link state: link
force: true force: true
mode: 0644 mode: 0644
with_items: "{{ modsec_conf_links }}" loop: "{{ modsec_conf_links }}"
notify: restart_nginx notify: restart_nginx
tags: modsec tags: modsec
@@ -52,7 +52,7 @@
state: "{{ item.enabled | ternary('link', 'absent') }}" state: "{{ item.enabled | ternary('link', 'absent') }}"
force: true force: true
mode: 0644 mode: 0644
with_items: "{{ crs_rule_links }}" loop: "{{ crs_rule_links }}"
notify: restart_nginx notify: restart_nginx
tags: modsec, modsec_rules tags: modsec, modsec_rules
@@ -64,7 +64,7 @@
state: link state: link
force: true force: true
mode: 0644 mode: 0644
with_items: "{{ crs_data_links }}" loop: "{{ crs_data_links }}"
notify: restart_nginx notify: restart_nginx
tags: modsec, modsec_rules tags: modsec, modsec_rules