From 9ec12fc50354bb8f38d27de9ba8f1c8d3a65c869 Mon Sep 17 00:00:00 2001
From: muppeth <muppeth@disroot.org>
Date: Thu, 29 Feb 2024 01:15:43 +0100
Subject: [PATCH 1/2] small fix to the role after final testing

---
 defaults/main.yml |  1 +
 tasks/install.yml | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e2ca4ac..bcc8733 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,6 +17,7 @@ lacre_apt:
   - 'python3-pip'
   - 'python3-dev'
   - 'python3-full'
+  - 'python3-mysqldb'
   - 'libssl-dev'
   - 'swig'
   - 'virtualenv'
diff --git a/tasks/install.yml b/tasks/install.yml
index 0925f74..4e07481 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -28,26 +28,20 @@
     group: '{{ lacre_group }}'
     mode: '700'
       
-- name: '[Install] - Create a symbolic link to python binary'
-  file:
-    src: '/usr/bin/python{{ lacre_python_version }}'
-    dest: '/usr/bin/python'
-    state: 'link'
-
 - name: '[INSTALL] - Install lacre backend requirenments'
   pip:
     requirements: "{{ lacre_app_dir }}/requirements.txt"
     virtualenv: '{{ lacre_homedir }}/venv'
     virtualenv_site_packages: yes
 
-- name: '[Install] - Link GnuPG Lacre to global python modules'
+- name: '[Install] - Link GnuPG Lacre to virtualenv python modules'
   file:
     src: '{{ lacre_app_dir }}/GnuPG'
     dest: '{{ lacre_homedir }}/venv/lib/python{{ lacre_python_version }}/site-packages/GnuPG'
     state: link
 
 
-- name: '[Install] - Link Lacre module to global python modules'
+- name: '[Install] - Link Lacre module to virtualenv python modules'
   file:
     src: '{{ lacre_app_dir }}/lacre'
     dest: '{{ lacre_homedir }}/venv/lib/python{{ lacre_python_version }}/site-packages/lacre'
@@ -72,7 +66,7 @@
     month: "*"
     weekday: "*"
     user: "{{ lacre_username }}"
-    job: '{{ lacre_app_dir }}/webgate-cron.py > /dev/null'
+    job: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} {{ lacre_app_dir }}/webgate-cron.py > /dev/null'
   when: lacre_webgate_cron == 'true'
 
 - name: Check if the database exists
@@ -83,7 +77,7 @@
 
 - name: '[INSTALL] - Run dbschema'
   shell:
-    cmd: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} -m {{ lacre_app_dir }}/lacre/admin.py db -i'
+    cmd: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} {{ lacre_app_dir }}/lacre/admin.py db -i'
   become: 'yes'
   become_user: '{{ lacre_username }}'
   when: lacre_db_info.stdout != '3'

From 8d5eb7a01a3a4a563005f38efd039009b75e64a4 Mon Sep 17 00:00:00 2001
From: muppeth <muppeth@disroot.org>
Date: Thu, 29 Feb 2024 01:15:43 +0100
Subject: [PATCH 2/2] small fix to the role after final testing

---
 defaults/main.yml |  1 +
 tasks/install.yml | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e2ca4ac..bcc8733 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,6 +17,7 @@ lacre_apt:
   - 'python3-pip'
   - 'python3-dev'
   - 'python3-full'
+  - 'python3-mysqldb'
   - 'libssl-dev'
   - 'swig'
   - 'virtualenv'
diff --git a/tasks/install.yml b/tasks/install.yml
index 0925f74..4e07481 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -28,26 +28,20 @@
     group: '{{ lacre_group }}'
     mode: '700'
       
-- name: '[Install] - Create a symbolic link to python binary'
-  file:
-    src: '/usr/bin/python{{ lacre_python_version }}'
-    dest: '/usr/bin/python'
-    state: 'link'
-
 - name: '[INSTALL] - Install lacre backend requirenments'
   pip:
     requirements: "{{ lacre_app_dir }}/requirements.txt"
     virtualenv: '{{ lacre_homedir }}/venv'
     virtualenv_site_packages: yes
 
-- name: '[Install] - Link GnuPG Lacre to global python modules'
+- name: '[Install] - Link GnuPG Lacre to virtualenv python modules'
   file:
     src: '{{ lacre_app_dir }}/GnuPG'
     dest: '{{ lacre_homedir }}/venv/lib/python{{ lacre_python_version }}/site-packages/GnuPG'
     state: link
 
 
-- name: '[Install] - Link Lacre module to global python modules'
+- name: '[Install] - Link Lacre module to virtualenv python modules'
   file:
     src: '{{ lacre_app_dir }}/lacre'
     dest: '{{ lacre_homedir }}/venv/lib/python{{ lacre_python_version }}/site-packages/lacre'
@@ -72,7 +66,7 @@
     month: "*"
     weekday: "*"
     user: "{{ lacre_username }}"
-    job: '{{ lacre_app_dir }}/webgate-cron.py > /dev/null'
+    job: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} {{ lacre_app_dir }}/webgate-cron.py > /dev/null'
   when: lacre_webgate_cron == 'true'
 
 - name: Check if the database exists
@@ -83,7 +77,7 @@
 
 - name: '[INSTALL] - Run dbschema'
   shell:
-    cmd: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} -m {{ lacre_app_dir }}/lacre/admin.py db -i'
+    cmd: '{{ lacre_homedir }}/venv/bin/python{{ lacre_python_version }} {{ lacre_app_dir }}/lacre/admin.py db -i'
   become: 'yes'
   become_user: '{{ lacre_username }}'
   when: lacre_db_info.stdout != '3'