From b09633d23c6744c78ac2bd772794f51564f2726c Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Tue, 14 Feb 2017 07:25:54 +0100
Subject: [PATCH] use devel dist-git upstream

---
 .../distgit/files/clime-dist-git-epel-7.repo  | 10 +++++++
 roles/distgit/tasks/main.yml                  | 26 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 roles/distgit/files/clime-dist-git-epel-7.repo

diff --git a/roles/distgit/files/clime-dist-git-epel-7.repo b/roles/distgit/files/clime-dist-git-epel-7.repo
new file mode 100644
index 0000000000..9f9545bb44
--- /dev/null
+++ b/roles/distgit/files/clime-dist-git-epel-7.repo
@@ -0,0 +1,10 @@
+[clime-dist-git]
+name=Copr repo for dist-git owned by clime
+baseurl=https://copr-be.cloud.fedoraproject.org/results/clime/dist-git/epel-7-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/clime/dist-git/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
\ No newline at end of file
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index d5b2a329cc..a81679e313 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -66,8 +66,21 @@
 
 # -- Dist Git --------------------------------------------
 # This is the Git setup itself: group, root directory, scripts,...
+- name: install the Dist Git-related httpd config
+  copy: src=clime-dist-git-epel-7.repo dest=/etc/yum.repos.d/clime-dist-git-epel-7.repo
+  when: env == "staging"
+  tags:
+  - distgit
+
+- name: install dist-git
+  yum: pkg=dist-git state=present
+  when: env == "staging"
+  tags:
+  - distgit
+
 - name: create the distgit root directory (/srv/git)
   file: dest=/srv/git state=directory mode=0755
+  when: env != "staging"
   tags:
   - distgit
 
@@ -83,7 +96,7 @@
 
 - name: set the SELinux policy for the distgit root directory
   command: semanage fcontext -a -t git_content_t "/srv/git(/.*)?"
-  when: distgitcontext.stdout.find('git_content_t') == -1
+  when: distgitcontext.stdout.find('git_content_t') == -1 and env != "staging"
   tags:
   - config
   - distgit
@@ -91,6 +104,7 @@
 
 - name: create the distgit root directory (/srv/git/repositories)
   file: dest=/srv/git/repositories state=directory mode=2775 group=packager
+  when: env != "staging"
   tags:
   - distgit
 
@@ -109,13 +123,21 @@
   tags:
   - distgit
 
+- name: install the distgit scripts
+  copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755
+  with_items:
+    - pkgdb2-clone
+  tags:
+  - config
+  - distgit
+
 - name: install the distgit scripts
   copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755
   with_items:
     - setup_git_package
     - mkbranch
     - mkbranch_branching
-    - pkgdb2-clone
+  when: env != "staging"
   tags:
   - config
   - distgit