From 4a16c10dd3b870ce62fdae9b590ff207e30a2bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= Date: Sun, 12 Dec 2021 14:51:24 +0000 Subject: roles/cgit: Move lowdown + dependencies to chroot --- host_vars/stack0-dc1.yml | 3 +++ roles/cgit/files/about-filter.sh | 2 +- roles/cgit/tasks/dependencies.yml | 31 +++++++++++++++++++++++++++++++ roles/cgit/tasks/main.yml | 12 ++---------- 4 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 roles/cgit/tasks/dependencies.yml diff --git a/host_vars/stack0-dc1.yml b/host_vars/stack0-dc1.yml index c681bc0..30ec3e4 100644 --- a/host_vars/stack0-dc1.yml +++ b/host_vars/stack0-dc1.yml @@ -1,3 +1,6 @@ +cgit_authenticate: true +cgit__root_desc: private - development hub + __is_vm: true __ip: diff --git a/roles/cgit/files/about-filter.sh b/roles/cgit/files/about-filter.sh index 6193824..2262dc9 100644 --- a/roles/cgit/files/about-filter.sh +++ b/roles/cgit/files/about-filter.sh @@ -1,3 +1,3 @@ #!/bin/sh -cat - +lowdown - diff --git a/roles/cgit/tasks/dependencies.yml b/roles/cgit/tasks/dependencies.yml new file mode 100644 index 0000000..41f0884 --- /dev/null +++ b/roles/cgit/tasks/dependencies.yml @@ -0,0 +1,31 @@ +- name: retrieve dependencies for lowdown + shell: ldd /usr/local/bin/lowdown | tr -s " " | grep "0 1 0" | cut -d " " -f 7 + register: result + +- name: create dependencies directories in chroot + file: + path: "{{ cgit_chroot_dir }}{{ item | dirname }}" + owner: 0 + group: 0 + mode: 0755 + state: directory + loop: "{{ result.stdout_lines }}" + +- name: copy dependencies for lowdown + copy: + src: "{{ item }}" + dest: "{{ cgit_chroot_dir }}/{{ item }}" + mode: preserve + remote_src: true + loop: "{{ result.stdout_lines }}" + +- name: copy utilities in httpd chroot + copy: + src: "{{ item }}" + dest: "{{ cgit_chroot_dir }}/bin" + mode: preserve + remote_src: true + loop: + - /bin/sh + - /bin/cat + - /usr/local/bin/lowdown diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml index 6040ecf..0f51d0c 100644 --- a/roles/cgit/tasks/main.yml +++ b/roles/cgit/tasks/main.yml @@ -20,16 +20,8 @@ - template: httpd.conf.j2 file: /etc/httpd.d/cgit.conf -- name: copy utilities in httpd chroot - copy: - src: "{{ item }}" - dest: "{{ cgit_chroot_dir }}/bin" - mode: preserve - remote_src: true - loop: - - /bin/sh - - /bin/cat - - /usr/local/bin/lowdown +- name: include dependencies for lowdown + include_tasks: dependencies.yml - name: copy about-filter generator copy: -- cgit v1.2.3