diff options
Diffstat (limited to 'roles/ssh-nginx-multiplex')
| -rw-r--r-- | roles/ssh-nginx-multiplex/handlers/main.yaml | 25 | ||||
| -rw-r--r-- | roles/ssh-nginx-multiplex/tasks/ssh_nginx_setup.yaml | 32 |
2 files changed, 27 insertions, 30 deletions
diff --git a/roles/ssh-nginx-multiplex/handlers/main.yaml b/roles/ssh-nginx-multiplex/handlers/main.yaml deleted file mode 100644 index 58c218b..0000000 --- a/roles/ssh-nginx-multiplex/handlers/main.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- name: enable ufw - ufw: - state: enabled - policy: deny - -- name: restart ufw - systemd: - name: ufw - state: restarted - enabled: true - when: ansible_facts['service_mgr'] == 'systemd' - -- name: restart nginx - systemd: - name: nginx - state: restarted - enabled: true - when: ansible_facts['service_mgr'] == 'systemd' - -- name: restart sslh - systemd: - name: sslh - state: restarted - enabled: true - when: ansible_facts['service_mgr'] == 'systemd' diff --git a/roles/ssh-nginx-multiplex/tasks/ssh_nginx_setup.yaml b/roles/ssh-nginx-multiplex/tasks/ssh_nginx_setup.yaml index beb0910..4f614f3 100644 --- a/roles/ssh-nginx-multiplex/tasks/ssh_nginx_setup.yaml +++ b/roles/ssh-nginx-multiplex/tasks/ssh_nginx_setup.yaml @@ -8,6 +8,7 @@ - ufw state: present update_cache: true + cache_valid_time: 86400 - name: deploy index.html template: @@ -41,7 +42,13 @@ owner: root group: root mode: '0644' - notify: restart nginx + + - name: restart nginx + systemd: + name: nginx + state: restarted + enabled: true + when: ansible_service_mgr == 'systemd' - name: deploy sslh config file template: @@ -50,16 +57,19 @@ owner: root group: root mode: '0644' - notify: restart sslh + + - name: restart sslh + systemd: + name: sslh + state: restarted + enabled: true + when: ansible_service_mgr == 'systemd' - name: allow ssh port and enable ufw ufw: rule: allow port: "{{ internal_sshd_port }}" proto: tcp - notify: - - enable ufw - - restart ufw - name: allow http port and enable ufw ufw: @@ -70,6 +80,18 @@ - enable ufw - restart ufw + - name: enable ufw + ufw: + state: enabled + policy: deny + + - name: restart ufw + systemd: + name: ufw + state: restarted + enabled: true + when: ansible_service_mgr == 'systemd' + when: - public_sslh_port is defined - internal_nginx_port is defined |