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

Merge branch 'main' into stable

Browse source
This commit is contained in:
Micke Nordin 2023-02-23 10:33:39 +01:00
commit 6a1895d48e
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manifests/app_type.pp
View file

@ -51,6 +51,11 @@ define sunetdrive::app_type (
$site_name = $config['site_name'] $site_name = $config['site_name']
$trusted_domains = $config['trusted_domains'] $trusted_domains = $config['trusted_domains']
$trusted_proxies = $config['trusted_proxies'] $trusted_proxies = $config['trusted_proxies']
if $location == 'kau-prod' {
$php_memory_limit_mb = 2048
} else {
$php_memory_limit_mb = 512
}
# These are encrypted values from local.eyaml # These are encrypted values from local.eyaml
@ -79,7 +84,7 @@ define sunetdrive::app_type (
$drive_email_template_url_left = $config['drive_email_template_url_left'] $drive_email_template_url_left = $config['drive_email_template_url_left']
$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']
#Create users
unless $is_multinode{ unless $is_multinode{
user { 'www-data': ensure => present, system => true } user { 'www-data': ensure => present, system => true }

2
templates/application/apache.php.ini.erb
View file

@ -25,7 +25,7 @@ log_errors_max_len = 1024
max_execution_time = 86400 max_execution_time = 86400
max_file_uploads = 20 max_file_uploads = 20
max_input_time = 86400 max_input_time = 86400
memory_limit = 512M memory_limit = <%= @php_memory_limit_mb %>M
output_buffering = Off output_buffering = Off
post_max_size = 30G post_max_size = 30G
precision = 14 precision = 14