From 341d0268ec01597aa65c2d6110317db5043ef923 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 29 Jan 2021 21:01:46 +0100 Subject: [PATCH] Run prettier --- tasks/mpd.yml | 10 ++++++++-- tasks/mpv.yml | 10 ++++++++-- tasks/openvpn.yml | 20 ++++++++++++++++---- tasks/timer.yml | 5 ++++- vars/gpg.yml | 14 +++++++------- vars/main.yml | 4 ++-- vars/mpd.yml | 18 +++++++++--------- vars/vpn.yml | 10 +++++----- 8 files changed, 59 insertions(+), 32 deletions(-) diff --git a/tasks/mpd.yml b/tasks/mpd.yml index 3eca3e5..9a24f3e 100644 --- a/tasks/mpd.yml +++ b/tasks/mpd.yml @@ -12,8 +12,14 @@ src: '{{ item.src }}' dest: '{{ item.dest }}' loop: - - { src: 'templates/mpd/service.j2', dest: '{{ xdg_config_dir }}/systemd/user/mpd.service' } - - { src: 'templates/mpd/socket.j2', dest: '{{ xdg_config_dir }}/systemd/user/mpd.socket' } + - { + src: 'templates/mpd/service.j2', + dest: '{{ xdg_config_dir }}/systemd/user/mpd.service', + } + - { + src: 'templates/mpd/socket.j2', + dest: '{{ xdg_config_dir }}/systemd/user/mpd.socket', + } - name: create mpd files file: diff --git a/tasks/mpv.yml b/tasks/mpv.yml index f5215a4..c0e8a8a 100644 --- a/tasks/mpv.yml +++ b/tasks/mpv.yml @@ -10,5 +10,11 @@ dest: '{{ item.dest }}' mode: '0644' loop: - - { src: 'templates/mpv/input.j2', dest: '{{ ansible_env.HOME }}/.config/mpv/input.conf' } - - { src: 'templates/mpv/config.j2', dest: '{{ ansible_env.HOME }}/.config/mpv/mpv.conf' } + - { + src: 'templates/mpv/input.j2', + dest: '{{ ansible_env.HOME }}/.config/mpv/input.conf', + } + - { + src: 'templates/mpv/config.j2', + dest: '{{ ansible_env.HOME }}/.config/mpv/mpv.conf', + } diff --git a/tasks/openvpn.yml b/tasks/openvpn.yml index ec602bb..9fe4fbf 100644 --- a/tasks/openvpn.yml +++ b/tasks/openvpn.yml @@ -29,7 +29,10 @@ group: openvpn mode: '0600' loop: - - { src: 'files/{{ platform }}/openvpn/ca.crt', dest: '/etc/openvpn/client/zeus/ca.crt' } + - { + src: 'files/{{ platform }}/openvpn/ca.crt', + dest: '/etc/openvpn/client/zeus/ca.crt', + } - { src: 'files/{{ platform }}/openvpn/desktop.crt', dest: '/etc/openvpn/client/zeus/desktop.crt', @@ -38,7 +41,10 @@ src: 'files/{{ platform }}/openvpn/desktop.key', dest: '/etc/openvpn/client/zeus/desktop.key', } - - { src: 'files/{{ platform }}/openvpn/ta.key', dest: '/etc/openvpn/client/zeus/ta.key' } + - { + src: 'files/{{ platform }}/openvpn/ta.key', + dest: '/etc/openvpn/client/zeus/ta.key', + } when: platform == "desktop" - name: copy laptop credentials @@ -50,7 +56,10 @@ group: openvpn mode: '0600' loop: - - { src: 'files/{{ platform }}/openvpn/ca.crt', dest: '/etc/openvpn/client/zeus/ca.crt' } + - { + src: 'files/{{ platform }}/openvpn/ca.crt', + dest: '/etc/openvpn/client/zeus/ca.crt', + } - { src: 'files/{{ platform }}/openvpn/laptop.crt', dest: '/etc/openvpn/client/zeus/laptop.crt', @@ -59,7 +68,10 @@ src: 'files/{{ platform }}/openvpn/laptop.key', dest: '/etc/openvpn/client/zeus/laptop.key', } - - { src: 'files/{{ platform }}/openvpn/ta.key', dest: '/etc/openvpn/client/zeus/ta.key' } + - { + src: 'files/{{ platform }}/openvpn/ta.key', + dest: '/etc/openvpn/client/zeus/ta.key', + } when: platform == "laptop" - name: restart vpn diff --git a/tasks/timer.yml b/tasks/timer.yml index a0ed44a..14702b3 100644 --- a/tasks/timer.yml +++ b/tasks/timer.yml @@ -21,7 +21,10 @@ mode: '0644' loop: - { src: 'templates/timer/daily_target.j2', dest: '/etc/systemd/system/daily.target' } - - { src: 'templates/timer/weekly_target.j2', dest: '/etc/systemd/system/weekly.target' } + - { + src: 'templates/timer/weekly_target.j2', + dest: '/etc/systemd/system/weekly.target', + } - name: create target directories become: yes diff --git a/vars/gpg.yml b/vars/gpg.yml index 6fcb082..542a8a9 100644 --- a/vars/gpg.yml +++ b/vars/gpg.yml @@ -1,8 +1,8 @@ -gpg_pub_key: "82C21552D732C65C1A4FB340037103F03CA5CBA1" +gpg_pub_key: '82C21552D732C65C1A4FB340037103F03CA5CBA1' gpg_passphrase: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 61383265343062663836623033343538333562636433383735383862306465316439376333373563 - 6131336136653533323561633434633961393061623233640a366430396532326465326530356136 - 36616636363134386333616137656333353439633832633731373834336239393337316366626462 - 6164343331613663620a303363353064376630633939363831373339383961626137376361323438 - 3463 + $ANSIBLE_VAULT;1.1;AES256 + 61383265343062663836623033343538333562636433383735383862306465316439376333373563 + 6131336136653533323561633434633961393061623233640a366430396532326465326530356136 + 36616636363134386333616137656333353439633832633731373834336239393337316366626462 + 6164343331613663620a303363353064376630633939363831373339383961626137376361323438 + 3463 diff --git a/vars/main.yml b/vars/main.yml index c96d116..8d3044e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,5 +1,5 @@ -xdg_config_dir: "{{ ansible_env.HOME }}/.config" -xdg_script_dir: "{{ ansible_env.HOME }}/.local/bin" +xdg_config_dir: '{{ ansible_env.HOME }}/.config' +xdg_script_dir: '{{ ansible_env.HOME }}/.local/bin' packages: - firefox diff --git a/vars/mpd.yml b/vars/mpd.yml index 639171a..7247e78 100644 --- a/vars/mpd.yml +++ b/vars/mpd.yml @@ -1,11 +1,11 @@ -mpd_listen_address: "127.0.0.1" -mpd_listen_port: "6600" +mpd_listen_address: '127.0.0.1' +mpd_listen_port: '6600' -mpd_database_address: "10.8.0.1" -mpd_database_port: "21000" +mpd_database_address: '10.8.0.1' +mpd_database_port: '21000' -mpd_configuration_dir: "{{ ansible_env.HOME }}/.config/mpd" -mpd_music_dir: "{{ ansible_env.HOME }}/music" -mpd_playlist_dir: "{{ mpd_configuration_dir }}/playlists" -mpd_state_path: "{{ mpd_configuration_dir }}/state" -mpd_sticker_path: "{{ mpd_configuration_dir }}/sticker.sql" +mpd_configuration_dir: '{{ ansible_env.HOME }}/.config/mpd' +mpd_music_dir: '{{ ansible_env.HOME }}/music' +mpd_playlist_dir: '{{ mpd_configuration_dir }}/playlists' +mpd_state_path: '{{ mpd_configuration_dir }}/state' +mpd_sticker_path: '{{ mpd_configuration_dir }}/sticker.sql' diff --git a/vars/vpn.yml b/vars/vpn.yml index 2ff3851..1cca5e3 100644 --- a/vars/vpn.yml +++ b/vars/vpn.yml @@ -1,5 +1,5 @@ -vpn_ip: "178.85.119.159" -vpn_port: "7531" -vpn_interface: "tun0" -vpn_protocol: "udp" -vpn_verbosity: "1" +vpn_ip: '178.85.119.159' +vpn_port: '7531' +vpn_interface: 'tun0' +vpn_protocol: 'udp' +vpn_verbosity: '1'