summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2019-07-04 17:53:13 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2019-07-04 17:53:13 +0300
commitd9a5c08c7a350b6fa612a1a141d9e1cd91871b4d (patch)
tree52085f60e5f0825da965801ecfbe09be8fdf3ada
parentfd722cca3089a3fe6f7620f57d6e4b84be94e67b (diff)
downloadwmf-gitlab-d9a5c08c7a350b6fa612a1a141d9e1cd91871b4d.tar.gz
Add: haproxy, launch vcsworker from systemd
-rw-r--r--components.yml5
-rw-r--r--roles/vcsworker/tasks/main.yml11
2 files changed, 16 insertions, 0 deletions
diff --git a/components.yml b/components.yml
index 3159fdd..c316cbd 100644
--- a/components.yml
+++ b/components.yml
@@ -2,6 +2,7 @@
remote_user: root
become: no
roles:
+ - haproxy
- vcsworker
vars:
gitlab_token: "{{ lookup('pipe', 'pass wmf/wmf-gitlab.vm.liw.fi/gitlab_token') }}"
@@ -12,3 +13,7 @@
debian_codename: stretch
debian_mirror: deb.debian.org
+
+ haproxy_domain: wmf2-api.vm.liw.fi
+ letsencrypt_email: liw@liw.fi
+
diff --git a/roles/vcsworker/tasks/main.yml b/roles/vcsworker/tasks/main.yml
index 955ae55..a2ca67b 100644
--- a/roles/vcsworker/tasks/main.yml
+++ b/roles/vcsworker/tasks/main.yml
@@ -71,3 +71,14 @@
owner: _wmf
group: _wmf
mode: '0600'
+
+- name: "install vcsworker.service"
+ copy:
+ src: vcsworker.service
+ dest: /lib/systemd/system/vcsworker.service
+
+- name: "enable and (re)start vcsworker"
+ systemd:
+ name: vcsworker.service
+ enabled: yes
+ state: restarted