From 0f822dc490f3f90138b83fd9a323d0d37ef9512b Mon Sep 17 00:00:00 2001
From: binary <me@rgoncalves.se>
Date: Thu, 18 Mar 2021 15:31:25 +0100
Subject: Variables refactoring and http auth. support

---
 roles/cgit/templates/cgit.httpd.conf.j2       | 17 ------------
 roles/cgit/templates/cgitrc.j2                | 39 ---------------------------
 roles/cgit/templates/etc-httpd.d-cgit.conf.j2 | 20 ++++++++++++++
 roles/cgit/templates/var-www-conf-cgitrc.j2   | 39 +++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 56 deletions(-)
 delete mode 100644 roles/cgit/templates/cgit.httpd.conf.j2
 delete mode 100644 roles/cgit/templates/cgitrc.j2
 create mode 100644 roles/cgit/templates/etc-httpd.d-cgit.conf.j2
 create mode 100644 roles/cgit/templates/var-www-conf-cgitrc.j2

(limited to 'roles/cgit/templates')

diff --git a/roles/cgit/templates/cgit.httpd.conf.j2 b/roles/cgit/templates/cgit.httpd.conf.j2
deleted file mode 100644
index a8b4707..0000000
--- a/roles/cgit/templates/cgit.httpd.conf.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# httpd ~~ /etc/httpd.d/cgit.conf"
-# managed by Ansible
-
-ext_ip="0.0.0.0"
-server "cgit" {
-	listen on $ext_ip port {{ cgit_port }}
-
-	# serve cgit static files directly: cgit.css and cgit.png
-	location "/cgit.*" {
-		root "/cgit"
-			no fastcgi	
-	}
-	# cgit CGI
-	root "/cgi-bin/cgit.cgi"
-	fastcgi socket "/run/slowcgi.sock"
-}
diff --git a/roles/cgit/templates/cgitrc.j2 b/roles/cgit/templates/cgitrc.j2
deleted file mode 100644
index 5779255..0000000
--- a/roles/cgit/templates/cgitrc.j2
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# cgit ~~ /var/www/conf/cgitrc
-# managed by Ansible
-
-# visuals
-css={{ cgit_config_css }}
-logo={{ cgit_config_logo }}
-favicon={{ cgit_config_favicon }}
-
-# readme
-readme=:README.md
-readme=:README.org
-readme=:README
-readme=:.README.md
-readme=:.README
-about-filter=/bin/about-filter.sh
-
-# features
-enable-commit-graph=1
-enable-http-clone=1
-enable-index-links=1
-max-stats=quarter
-robots=noindex, nofollow
-
-# git
-clone-url=git://git.{{ global.domain_name }}/$CGIT_REPO_URL ssh://git@git.{{ global.domain_name }}/$CGIT_REPO_URL http://git.{{ global.domain_name }}/$CGIT_REPO_URL
-
-# instance id
-root-title=git.{{ global.domain_name }}
-root-desc={{ cgit_config_root_desc }}
-root-readme={{ cgit_config_root_readme }}
-
-# archives
-snapshots=tar.gz
-
-# sections
-section-from-path=1
-section-sort=1
-scan-path={{ cgit_git_dir_chroot }}
diff --git a/roles/cgit/templates/etc-httpd.d-cgit.conf.j2 b/roles/cgit/templates/etc-httpd.d-cgit.conf.j2
new file mode 100644
index 0000000..6fb8e98
--- /dev/null
+++ b/roles/cgit/templates/etc-httpd.d-cgit.conf.j2
@@ -0,0 +1,20 @@
+
+# httpd ~~ /etc/httpd.d/cgit.conf"
+# managed by Ansible
+
+ext_ip="0.0.0.0"
+server "cgit" {
+	listen on $ext_ip port {{ cgit_port }}
+{% if cgit_authenticate %}
+	authenticate "realm" with "/htpasswd/cgit"
+{% endif %}
+
+	# serve cgit static files directly: cgit.css and cgit.png
+	location "/cgit.*" {
+		root "/cgit"
+			no fastcgi	
+	}
+	# cgit CGI
+	root "/cgi-bin/cgit.cgi"
+	fastcgi socket "/run/slowcgi.sock"
+}
diff --git a/roles/cgit/templates/var-www-conf-cgitrc.j2 b/roles/cgit/templates/var-www-conf-cgitrc.j2
new file mode 100644
index 0000000..8be36ce
--- /dev/null
+++ b/roles/cgit/templates/var-www-conf-cgitrc.j2
@@ -0,0 +1,39 @@
+
+# cgit ~~ /var/www/conf/cgitrc
+# managed by Ansible
+
+# visuals
+css={{ cgit__css }}
+logo={{ cgit__logo }}
+favicon={{ cgit__favicon }}
+
+# readme
+readme=:README.md
+readme=:README.org
+readme=:README
+readme=:.README.md
+readme=:.README
+about-filter=/bin/about-filter.sh
+
+# features
+enable-commit-graph=1
+enable-http-clone=1
+enable-index-links=1
+max-stats=quarter
+robots=noindex, nofollow
+
+# git
+clone-url=git://git.{{ global.domain_name }}/$CGIT_REPO_URL ssh://git@git.{{ global.domain_name }}/$CGIT_REPO_URL http://git.{{ global.domain_name }}/$CGIT_REPO_URL
+
+# instance id
+root-title=git.{{ global.domain_name }}
+root-desc={{ cgit__root_desc }}
+root-readme={{ cgit__root_readme }}
+
+# archives
+snapshots=tar.gz
+
+# sections
+section-from-path=1
+section-sort=1
+scan-path={{ cgit_git_dir_chroot }}
-- 
cgit v1.2.3