Und noch den Paketnamen korrigiert im openldap-task

[fsit_smgt.git] / tasks / kivitendo.yml

diff --git a/tasks/kivitendo.yml b/tasks/kivitendo.yml
index 836cf9bcb423e8317e0e2eb186b18be70a10e5a0..5c432265426b21e6681dd7949bcb9a5028502efb 100644 (file)
--- a/tasks/kivitendo.yml
+++ b/tasks/kivitendo.yml
@@ -81,33 +81,33 @@
     - texlive-luatex
     - texlive-plain-generic
 
     - texlive-luatex
     - texlive-plain-generic
 

-- name: Clone repo.
+- name: Clone repo

   ansible.builtin.git:
     dest:    /var/www/kivitendo-erp
     repo:    "{{ fsit_smgt_kivi_customer_repo }}"
     version: "{{ fsit_smgt_kivi_customer_version }}"
 
   ansible.builtin.git:
     dest:    /var/www/kivitendo-erp
     repo:    "{{ fsit_smgt_kivi_customer_repo }}"
     version: "{{ fsit_smgt_kivi_customer_version }}"
 

-- name: Copy over Kivitendo.conf.
-  ansible.builtin.copy:
-    src: files/kivitendo/kivitendo.conf
+- name: Copy over Kivitendo.conf
+  ansible.builtin.template:
+    src: kivi_kivitendo.conf.j2

     dest: /var/www/kivitendo-erp/config/kivitendo.conf
     owner: www-data
     mode: 'u=rw,g=rw,o='
   notify: Restart apache
 
     dest: /var/www/kivitendo-erp/config/kivitendo.conf
     owner: www-data
     mode: 'u=rw,g=rw,o='
   notify: Restart apache
 

-- name: Make webdav directory.
+- name: Make webdav directory

   ansible.builtin.file:
     path: /var/www/kivitendo-erp/webdav
     state: directory
     mode:  'u=Xrw,g=Xrw,o='
 
   ansible.builtin.file:
     path: /var/www/kivitendo-erp/webdav
     state: directory
     mode:  'u=Xrw,g=Xrw,o='
 

-- name: Make kivi_documents directory.
+- name: Make kivi_documents directory

   ansible.builtin.file:
     path: /var/www/kivitendo-erp/kivi_documents
     state: directory
     mode:  'u=Xrw,g=Xrw,o='
 
   ansible.builtin.file:
     path: /var/www/kivitendo-erp/kivi_documents
     state: directory
     mode:  'u=Xrw,g=Xrw,o='
 

-- name: Change permissions.
+- name: Change permissions

   ansible.builtin.file:
     owner:   www-data
     path:    "/var/www/kivitendo-erp/{{ item }}"
   ansible.builtin.file:
     owner:   www-data
     path:    "/var/www/kivitendo-erp/{{ item }}"


@@ -130,7 +130,7 @@
     databases: all
     method:    peer
 
     databases: all
     method:    peer
 

-- name: Allow access from localhost to Postgresql.
+- name: Allow access from localhost to Postgresql

   ansible.builtin.postgresql_pg_hba:
     dest:      /etc/postgresql/17/main/pg_hba.conf
     contype:   host
   ansible.builtin.postgresql_pg_hba:
     dest:      /etc/postgresql/17/main/pg_hba.conf
     contype:   host


@@ -141,7 +141,7 @@
   notify: Restart postgresql
 
 # apache server for kivi
   notify: Restart postgresql
 
 # apache server for kivi

-- name: Activate apache fastcgi, headers and ssl modules.
+- name: Activate apache fastcgi, headers and ssl modules

   community.general.apache2_module:
     state: present
     name: "{{ item }}"
   community.general.apache2_module:
     state: present
     name: "{{ item }}"


@@ -168,6 +168,7 @@
   ansible.builtin.command: a2ensite default-ssl
   notify: Restart apache
 
   ansible.builtin.command: a2ensite default-ssl
   notify: Restart apache
 

+# FIXME 

 - name: Install kivitendo-task-server
   ansible.builtin.copy:
     src: files/kivitendo/kivitendo-task-server.service
 - name: Install kivitendo-task-server
   ansible.builtin.copy:
     src: files/kivitendo/kivitendo-task-server.service


@@ -176,11 +177,12 @@
     mode: 'u=rw,g=rw,o='
   notify: systemd_daemon_reload
 
     mode: 'u=rw,g=rw,o='
   notify: systemd_daemon_reload
 

-- name: Start kivitendo-task-server
-  ansible.builtin.systemd:
-    name: kivitendo-task-server
-    state: started
-    enabled: true
+# FIXME funktioniert so noch nicht
+#- name: Start kivitendo-task-server
+#  ansible.builtin.systemd:
+#    name: kivitendo-task-server
+#    state: started
+#    enabled: true

 
 # Anleitung adaptiert
 # https://github.com/kivitendo/kivitendo-ansible/blob/master/main.yml
 
 # Anleitung adaptiert
 # https://github.com/kivitendo/kivitendo-ansible/blob/master/main.yml