From f38450f9f2037244300082f3e4211b790ac87058 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Mon, 26 Oct 2015 20:38:25 +0100 Subject: Assorted changes - add hooks between webserver and gitserver: git->website and wiki->git work now, git->wiki is still missing, https://ikiwiki.info/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines/ should contain the right info for that - actually configure repo_service - replace LDAP auth with dummy password auth for now --- roles/gitserver/tasks/as_gituser.yaml | 5 +++++ roles/gitserver/tasks/main.yaml | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'roles/gitserver/tasks') diff --git a/roles/gitserver/tasks/as_gituser.yaml b/roles/gitserver/tasks/as_gituser.yaml index 69157fd..9c4b67c 100644 --- a/roles/gitserver/tasks/as_gituser.yaml +++ b/roles/gitserver/tasks/as_gituser.yaml @@ -11,3 +11,8 @@ - name: Initialize gitolite and restore backup include: restore_gitolite.yaml when: not gitolite_dir.stat.exists + +- name: Put Post-update-hook for website + template: dest=/var/lib/gitolite/repositories/website.git/hooks/post-update + mode=0755 + src=website-post-update-hook.j2 diff --git a/roles/gitserver/tasks/main.yaml b/roles/gitserver/tasks/main.yaml index aca95f4..7143c64 100644 --- a/roles/gitserver/tasks/main.yaml +++ b/roles/gitserver/tasks/main.yaml @@ -13,6 +13,20 @@ name=git group=git home="/var/lib/gitolite" + generate_ssh_key=yes + +- name: Get Webserver Hostkey + slurp: src=/etc/ssh/ssh_host_ecdsa_key.pub + register: webserver_host_key + delegate_to: "{{groups['webservers'][0]}}" + +- name: Put Webserver Hostkey into knownhosts + lineinfile: dest=/var/lib/gitolite/.ssh/known_hosts + create=yes + owner=git + group=git + mode=0644 + line="{{groups['webservers'][0]}} {{webserver_host_key.content|b64decode}}" - name: Make git dir world readable file: @@ -32,6 +46,8 @@ - name: Ensure correct permissions on cgitrc.repo_service file: name=/etc/cgitrc.repo_service + owner=repo_service + group=repo_service mode=0644 - name: Configure git-daemon -- cgit v1.2.1