From 3918c637512b20a30b3f79719b6364dc9952de4e Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 16 Jan 2021 19:38:28 +0100 Subject: [PATCH] Add missing files & finish TODO's --- roles/transip_client/defaults/main.yml | 14 ++++++++++++-- roles/transip_client/handlers/main.yml | 7 +++++++ roles/transip_client/tasks/main.yml | 13 +++++++++---- roles/transip_client/templates/env.j2 | 3 +++ roles/transip_client/templates/service.j2 | 14 ++++++++++++++ roles/transip_client/templates/timer.j2 | 13 +++++++++++++ 6 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 roles/transip_client/handlers/main.yml create mode 100644 roles/transip_client/templates/env.j2 create mode 100644 roles/transip_client/templates/service.j2 create mode 100644 roles/transip_client/templates/timer.j2 diff --git a/roles/transip_client/defaults/main.yml b/roles/transip_client/defaults/main.yml index a5a36d9..fdcca4e 100644 --- a/roles/transip_client/defaults/main.yml +++ b/roles/transip_client/defaults/main.yml @@ -1,6 +1,8 @@ app_url: "https://git.fudiggity.nl/sonny/transip_client.git" app_branch: "0.2" app_dir: "{{ ansible_env.HOME }}/apps/transip_client" +app_domains: + - fudiggity.nl app_token: !vault | $ANSIBLE_VAULT;1.1;AES256 @@ -41,10 +43,18 @@ app_token: !vault | 35663964633839353136643666653738343431353461623033643033666234343233333131316534 33353665303363373734303165363438373431336365636530633163303730393830393464633466 6239 -app_domains: - - fudiggity.nl systemd_dir: "{{ ansible_user_id }}/.config/systemd/user" +sentry_dsn: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 61373236373662333134383264616666666433363766666166633730306332613138386339626561 + 3765636535666163363066313238353832336334623361630a306539646639383233323236646462 + 62306161396438386639383262343962366366376137336634663564343132656364393461336432 + 3766396162386463610a643836306232373262306532663337303331373338393833376364666633 + 30373037643266623165353439373661333734303466616462353464396233613165643034393664 + 35393536636238653338393163373966356636653362343039366230636364363233376336383331 + 636663383661346534613533653133376534 + packages: [] skip_common_setup: true diff --git a/roles/transip_client/handlers/main.yml b/roles/transip_client/handlers/main.yml new file mode 100644 index 0000000..4afcd7f --- /dev/null +++ b/roles/transip_client/handlers/main.yml @@ -0,0 +1,7 @@ +- name: enable transip-client timer + systemd: + daemon-reload: yes + name: transip-client.timer + state: restarted + enabled: true + scope: user diff --git a/roles/transip_client/tasks/main.yml b/roles/transip_client/tasks/main.yml index 23d408c..dcad9f3 100644 --- a/roles/transip_client/tasks/main.yml +++ b/roles/transip_client/tasks/main.yml @@ -57,18 +57,23 @@ environment: PATH: "/home/{{ app_user }}/.local/bin:{{ poetry_user_path }}" -# TODO add service/timer +- name: copy environment file + template: + src: "env.j2" + dest: "{{ app_dir }}/.env" + mode: 0600 + - name: copy systemd templates template: loop: - { src: "timer.j2", - dest: "{{ systemd_dir }}/transip_client.timer", + dest: "{{ systemd_dir }}/transip-client.timer", mode: "0644", } - { src: "service.j2", - dest: "{{ systemd_dir }}/transip_client.service", + dest: "{{ systemd_dir }}/transip-client.service", mode: "0644", } - notify: enable transip_client timer + notify: enable transip-client timer diff --git a/roles/transip_client/templates/env.j2 b/roles/transip_client/templates/env.j2 new file mode 100644 index 0000000..2076f03 --- /dev/null +++ b/roles/transip_client/templates/env.j2 @@ -0,0 +1,3 @@ +DOMAINS="{{ app_domains | join(':') }}" +TOKEN="{{ app_token }}" +SENTRY_DSN="{{ sentry_dsn }}" diff --git a/roles/transip_client/templates/service.j2 b/roles/transip_client/templates/service.j2 new file mode 100644 index 0000000..d696ce7 --- /dev/null +++ b/roles/transip_client/templates/service.j2 @@ -0,0 +1,14 @@ +# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }} +# + +[Unit] +Description=Transip-client service + +[Service] +EnvironmentFile={{ app_dir }}/.env +WorkingDirectory={{ app_dir }} +ExecStart=poetry run listen +Type=oneshot + +[Install] +WantedBy=default.target diff --git a/roles/transip_client/templates/timer.j2 b/roles/transip_client/templates/timer.j2 new file mode 100644 index 0000000..9f07fb2 --- /dev/null +++ b/roles/transip_client/templates/timer.j2 @@ -0,0 +1,13 @@ +# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }} +# + +[Unit] +Description=Trans IP client timer + +[Timer] +OnCalendar=+5min +Unit=transip-client.service +Persistent=true + +[Install] +WantedBy=timers.target