Commit a5e206a5 authored by nimrod's avatar nimrod
Browse files

- Few cleanups, correct tests.

parent 5f2dedc5

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ __pycache__ 
.vagrant/

*.log

*.retry

tests/files/id_rsa

tests/files/id_rsa.pub

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule ".molecule/roles/openbsd-bootstrap"]

	path = .molecule/roles/openbsd-bootstrap

	url = https://www.shore.co.il/git/ansible-role-openbsd-bootstrap

openbsd-bootstrap @ 87b397b1

Original line number Diff line number Diff line 
Subproject commit 87b397b1f5abe8cc7a89cb922c4c8d7df8898204

tasks/main.yml

+7 −5
Original line number Diff line number Diff line 
---

# tasks file for ansible-role-gitreceive



- name: Assertions

  assert:

    that:

        - ansible_os_family in ['Debian', 'OpenBSD']

        - gitreceive_public_keys is iterable



- name: APT install prequisites

  when: ansible_pkg_mgr == 'apt'
@@ -46,13 +46,15 @@ 


- name: Install

  when: gitreceive_fetch.changed

  command: /usr/bin/make

  tags: ['skip_ansible_lint']

  command: make

  args:

      chdir: /root/gitreceive



- name: Init

  tags: ['skip_ansible_lint']

  when: gitreceive_fetch.changed

  command: /usr/local/bin/gitreceive init

  command: gitreceive init



- name: Add public keys

  with_items: '{{ gitreceive_public_keys }}'
@@ -64,8 +66,8 @@ 


- name: Copy reciever script

  when: gitreceive_receiver_script is defined

  template:

      src: gitreceive_receiver.j2

  copy:

      content: '{{ gitreceive_receiver_script }}'

      dest: /home/git/receiver

      owner: git

      group: git

templates/gitreceive_receiver.j2

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
{{ gitreceive_receiver_script }}