diff --git a/handlers.yml b/handlers.yml index 963c358..0659fa2 100644 --- a/handlers.yml +++ b/handlers.yml @@ -101,3 +101,10 @@ ansible.builtin.systemd: name: sddm enabled: false + +- name: Restart nftables + become: true + ansible.builtin.systemd: + name: nftables + enabled: true + state: restarted diff --git a/host_vars/desktop/syncthing.yml b/host_vars/desktop/syncthing.yml index 0fad759..c0076d2 100644 --- a/host_vars/desktop/syncthing.yml +++ b/host_vars/desktop/syncthing.yml @@ -14,9 +14,9 @@ syncthing_devices: id: &syncthing_server_id ZM5JO5E-UYU6XUI-P25TLIP-TLPQD7J-NSPSYZS-A5OOYST-J62ICAQ-Y2A5YQV address: tcp://syncthing.{{ server_domain }}:22000 - - name: XPS15 - id: &syncthing_xps_id 2AC4LRC-YIJDWWK-YCOEZLT-4OWWC2E-7VEZQQB-F3AAPZR-HU75FE4-PGWWXQH - address: tcp://10.0.0.2:22000 + - name: P14 + id: &syncthing_p14_id MT7RJP3-R7I233L-ICWRPUY-4BCSXCK-WVBPWQ4-JMVBX4Y-J35GB6G-YDQFHQ3 + address: dynamic syncthing_folders: - id: default @@ -26,7 +26,7 @@ syncthing_folders: devices: - *syncthing_desktop_id - *syncthing_server_id - - *syncthing_xps_id + - *syncthing_p14_id - id: pictures label: Pictures @@ -35,4 +35,4 @@ syncthing_folders: devices: - *syncthing_desktop_id - *syncthing_server_id - - *syncthing_xps_id + - *syncthing_p14_id diff --git a/host_vars/p14/syncthing.yml b/host_vars/p14/syncthing.yml new file mode 100644 index 0000000..c6bc70c --- /dev/null +++ b/host_vars/p14/syncthing.yml @@ -0,0 +1,32 @@ +--- +syncthing_listen_address: "0.0.0.0" +syncthing_protocol_port: 22000 +syncthing_gui_port: 8384 + +syncthing_config_version: 51 + +syncthing_devices: + - name: Desktop + id: &syncthing_desktop_id CSDXP5E-4UBNC36-32EHTPK-L6Y6JVZ-HQHM42R-FJXN2LI-2MTYRFX-3ZZPUQN + address: dynamic + + - name: Fudiggity + id: &syncthing_server_id ZM5JO5E-UYU6XUI-P25TLIP-TLPQD7J-NSPSYZS-A5OOYST-J62ICAQ-Y2A5YQV + address: tcp://syncthing.{{ server_domain }}:22000 + +syncthing_folders: + - id: default + label: Default + path: "{{ ansible_env.HOME }}/syncthing/default" + type: sendreceive + devices: + - *syncthing_desktop_id + - *syncthing_server_id + + - id: pictures + label: Pictures + path: "{{ ansible_env.HOME }}/syncthing/pictures" + type: sendreceive + devices: + - *syncthing_desktop_id + - *syncthing_server_id diff --git a/p14.yml b/p14.yml index 9215fc8..5dcac70 100644 --- a/p14.yml +++ b/p14.yml @@ -20,6 +20,10 @@ ansible.builtin.import_tasks: "tasks/p14.yml" tags: p14 + - name: Syncthing provisioning + ansible.builtin.import_tasks: "tasks/syncthing.yml" + tags: syncthing + handlers: - name: Import default handlers ansible.builtin.import_tasks: handlers.yml diff --git a/templates/p14/nftables.j2 b/templates/p14/nftables.j2 index ce3be1e..2bf2a95 100644 --- a/templates/p14/nftables.j2 +++ b/templates/p14/nftables.j2 @@ -25,6 +25,9 @@ table inet filter { # allow ssh tcp dport ssh accept + + # syncthing + ip saddr 10.0.0.1 tcp dport 22000 accept } chain forward {