From 74682b5b60c451cf337763b9f68de33708507ebb Mon Sep 17 00:00:00 2001 From: Paul Walko Date: Sat, 16 Jan 2021 17:29:35 -0500 Subject: [PATCH] smartd fix, 8080/8443 -> 80/443 --- ansible/files/fogcutter/sshtunnel.service | 4 ++-- ansible/handlers.yml | 4 ++-- ansible/main.yml | 4 ++-- ansible/templates/local.conf.j2 | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ansible/files/fogcutter/sshtunnel.service b/ansible/files/fogcutter/sshtunnel.service index ca23e3e..53692ae 100644 --- a/ansible/files/fogcutter/sshtunnel.service +++ b/ansible/files/fogcutter/sshtunnel.service @@ -11,8 +11,8 @@ ExecStart=/usr/bin/ssh -Nn \ -o ServerAliveCountMax=3 \ -o ExitOnForwardFailure=yes \ -i /home/paul/.ssh/id_rsa_fast \ - -R 7000:127.0.0.1:8080 \ - -R 7001:127.0.0.1:8443 \ + -R 7000:127.0.0.1:80 \ + -R 7001:127.0.0.1:443 \ -R 7002:127.0.0.1:2222 \ -R 7003:127.0.0.1:25565 \ pew@polyvalent.seaturtle.pw diff --git a/ansible/handlers.yml b/ansible/handlers.yml index a041d27..96790d2 100644 --- a/ansible/handlers.yml +++ b/ansible/handlers.yml @@ -7,9 +7,9 @@ - name: Re-export exportfs command: exportfs -arv -- name: Restart and enable smartd +- name: Restart and enable smartmontools service: - name: smartd + name: smartmontools enabled: yes state: restarted diff --git a/ansible/main.yml b/ansible/main.yml index 054ecba..53d800e 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -129,7 +129,7 @@ owner: root group: root mode: '0644' - notify: Restart and enable smartd + notify: Restart and enable smartmontools - name: Install tor config copy: @@ -166,7 +166,7 @@ user: root when: gandi_api_key is defined -# Custom repo config +# Compute config - hosts: compute become: yes handlers: diff --git a/ansible/templates/local.conf.j2 b/ansible/templates/local.conf.j2 index 72b57c9..c47299e 100644 --- a/ansible/templates/local.conf.j2 +++ b/ansible/templates/local.conf.j2 @@ -1 +1,4 @@ net.ipv6.conf.{{ interface }}.use_tempaddr=2 +{% if hostname == 'fogcutter.seaturtle.pw' %} +net.ipv4.ip_unprivileged_port_start=0 +{% endif %}