From bfce4f273e851f5ac02cfec3ca0c9a04ca091886 Mon Sep 17 00:00:00 2001
From: root <root@srv8.soctools.grena.ge>
Date: Tue, 12 Apr 2022 14:58:07 +0400
Subject: [PATCH] integrate user-mgmt-ui as submodule and modify coresponding
configs
---
roles/soctools-server/tasks/main.yml | 8 ++++----
roles/soctools-server/templates/user-mgmt-ui.service.j2 | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/roles/soctools-server/tasks/main.yml b/roles/soctools-server/tasks/main.yml
index 53d0106..da0b59f 100644
--- a/roles/soctools-server/tasks/main.yml
+++ b/roles/soctools-server/tasks/main.yml
@@ -22,15 +22,15 @@
name: ["pexpect==3.3"]
- name: create venv for user-mgmt-ui
- shell: 'python3 -m venv user-mgmt-ui'
+ shell: 'python3 -m venv venv'
args:
- chdir: '{{playbook_dir}}'
+ chdir: '{{playbook_dir}}/user-mgmt-ui'
warn: no
- name: install venv packages for user-mgmt-ui
- shell: './user-mgmt-ui/bin/python3 -m pip install gunicorn flask flask-wtf email_validator'
+ shell: './venv/bin/python3 -m pip install -r requirements.txt'
args:
- chdir: '{{playbook_dir}}'
+ chdir: '{{playbook_dir}}/user-mgmt-ui'
warn: no
- name: create systemd service file for user-mgmt-ui
diff --git a/roles/soctools-server/templates/user-mgmt-ui.service.j2 b/roles/soctools-server/templates/user-mgmt-ui.service.j2
index 6e3ec45..dde0c4e 100644
--- a/roles/soctools-server/templates/user-mgmt-ui.service.j2
+++ b/roles/soctools-server/templates/user-mgmt-ui.service.j2
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
-ExecStart={{playbook_dir}}/user-mgmt-ui/bin/gunicorn --workers=2 --bind 0.0.0.0:8050 main:app
+ExecStart={{playbook_dir}}/user-mgmt-ui/venv/bin/gunicorn --workers=2 --bind 0.0.0.0:8050 main:app
User=root
KillMode=process
WorkingDirectory={{playbook_dir}}/user-mgmt-ui
--
GitLab