aboutsummaryrefslogtreecommitdiffstats
path: root/modules/gitweb
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gitweb')
-rw-r--r--modules/gitweb/manifests/init.pp20
-rw-r--r--modules/gitweb/templates/gitweb.conf2
-rw-r--r--modules/gitweb/templates/webapp.conf1
-rw-r--r--modules/gitweb/templates/wrapper.sh1
4 files changed, 13 insertions, 11 deletions
diff --git a/modules/gitweb/manifests/init.pp b/modules/gitweb/manifests/init.pp
index 8cdc4932..d7c07b22 100644
--- a/modules/gitweb/manifests/init.pp
+++ b/modules/gitweb/manifests/init.pp
@@ -7,20 +7,26 @@ class gitweb {
file { '/etc/gitweb.conf':
content => template('gitweb/gitweb.conf'),
- notify => Service['apache'],
+ notify => Service['apache'],
require => Package['gitweb'],
}
apache::webapp_other { 'gitweb':
webapp_file => 'gitweb/webapp.conf',
}
-
- local_script { 'gitweb.wrapper.sh':
+
+ mga_common::local_script { 'gitweb.wrapper.sh':
content => template('gitweb/wrapper.sh'),
- notify => Service['apache'],
+ notify => Service['apache'],
+ }
+
+ $vhost = "gitweb.${::domain}"
+ apache::vhost::base { $vhost:
+ content => template('gitweb/vhost.conf')
}
-
- apache::vhost_base { "gitweb.$domain":
- content => template("gitweb/vhost.conf")
+ apache::vhost::base { "ssl_${vhost}":
+ vhost => $vhost,
+ use_ssl => true,
+ content => template('gitweb/vhost.conf'),
}
}
diff --git a/modules/gitweb/templates/gitweb.conf b/modules/gitweb/templates/gitweb.conf
index 5216077c..688844a8 100644
--- a/modules/gitweb/templates/gitweb.conf
+++ b/modules/gitweb/templates/gitweb.conf
@@ -121,5 +121,3 @@ our $site_name = "Mageia Git";
# To enable system wide have in /etc/gitweb.conf
# $feature{'forks'}{'default'} = [1];
# Project specific override is not supported.
-
-
diff --git a/modules/gitweb/templates/webapp.conf b/modules/gitweb/templates/webapp.conf
index 54c85a29..a4d13624 100644
--- a/modules/gitweb/templates/webapp.conf
+++ b/modules/gitweb/templates/webapp.conf
@@ -6,4 +6,3 @@
Order allow,deny
Allow from all
</Directory>
-
diff --git a/modules/gitweb/templates/wrapper.sh b/modules/gitweb/templates/wrapper.sh
index c8fdcb6d..4303007b 100644
--- a/modules/gitweb/templates/wrapper.sh
+++ b/modules/gitweb/templates/wrapper.sh
@@ -2,4 +2,3 @@
export FCGI_SOCKET_PATH=/tmp/gitweb.socket
/usr/share/gitweb/gitweb.cgi --fastcgi
-