From dc19d02b1d30e659ff0a0c877d5351ea29cfb49a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 24 Aug 2017 20:44:39 +0000
Subject: Test out the new docs publishing in staging

---
 roles/fedora-docs/build/files/docs-sync        | 13 -------------
 roles/fedora-docs/build/tasks/main.yml         |  4 ++--
 roles/fedora-docs/build/templates/docs-sync.j2 | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)
 delete mode 100755 roles/fedora-docs/build/files/docs-sync
 create mode 100755 roles/fedora-docs/build/templates/docs-sync.j2

diff --git a/roles/fedora-docs/build/files/docs-sync b/roles/fedora-docs/build/files/docs-sync
deleted file mode 100755
index 5aa68ae39..000000000
--- a/roles/fedora-docs/build/files/docs-sync
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh                                                                                  
-
-if [ ! -d /srv/web/docs ]
-then
-	echo "/srv/web/docs missing"
-	cd /srv/web
-	git clone https://pagure.io/fedora-docs-web.git docs
-fi
-
-
-cd /srv/web/docs
-git reset -q --hard
-git pull -q
diff --git a/roles/fedora-docs/build/tasks/main.yml b/roles/fedora-docs/build/tasks/main.yml
index d7fd7de83..a1950b65f 100644
--- a/roles/fedora-docs/build/tasks/main.yml
+++ b/roles/fedora-docs/build/tasks/main.yml
@@ -1,7 +1,7 @@
 - file: dest=/srv/web/docs state=directory
 
-- copy: >
-    src=docs-sync dest=/usr/local/bin/docs-sync
+- template: >
+    src=docs-sync.j2 dest=/usr/local/bin/docs-sync
     owner=root group=root mode=0755
   tags:
   - fedora-docs
diff --git a/roles/fedora-docs/build/templates/docs-sync.j2 b/roles/fedora-docs/build/templates/docs-sync.j2
new file mode 100755
index 000000000..978510614
--- /dev/null
+++ b/roles/fedora-docs/build/templates/docs-sync.j2
@@ -0,0 +1,20 @@
+#!/bin/sh                                                                                  
+
+if [ ! -d /srv/web/docs ]
+then
+	echo "/srv/web/docs missing"
+	cd /srv/web
+{% if env == 'staging' %}
+	git clone https://pagure.io/fedora-docs/fedora-docs-web.git docs
+{% else %}
+	git clone https://pagure.io/fedora-docs-web.git docs
+{% endif %}
+fi
+
+
+cd /srv/web/docs
+/usr/bin/git reset -q --hard
+{% if env == 'staging' %}
+/usr/bin/git checkout -q stg
+{% endif %}
+/usr/bin/git pull -q --ff-only
-- 
cgit