aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Cholewiński <harry666t@gmail.com>2016-02-16 22:07:07 +0100
committerKamil Cholewiński <harry666t@gmail.com>2016-02-16 22:07:07 +0100
commit0d1a342e3030cf186bc7f93b33eb713445d3b95c (patch)
tree53745cf9e5f95c6627a2d94687e3a0914416051d
parent6fe29c19c172c636703783d69eecca744f6170d0 (diff)
downloadcookbook-0d1a342e3030cf186bc7f93b33eb713445d3b95c.zip
cookbook-0d1a342e3030cf186bc7f93b33eb713445d3b95c.tar.gz
cookbook-0d1a342e3030cf186bc7f93b33eb713445d3b95c.tar.bz2
Port git-hosting to OpenBSD
-rw-r--r--roles/git-hosting/defaults/main.yml2
-rw-r--r--roles/git-hosting/tasks/cgit.yml5
-rw-r--r--roles/git-hosting/vars/Debian.yml10
-rw-r--r--roles/git-hosting/vars/OpenBSD.yml10
4 files changed, 21 insertions, 6 deletions
diff --git a/roles/git-hosting/defaults/main.yml b/roles/git-hosting/defaults/main.yml
index 0393e27..c701781 100644
--- a/roles/git-hosting/defaults/main.yml
+++ b/roles/git-hosting/defaults/main.yml
@@ -106,5 +106,3 @@ cgit:
vhosts:
cgit:
server_name: git.example.com
- webroot: /usr/share/cgit
- cgi_script: /usr/lib/cgit/cgit.cgi
diff --git a/roles/git-hosting/tasks/cgit.yml b/roles/git-hosting/tasks/cgit.yml
index afb863d..9173b6e 100644
--- a/roles/git-hosting/tasks/cgit.yml
+++ b/roles/git-hosting/tasks/cgit.yml
@@ -4,10 +4,7 @@
module: "{{ ansible_pkg_mgr }}"
name: "{{ item }}"
state: latest
- with_items:
- - cgit
- - fcgiwrap
- - python-pygments
+ with_items: packages.cgit
tags: install
- name: Configure cgit
diff --git a/roles/git-hosting/vars/Debian.yml b/roles/git-hosting/vars/Debian.yml
index 918b3d7..34308aa 100644
--- a/roles/git-hosting/vars/Debian.yml
+++ b/roles/git-hosting/vars/Debian.yml
@@ -2,6 +2,16 @@
packages:
gitolite:
- gitolite3
+ cgit:
+ - cgit
+ - fcgiwrap
+ - python-pygments
httpd:
user: www-data
+
+cgit:
+ vhosts:
+ cgit:
+ webroot: /usr/share/cgit
+ cgi_script: /usr/lib/cgit/cgit.cgi
diff --git a/roles/git-hosting/vars/OpenBSD.yml b/roles/git-hosting/vars/OpenBSD.yml
index bc8340e..47566c8 100644
--- a/roles/git-hosting/vars/OpenBSD.yml
+++ b/roles/git-hosting/vars/OpenBSD.yml
@@ -2,3 +2,13 @@
packages:
gitolite:
- gitolite
+ cgit:
+ - cgit
+ - fcgi
+ - py-pygments
+
+cgit:
+ vhosts:
+ cgit:
+ webroot: /var/www/cgit
+ cgi_script: /var/www/cgi-bin/cgit.cgi