From 95b2ebb8960e0417ccd9ffbd597cb610e6271c9d Mon Sep 17 00:00:00 2001 From: Beka Valentine Date: Sun, 2 Aug 2020 23:50:47 -0700 Subject: [PATCH 1/5] Adds wegetit --- ansible/playbooks/30-wegetit.yml | 37 +++++++++++++++++++++++ ansible/playbooks/wegetit/wegetit.service | 17 +++++++++++ 2 files changed, 54 insertions(+) create mode 100644 ansible/playbooks/30-wegetit.yml create mode 100644 ansible/playbooks/wegetit/wegetit.service diff --git a/ansible/playbooks/30-wegetit.yml b/ansible/playbooks/30-wegetit.yml new file mode 100644 index 0000000..6533770 --- /dev/null +++ b/ansible/playbooks/30-wegetit.yml @@ -0,0 +1,37 @@ +--- + # Setup the static website +- hosts: tachikoma + become: yes + tasks: + - name: Add wegetit user + user: + name: wegetit + - name: Create wegetit application directory + file: + path: /opt/wegetit + state: directory + - name: Create wiki storage directory + file: + path: /var/wegetit + owner: wegetit + group: wegetit + state: directory + mode: 0700 + - name: Install wegetit service file + copy: + src: wegetit/wegetit.service + dest: /etc/systemd/system/wegetit.service + mode: 0644 + - name: Setup systemd wegetit service + systemd: + name: wegetit.service + state: started + enabled: yes + - name: Clone wegetit repo + git: + repo: 'https://github.com/queeriouslabs/wegetit' + dest: /opt/wegetit + - name: Install requirements + pip: + venv: /opt/wegetit/venv + requirements: /opt/wegetit/src/requirements.txt diff --git a/ansible/playbooks/wegetit/wegetit.service b/ansible/playbooks/wegetit/wegetit.service new file mode 100644 index 0000000..ef1a4d8 --- /dev/null +++ b/ansible/playbooks/wegetit/wegetit.service @@ -0,0 +1,17 @@ +[Unit] +Description=WeGetIt Service +After=network.target + +[Service] +Type=simple + +User=wegetit +Group=wegtit + +WorkingDirectory=/opt/wegetit + +ExecStart=/usr/bin/python3 /opt/wegetit/src/wegetit.py /var/wegetit/db.json +Restart=none + +[Install] +WantedBy=multi-user.target From 260495306c45679ea47c25a90bb79a2dfceffe0c Mon Sep 17 00:00:00 2001 From: Beka Valentine Date: Sun, 2 Aug 2020 23:54:49 -0700 Subject: [PATCH 2/5] Change docs in the playbook --- ansible/playbooks/30-wegetit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/30-wegetit.yml b/ansible/playbooks/30-wegetit.yml index 6533770..1bd29e1 100644 --- a/ansible/playbooks/30-wegetit.yml +++ b/ansible/playbooks/30-wegetit.yml @@ -1,5 +1,5 @@ --- - # Setup the static website + # Setup the website - hosts: tachikoma become: yes tasks: From 7004959e5367ef9a55f2b9b1cdf928722fd64c61 Mon Sep 17 00:00:00 2001 From: Beka Valentine Date: Mon, 3 Aug 2020 00:03:45 -0700 Subject: [PATCH 3/5] Moves installs before systemd stuff --- ansible/playbooks/30-wegetit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/playbooks/30-wegetit.yml b/ansible/playbooks/30-wegetit.yml index 1bd29e1..3f8061d 100644 --- a/ansible/playbooks/30-wegetit.yml +++ b/ansible/playbooks/30-wegetit.yml @@ -17,6 +17,10 @@ group: wegetit state: directory mode: 0700 + - name: Install requirements + pip: + venv: /opt/wegetit/venv + requirements: /opt/wegetit/src/requirements.txt - name: Install wegetit service file copy: src: wegetit/wegetit.service @@ -31,7 +35,3 @@ git: repo: 'https://github.com/queeriouslabs/wegetit' dest: /opt/wegetit - - name: Install requirements - pip: - venv: /opt/wegetit/venv - requirements: /opt/wegetit/src/requirements.txt From a30883884ba27275c3287cd486e93c759ea9ee15 Mon Sep 17 00:00:00 2001 From: Beka Valentine Date: Mon, 3 Aug 2020 00:12:17 -0700 Subject: [PATCH 4/5] Movve git clone before the pip install --- ansible/playbooks/30-wegetit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/playbooks/30-wegetit.yml b/ansible/playbooks/30-wegetit.yml index 3f8061d..5fd903f 100644 --- a/ansible/playbooks/30-wegetit.yml +++ b/ansible/playbooks/30-wegetit.yml @@ -17,6 +17,10 @@ group: wegetit state: directory mode: 0700 + - name: Clone wegetit repo + git: + repo: 'https://github.com/queeriouslabs/wegetit' + dest: /opt/wegetit - name: Install requirements pip: venv: /opt/wegetit/venv @@ -31,7 +35,3 @@ name: wegetit.service state: started enabled: yes - - name: Clone wegetit repo - git: - repo: 'https://github.com/queeriouslabs/wegetit' - dest: /opt/wegetit From d2b88568e6ce350b4b9613980139db809cf7ca8d Mon Sep 17 00:00:00 2001 From: Beka Valentine Date: Mon, 3 Aug 2020 21:10:27 -0700 Subject: [PATCH 5/5] Fix the playbook and service --- ansible/playbooks/30-wegetit.yml | 3 ++- ansible/playbooks/wegetit/wegetit.service | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/30-wegetit.yml b/ansible/playbooks/30-wegetit.yml index 5fd903f..d137265 100644 --- a/ansible/playbooks/30-wegetit.yml +++ b/ansible/playbooks/30-wegetit.yml @@ -10,7 +10,7 @@ file: path: /opt/wegetit state: directory - - name: Create wiki storage directory + - name: Create storage directory file: path: /var/wegetit owner: wegetit @@ -23,6 +23,7 @@ dest: /opt/wegetit - name: Install requirements pip: + virtualenv_python: python3 venv: /opt/wegetit/venv requirements: /opt/wegetit/src/requirements.txt - name: Install wegetit service file diff --git a/ansible/playbooks/wegetit/wegetit.service b/ansible/playbooks/wegetit/wegetit.service index ef1a4d8..beeaa73 100644 --- a/ansible/playbooks/wegetit/wegetit.service +++ b/ansible/playbooks/wegetit/wegetit.service @@ -8,9 +8,9 @@ Type=simple User=wegetit Group=wegtit -WorkingDirectory=/opt/wegetit +WorkingDirectory=/opt/wegetit/src -ExecStart=/usr/bin/python3 /opt/wegetit/src/wegetit.py /var/wegetit/db.json +ExecStart=/opt/wegetit/venv/bin/gunicorn 'wegetit:main("/var/wegetit/db.json")' Restart=none [Install]