From 9c8d6014657a0401ebaf2af478303cbfd11d6b71 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Wed, 4 Feb 2026 11:39:00 +0100 Subject: [PATCH] OP#414 add all dirs --- manifests/main/dirs.pp | 20 +++++++++++++++++--- manifests/main/files.pp | 2 +- manifests/params.pp | 17 +++++++++++------ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 012bde4..5bde11f 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -8,12 +8,26 @@ class confdroid_gitea::main::dirs ( ) inherits confdroid_gitea::params { if $ga_host_fqdn == $fqdn { require confdroid_gitea::main::user - file { $ga_working_dir: + file { $ga_opt_dir: ensure => 'directory', - mode => '0755', + mode => '0750', owner => $ga_user, group => $ga_user, recurse => true, } - } + + file { [ + $ga_working_dir, + $ga_custom_dir, + $ga_data_dir, + $ga_log_dir, + $ga_tmp_dir, + ]: + ensure => 'directory', + mode => '0750', + owner => $ga_user, + group => $ga_user, + recurse => true, + } + } } diff --git a/manifests/main/files.pp b/manifests/main/files.pp index c3733a6..286ea5f 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -9,7 +9,7 @@ class confdroid_gitea::main::files ( if $ga_host_fqdn == $fqdn { require confdroid_gitea::main::dirs - file { "${ga_working_dir}/gitea": + file { "${ga_opt_dir}/gitea": ensure => 'file', mode => '0755', owner => $ga_user, diff --git a/manifests/params.pp b/manifests/params.pp index 0cae8ac..c3eca11 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,7 +7,7 @@ # @param [String] ga_ssh_port The SSH port number for Gitea. # @param [String] ga_order_prefix The order prefix for firewall rules. # @param [String] ga_host_fqdn The FQDN for the Gitea host. -# @param [String] ga_working_dir The working directory for Gitea. +# @param [String] ga_opt_dir The installation directory for Gitea. # @param [String] ga_dl_url The download URL for Gitea. # @param [String] ga_dl_version The version of Gitea to download. # @param [String] ga_user The system user for Gitea. @@ -20,7 +20,7 @@ class confdroid_gitea::params ( Array $ga_reqpackages = ['git', 'wget', 'tar'], String $ga_pkg_ensure = 'present', String $ga_host_fqdn = 'gitea.example.net', - String $ga_working_dir = '/opt/gitea', + String $ga_opt_dir = '/opt/gitea', String $ga_dl_url = 'https://dl.gitea.com/gitea', String $ga_dl_version = '1.25.4', String $ga_user = 'git', @@ -33,12 +33,17 @@ class confdroid_gitea::params ( ) { # facts - $fqdn = $facts['networking']['fqdn'] - $domain = $facts['networking']['domain'] - $os_name = $facts['os']['name'] - $os_release = $facts['os']['release']['major'] + $fqdn = $facts['networking']['fqdn'] + $domain = $facts['networking']['domain'] + $os_name = $facts['os']['name'] + $os_release = $facts['os']['release']['major'] # directories + $ga_working_dir ='/var/lib/gitea' + $ga_custom_dir = "${ga_working_dir}/custom" + $ga_data_dir = "${ga_working_dir}/data" + $ga_log_dir = "${ga_working_dir}/log" + $ga_tmp_dir = "${ga_working_dir}/tmp" # files