Merge pull request #5 from mbaran0v/some-small-improvements

some improvements
mbaran0v · Dec 30, 2019 · 2d4c263 · 2d4c263
2 parents f5f5803 + 64b8410
commit 2d4c263
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 16 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -5,8 +5,11 @@ alertmanager_bot_version: 0.4.0
 alertmanager_bot_download_url: "https://github.com/metalmatze/alertmanager-bot/releases/download/{{ alertmanager_bot_version }}/{{ alertmanager_bot_file_name }}"
 alertmanager_bot_file_name: "alertmanager-bot-{{ alertmanager_bot_version }}-linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
 
+alertmanager_bot_force_install: true
+
 alertmanager_bot_user: am-bot
 alertmanager_bot_group: "{{ alertmanager_bot_user }}"
+alertmanager_bot_shell: /usr/sbin/nologin
 
 alertmanager_bot_root_dir: /opt/alertmanager_bot
 alertmanager_bot_release_dir: "{{ alertmanager_bot_root_dir }}/current"

diff --git a/molecule/resources/tests/all/test_common.py b/molecule/resources/tests/all/test_common.py
@@ -51,6 +51,6 @@ def test_group(host):
 
 
 def test_default_template(host):
-    f = host.file(root_dir + '/releases/' + version + '/default.tmpl')
+    f = host.file(root_dir + '/shared/default.tmpl')
 
     assert f.exists
diff --git a/tasks/install.yml b/tasks/install.yml
@@ -10,7 +10,7 @@
   user:
     name: "{{ alertmanager_bot_user }}"
     system: true
-    shell: "/usr/sbin/nologin"
+    shell: "{{ alertmanager_bot_shell }}"
     group: "{{ alertmanager_bot_group }}"
     home: "{{ alertmanager_bot_root_dir }}"
     createhome: false
@@ -23,6 +23,11 @@
     group: "{{ alertmanager_bot_group }}"
     mode: 0750
 
+- name: check if installed
+  stat:
+    path: "{{ alertmanager_bot_root_dir }}/releases/{{ alertmanager_bot_version }}/alertmanager_bot"
+  register: alertmanager_bot_bin
+
 - name: initialize the deploy root and gather facts
   deploy_helper:
     path: "{{ alertmanager_bot_root_dir }}"
@@ -47,16 +52,7 @@
   until: _download_archive is succeeded
   retries: 5
   delay: 2
-
-- name: copy message template
-  copy:
-    src: "{{ alertmanager_bot_default_template_file }}"
-    dest: "{{ deploy_helper.new_release_path }}/default.tmpl"
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - restart alertmanager bot
+  when: not alertmanager_bot_bin.stat.exists or alertmanager_bot_force_install|bool
 
 - name: set permissions for executable file
   file:
@@ -73,7 +69,16 @@
     owner: "{{ alertmanager_bot_user }}"
     group: "{{ alertmanager_bot_group }}"
     mode: 0750
-    recurse: true
+
+- name: copy message template
+  copy:
+    src: "{{ alertmanager_bot_default_template_file }}"
+    dest: "{{ deploy_helper.shared_path }}/default.tmpl"
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - restart alertmanager bot
 
 - name: create systemd service unit
   template:

diff --git a/templates/alertmanager_bot.service.j2 b/templates/alertmanager_bot.service.j2
@@ -1,18 +1,24 @@
 [Unit]
 Description=Alertmanager Bot
 Documentation=https://github.com/metalmatze/alertmanager-bot
-After=network.target
+Wants=network-online.target
+After=network-online.target
+AssertFileIsExecutable={{ alertmanager_bot_release_dir }}/alertmanager_bot
 
 [Service]
 Type=simple
 User={{ alertmanager_bot_user }}
 Group={{ alertmanager_bot_group }}
 
+PrivateTmp=true
+ProtectHome=true
+PrivateDevices=true
+
 Environment=ALERTMANAGER_URL={{ alertmanager_bot_alertmanager_url }}
 Environment=LISTEN_ADDR={{ alertmanager_bot_listen_address }}
 Environment=TELEGRAM_TOKEN={{ alertmanager_bot_telegram_token }}
 Environment=STORE={{ alertmanager_bot_store }}
-Environment=TEMPLATE_PATHS={{ deploy_helper.current_path }}/default.tmpl
+Environment=TEMPLATE_PATHS={{ alertmanager_bot_shared_dir }}/default.tmpl
 {% if alertmanager_bot_store == "bolt" %}
 Environment=BOLT_PATH={{ alertmanager_bot_bolt_path }}
 {% endif %}
@@ -32,7 +38,7 @@ KillMode=process
 
 SyslogIdentifier=alertmanager_bot
 Restart=always
-RestartSec=60
+RestartSec=30
 
 [Install]
 WantedBy=multi-user.target