Drive/sunetdrive
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'testing'

Browse source
This commit is contained in:
Micke Nordin 2025-01-16 12:41:18 +01:00
commit b6c0bb2f46
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/app_type.pp
View file

@ -88,9 +88,14 @@ define sunetdrive::app_type (
$drive_email_template_text_left = $config['drive_email_template_text_left'] $drive_email_template_text_left = $config['drive_email_template_text_left']
$drive_email_template_plain_text_left = $config['drive_email_template_plain_text_left'] $drive_email_template_plain_text_left = $config['drive_email_template_plain_text_left']
$drive_email_template_url_left = $config['drive_email_template_url_left'] $drive_email_template_url_left = $config['drive_email_template_url_left']
$full_backup_retention = hiera('full_backup_retention')
$lb_servers = hiera_hash($environment)['lb_servers'] $lb_servers = hiera_hash($environment)['lb_servers']
$document_servers = hiera_hash($environment)['document_servers'] $document_servers = hiera_hash($environment)['document_servers']
# Calculate some values
$expiration_days_min = $full_backup_retention * 31
$expiration_days_max = $full_backup_retention * 31 + 93
unless $is_multinode{ unless $is_multinode{
user { 'www-data': ensure => present, system => true } user { 'www-data': ensure => present, system => true }

6
templates/application/config.php.erb
View file

@ -192,6 +192,9 @@ $CONFIG = array (
'secret' => '<%= @secret %>', 'secret' => '<%= @secret %>',
'skeletondirectory' => '<%= @skeletondirectory %>', 'skeletondirectory' => '<%= @skeletondirectory %>',
'templatedirectory' => '', 'templatedirectory' => '',
<% if @environment == 'test' -%>
'trashbin_retention_obligation' => 'auto, 30',
<% end -%>
'trusted_domains' => 'trusted_domains' =>
array ( array (
<%- index = 0 -%> <%- index = 0 -%>
@ -234,4 +237,7 @@ $CONFIG = array (
), ),
'updatechecker' => false, 'updatechecker' => false,
'version' => '<%= @nextcloud_version_string %>', 'version' => '<%= @nextcloud_version_string %>',
<% if @environment == 'test' -%>
'versions_retention_obligation' => '<%= @expiration_days_min %>,<%= @expiration_days_max %>',
<% end -%>
); );