diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-03-29 13:37:52 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-03-29 13:37:52 -0300 |
| commit | 7b7a6a566974bc35687dfb1516eafd1421301c97 (patch) | |
| tree | 3b56e5ea26b97af3bd289038712afda126b49b1e | |
| parent | a39336ce95733ec434758d18ea05e0466c881fec (diff) | |
| download | puppet-ikiwiki-7b7a6a566974bc35687dfb1516eafd1421301c97.tar.gz puppet-ikiwiki-7b7a6a566974bc35687dfb1516eafd1421301c97.tar.bz2 | |
Use gitolite as the default git implementation
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | templates/deploy.sh.erb | 4 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 4 | ||||
| -rw-r--r-- | templates/refresh.sh.erb | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 059b19a..789ff92 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,6 @@ class ikiwiki( - $sites_folder = '/var/sites' + $sites_folder = '/var/sites' + $git_implementation = 'gitolite', ) { package { [ "ikiwiki", "po4a" ]: ensure => installed, diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb index 4bbfb43..86150aa 100644 --- a/templates/deploy.sh.erb +++ b/templates/deploy.sh.erb @@ -7,8 +7,8 @@ SITE=$BASE/$NAME CONF="/etc/ikiwiki" WEB_OWNER="www-data" WEB_GROUP="www-data" -REPO_OWNER="gitosis" -REPO_GROUP="gitosis" +REPO_OWNER="<%= scope.lookupvar('ikiwiki:git_implementation') %>" +REPO_GROUP="<%= scope.lookupvar('ikiwiki:git_implementation') %>" REPO="/var/git/repositories/$NAME.git" if [ -z "$INSTANCE" ]; then diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index 1c90988..f9f08bb 100644 --- a/templates/ikiwiki.setup.erb +++ b/templates/ikiwiki.setup.erb @@ -65,7 +65,7 @@ use IkiWiki::Setup::Standard { cgi => 1, wrapper => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki/ikiwiki.cgi", wrappermode => "06550", - wrappergroup => "gitosis", + wrappergroup => "<%= scope.lookupvar('ikiwiki:git_implementation') %>", }, #{ # # The svn post-commit wrapper. @@ -85,7 +85,7 @@ use IkiWiki::Setup::Standard { # what you want. wrapper => "/var/git/repositories/<%= name %>.git/hooks/post-update", wrappermode => "06550", - wrappergroup => "gitosis", + wrappergroup => "<%= scope.lookupvar('ikiwiki:git_implementation') %>", }, #{ # # The monotone netsync hook. diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb index 0b2b796..1071fa8 100644 --- a/templates/refresh.sh.erb +++ b/templates/refresh.sh.erb @@ -7,8 +7,8 @@ SITE=$BASE/$NAME CONF="/etc/ikiwiki" WEB_OWNER="www-data" WEB_GROUP="www-data" -REPO_OWNER="gitosis" -REPO_GROUP="gitosis" +REPO_OWNER="<%= scope.lookupvar('ikiwiki:git_implementation') %>" +REPO_GROUP="<%= scope.lookupvar('ikiwiki:git_implementation') %>" REPO="/var/git/repositories/$NAME.git" if [ -z "$INSTANCE" ]; then |