From ffc1ca54fb04400e903a683af90d3f8873f14646 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 13 Oct 2015 18:32:02 +0000
Subject: [PATCH] add cgitrc for infoinote, fix commit script

---
 roles/cgit/base/files/cgitrc.infinote     | 70 +++++++++++++++++++++++
 roles/cgit/base/tasks/main.yml            |  4 ++
 roles/infinote/files/infinoted-git-commit |  1 -
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 roles/cgit/base/files/cgitrc.infinote

diff --git a/roles/cgit/base/files/cgitrc.infinote b/roles/cgit/base/files/cgitrc.infinote
new file mode 100644
index 0000000000..e19fe7b320
--- /dev/null
+++ b/roles/cgit/base/files/cgitrc.infinote
@@ -0,0 +1,70 @@
+#
+# See cgitrc(5) or /usr/share/doc/cgit-*/cgitrc.5.html for details
+#
+
+# Enable caching of up to 1000 output entries
+cache-size=1000
+
+# Specify some default clone prefixes
+clone-prefix=https://infinote.fedoraproject.org/
+
+# Specify the css url
+css=/cgit-data/cgit.css
+
+# Show extra links for each repository on the index page
+enable-index-links=1
+
+# Enable ASCII art commit history graph on the log pages
+enable-commit-graph=1
+
+# Show number of affected files per commit on the log pages
+enable-log-filecount=1
+
+# Show number of added/removed lines per commit on the log pages
+enable-log-linecount=1
+
+# Add a cgit favicon
+#favicon=/favicon.ico
+
+# Use a custom logo
+logo=/cgit-data/cgit.png
+
+# Enable statistics per week, month and quarter
+max-stats=quarter
+
+# Set the title and heading of the repository index page
+root-title=Fedora Project infinote document changes
+
+# Set a subheading for the repository index page
+#root-desc=tracking the foobar development
+
+# Include some more info about this site on the index page
+#root-readme=/var/www/html/about.html
+
+# Allow download of tar.gz, tar.bz2 and zip-files
+snapshots=tar.gz tar.xz zip
+
+##
+## List of common mimetypes
+##
+
+mimetype.gif=image/gif
+mimetype.html=text/html
+mimetype.jpg=image/jpeg
+mimetype.jpeg=image/jpeg
+mimetype.pdf=application/pdf
+mimetype.png=image/png
+mimetype.svg=image/svg+xml
+
+# Enable syntax highlighting (requires the highlight package)
+#source-filter=/usr/libexec/cgit/filters/syntax-highlighting.sh
+#email-filter=lua:/usr/libexec/cgit/filters/email-libravatar-korg.lua
+
+
+##
+## List of repositories.
+## PS: Any repositories listed when section is unset will not be
+##     displayed under a section heading
+## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
+##      and included like this:
+scan-path=/srv/web/infinote/
diff --git a/roles/cgit/base/tasks/main.yml b/roles/cgit/base/tasks/main.yml
index b5dfa72dfa..200b0d62ab 100644
--- a/roles/cgit/base/tasks/main.yml
+++ b/roles/cgit/base/tasks/main.yml
@@ -37,5 +37,9 @@
   copy: src=cgitrc.batcave dest=/etc/cgitrc owner=root mode=0644
   when: inventory_hostname.startswith('batcave')
 
+- name: put cgitrc in place for infinote
+  copy: src=cgitrc.infinote dest=/etc/cgitrc owner=root mode=0644
+  when: inventory_hostname.startswith('infinote')
+
 #- name: install the libravatar filter
 #  copy: src=email-libravatar-korg.lua dest=/usr/libexec/cgit/filters/email-libravatar-korg.lua owner=root group=root mode=0755
diff --git a/roles/infinote/files/infinoted-git-commit b/roles/infinote/files/infinoted-git-commit
index a66b75d634..478786249a 100755
--- a/roles/infinote/files/infinoted-git-commit
+++ b/roles/infinote/files/infinoted-git-commit
@@ -2,4 +2,3 @@
 cd /srv/web/infinote
 git add .  >/dev/null
 git commit -a --author="infinote <nobody@fedoraproject.org>" -m "Automated Commit of $1" >/dev/null
-git push >/dev/null