From 404942e3044beda0a3b15c1638bf80a2252ec247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 11 Oct 2022 01:29:05 +0200 Subject: further cleanup. --- manifests/init.pp | 9 ++++----- templates/upper.epp | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bbd8edb..91800b2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,9 +6,7 @@ class cgit ( String $root_readme_source = "puppet:///modules/${module_name}/root_readme", Optional[String] $root_readme_content = undef, Optional[String] $root_readme_sha256 = undef, - String $about_filter, - String $auth_filter, - String $source_filter, + String $root_readme_extension = '', String $scan_path, Array[String] $clone_url, Boolean $enable_http_clone = false, @@ -72,14 +70,15 @@ class cgit ( { } } + $readme = "${root}/README${root_readme_extension}" if $root_readme_content { - file { "${root}/root_readme": + file { $readme: ensure => file, content => $root_readme_content, * => $chksum, } } else { - file { "${root}/root_readme": + file { $readme: ensure => file, source => $root_readme_source, * => $chksum, diff --git a/templates/upper.epp b/templates/upper.epp index de93118..174a37c 100644 --- a/templates/upper.epp +++ b/templates/upper.epp @@ -12,10 +12,9 @@ logo=/logo/logo.png enable-index-owner=1 root-title=<%= $cgit::root_title %> -#root-desc=Tändes endast mot lådans plån root-desc=<%= $cgit::root_desc %> + # Also causes the `about' page to exist -# /usr/lib/cgit/readme -root-readme=<%= $cgit::root %>/root_readme +root-readme=<%= $cgit::root %>/README<%= $cgit::root_readme_extension %> -- cgit v1.2.3