From 7f50fbd7e0a9e4cefb810b2f488dc46e877dd88b Mon Sep 17 00:00:00 2001
From: Petar Cubela <pec@softbox.de>
Date: Wed, 4 Dec 2024 11:11:17 +0100
Subject: [PATCH] made lamp role more generic

---
 roles/lamp/defaults/main.yml             |  4 +++
 roles/lamp/tasks/apache.yml              |  6 ++--
 roles/lamp/tasks/dependencies.yml        | 40 ++++++++++++------------
 roles/lamp/tasks/mysql.yml               | 10 +++---
 roles/lamp/tasks/php.yml                 | 15 +++++----
 roles/lamp/templates/example.com.conf.j2 |  0
 6 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 roles/lamp/defaults/main.yml
 create mode 100644 roles/lamp/templates/example.com.conf.j2

diff --git a/roles/lamp/defaults/main.yml b/roles/lamp/defaults/main.yml
new file mode 100644
index 0000000..53ae23e
--- /dev/null
+++ b/roles/lamp/defaults/main.yml
@@ -0,0 +1,4 @@
+site_conf: example.com.conf
+php_verison: "8.4"
+mysql_db_name: mysql
+mysql_db_user: mysql
diff --git a/roles/lamp/tasks/apache.yml b/roles/lamp/tasks/apache.yml
index f3e2b7d..be82530 100644
--- a/roles/lamp/tasks/apache.yml
+++ b/roles/lamp/tasks/apache.yml
@@ -15,8 +15,8 @@
 
 - name: Add Apache virtualhost for Owncloud
   template:
-    src: "templates/owncloud.dav.conf.j2"
-    dest: "/etc/apache2/sites-available/owncloud.dav.conf"
+    src: "templates/{{ site_conf }}.j2"
+    dest: "/etc/apache2/sites-available/{{ site_conf }}"
     owner: root
     group: root
     mode: 0644
@@ -25,7 +25,7 @@
 - name: Enable the ownCloud site.
   command: >
     a2ensite owncloud.dav
-    creates=/etc/apache2/sites-enabled/owncloud.dav.conf
+    creates="/etc/apache2/sites-enabled/{{ site_conf }}"
   notify: restart apache
 
 - name: Disable the default site.
diff --git a/roles/lamp/tasks/dependencies.yml b/roles/lamp/tasks/dependencies.yml
index 2cd1bf4..7bf90bd 100644
--- a/roles/lamp/tasks/dependencies.yml
+++ b/roles/lamp/tasks/dependencies.yml
@@ -26,26 +26,26 @@
       - mariadb-server
       - libpcre3-dev
       - apache2
-      - libapache2-mod-php7.4
-      - php7.4
-      - php7.4-imagick
-      - php7.4-common
-      - php7.4-curl
-      - php7.4-gd
-      - php7.4-imap
-      - php7.4-intl
-      - php7.4-json
-      - php7.4-mbstring
-      - php7.4-gmp
-      - php7.4-bcmath
-      - php7.4-mysql
-      - php7.4-ssh2
-      - php7.4-xml
-      - php7.4-zip
-      - php7.4-apcu
-      - php7.4-redis
-      - php7.4-ldap
-      - php7.4-smbclient
+      - "libapache2-mod-php{{ php_version }}"
+      - "php{{ php_version }}"
+      - "php{{ php_version }}-imagick"
+      - "php{{ php_version }}-common"
+      - "php{{ php_version }}-curl"
+      - "php{{ php_version }}-gd"
+      - "php{{ php_version }}-imap"
+      - "php{{ php_version }}-intl"
+      - "php{{ php_version }}-json"
+      - "php{{ php_version }}-mbstring"
+      - "php{{ php_version }}-gmp"
+      - "php{{ php_version }}-bcmath"
+      - "php{{ php_version }}-mysql"
+      - "php{{ php_version }}-ssh2"
+      - "php{{ php_version }}-xml"
+      - "php{{ php_version }}-zip"
+      - "php{{ php_version }}-apcu"
+      - "php{{ php_version }}-redis"
+      - "php{{ php_version }}-ldap"
+      - "php{{ php_version }}-smbclient"
       - php-phpseclib
       - bzip2
       - rsync
diff --git a/roles/lamp/tasks/mysql.yml b/roles/lamp/tasks/mysql.yml
index 3727d0c..db06d08 100644
--- a/roles/lamp/tasks/mysql.yml
+++ b/roles/lamp/tasks/mysql.yml
@@ -1,16 +1,16 @@
-- name: Create a MySQL database for ownCloud.
+- name: Create a MySQL database.
   community.mysql.mysql_db:
-    name: owncloud
+    name: "{{ mysql_db_name }}"
     state: present
     login_unix_socket: /run/mysqld/mysqld.sock
 
-- name: Create a MySQL db user for ownCloud.
+- name: Create a MySQL db user.
   community.mysql.mysql_user:
-    name: "owncloud"
+    name: "{{ mysql_db_user }}"
     password: "{{ mysql_passwd }}"
     login_user: "root"
     login_password: "{{ mysql_passwd }}"
-    priv: "owncloud.*:ALL"
+    priv: "{{ mysql_db_user }}.*:ALL"
     host: localhost
     state: present
     login_unix_socket: /run/mysqld/mysqld.sock
diff --git a/roles/lamp/tasks/php.yml b/roles/lamp/tasks/php.yml
index 7ce3511..c693adf 100644
--- a/roles/lamp/tasks/php.yml
+++ b/roles/lamp/tasks/php.yml
@@ -6,11 +6,10 @@
     line: "opcache.memory_consumption = 96"
     state: present
   notify: restart apache
-
-- name: Adjust smbclient setting.
-  template:
-    src: "templates/smbclient.ini.j2"
-    dest: "/etc/php/7.4/mods-available/smbclient.ini"
-    owner: root
-    group: root
-  notify: restart apache
+#- name: Adjust smbclient setting.
+#  template:
+#    src: "templates/smbclient.ini.j2"
+#    dest: "/etc/php/7.4/mods-available/smbclient.ini"
+#    owner: root
+#    group: root
+#  notify: restart apache
diff --git a/roles/lamp/templates/example.com.conf.j2 b/roles/lamp/templates/example.com.conf.j2
new file mode 100644
index 0000000..e69de29