From 15a6ad3fdc4844dd9a47a2e0a6f467c7b57a828a Mon Sep 17 00:00:00 2001 From: Dmitry Ilvokhin Date: Sat, 21 Mar 2026 22:49:22 +0000 Subject: Use override for git-daemon.service Instead of modifying pacman owned file in place. --- roles/gitserver/files/git-daemon.service | 14 -------------- roles/gitserver/files/override.conf | 4 ++++ roles/gitserver/tasks/main.yml | 12 ++++++++++-- 3 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 roles/gitserver/files/git-daemon.service create mode 100644 roles/gitserver/files/override.conf diff --git a/roles/gitserver/files/git-daemon.service b/roles/gitserver/files/git-daemon.service deleted file mode 100644 index e08d066..0000000 --- a/roles/gitserver/files/git-daemon.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Git Daemon Instance - -[Service] -User=git -# The '-' is to ignore non-zero exit statuses -ExecStart=-/usr/lib/git-core/git-daemon --inetd --base-path=/srv/git -StandardInput=socket -StandardOutput=inherit -StandardError=journal -ProtectSystem=full -ProtectHome=on -PrivateDevices=on -NoNewPrivileges=on diff --git a/roles/gitserver/files/override.conf b/roles/gitserver/files/override.conf new file mode 100644 index 0000000..78bcf58 --- /dev/null +++ b/roles/gitserver/files/override.conf @@ -0,0 +1,4 @@ +[Service] +ExecStart= +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --base-path=/srv/git diff --git a/roles/gitserver/tasks/main.yml b/roles/gitserver/tasks/main.yml index cdb7765..d612a10 100644 --- a/roles/gitserver/tasks/main.yml +++ b/roles/gitserver/tasks/main.yml @@ -73,10 +73,18 @@ group: git mode: u+rwx,g+r,o+r +- name: Setup directory for git-daemon systemd override + ansible.builtin.file: + path: /etc/systemd/system/git-daemon@.service.d + state: directory + owner: root + group: root + mode: u+rw,g+r,o+r + - name: Configure git-daemon systemd service ansible.builtin.copy: - src: files/git-daemon.service - dest: /usr/lib/systemd/system/git-daemon@.service + src: files/override.conf + dest: /etc/systemd/system/git-daemon@.service.d owner: root group: root mode: u+rw,g+r,o+r -- cgit v1.3