1 files changed, 52 insertions, 28 deletions
diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml
index 4559708..ce9ecbe 100644
--- a/roles/cgit/tasks/main.yml
+++ b/roles/cgit/tasks/main.yml
@@ -1,53 +1,77 @@
+---
+
 - name: install cgit packages
-  package:
+  ansible.builtin.package:
     name:
       - cgit
       - lowdown
     state: present
 
 - name: create cgit cache directory
-  file:
-    path: "{{ cgit_chroot_dir }}/cache/cgit"
-    owner: www
-    group: www
-    mode: 0750
+  ansible.builtin.file:
+    path: "{{ cgit_chroot_dir }}/{{ cgit_cache_dir }}"
+    owner: "{{ cgit_user }}"
+    group: "{{ cgit_group }}"
+    mode: "0750"
     state: directory
 
 - name: generate cgit configuration files
-  template:
-    src: "{{ item.template }}"
-    dest: "{{ item.file }}"
+  ansible.builtin.template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
     owner: 0
     group: 0
-    mode: 0644
+    mode: "0644"
   loop:
-    - template: cgitrc.j2
-      file: "{{ cgit_chroot_dir }}/conf/cgitrc"
-    - template: footer.html.j2
-      file: "{{ cgit_chroot_dir }}/conf/footer.html"
-    - template: httpd.conf.j2
-      file: /etc/httpd.d/cgit.conf
+    - src: cgitrc.j2
+      dest: "{{ cgit_chroot_dir }}/conf/cgitrc"
+    - src: footer.html.j2
+      dest: "{{ cgit_chroot_dir }}/conf/footer.html"
+    - src: httpd.conf.j2
+      dest: /etc/httpd.d/cgit.conf
+
+- name: retrieve dependencies for lowdown
+  ansible.builtin.shell: |
+    set -o pipefail
+    ldd $(command -v lowdown) | tr -s " " | grep "0 1 0" | cut -d " " -f 7
+  register: cgit_result_lowdown_dependencies
+  changed_when: false
+
+- name: create dependencies directories in chroot
+  ansible.builtin.file:
+    path: "{{ cgit_chroot_dir }}{{ item | dirname }}"
+    owner: 0
+    group: 0
+    mode: "0755"
+    state: directory
+  loop: "{{ cgit_result_lowdown_dependencies.stdout_lines }}"
 
-- name: include dependencies for lowdown
-  include_tasks: dependencies.yml
+- name: copy dependencies for lowdown
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "{{ cgit_chroot_dir }}/{{ item }}"
+    mode: preserve
+    remote_src: true
+  loop: "{{ cgit_result_lowdown_dependencies.stdout_lines }}"
+
+- name: copy utilities in httpd chroot
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "{{ cgit_chroot_dir }}/bin"
+    mode: preserve
+    remote_src: true
+  loop: "{{ cgit_chroot_required_files }}"
 
 - name: copy about-filter generator
-  copy:
+  ansible.builtin.copy:
     src: about-filter.sh
     dest: "{{ cgit_chroot_dir }}/bin/about-filter.sh"
     owner: 0
     group: 0
-    mode: 0755
+    mode: "0755"
 
 - name: start and enable slowcgi service
-  service:
+  ansible.builtin.service:
     name: slowcgi
     state: restarted
     enabled: true
-
-- name: httpd password information
-  debug:
-    msg: |
-      Please provide a password using htpasswd,
-      in "{{ cgit_chroot_dir }}/htpasswd/cgit"
-  when: cgit_authenticate