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

Merge branch 'main' into testing

Browse source
This commit is contained in:
Micke Nordin 2024-05-21 17:47:56 +02:00
parent 5b7c702573 b3d9873176
commit 00a2f1f425
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/app_type.pp
View file

@ -61,7 +61,7 @@ define sunetdrive::app_type (
$php_memory_limit_mb = 512 $php_memory_limit_mb = 512
} }
if $::facts['dockerhost2'] == 'yes' { if $::facts['dockerhost2'] == 'yes' {
$hostnet = 'yes' $hostnet = true
} }
# These are encrypted values from local.eyaml # These are encrypted values from local.eyaml

2
manifests/proxysql.pp
View file

@ -27,7 +27,7 @@ class sunetdrive::proxysql (
$transaction_persistent = 1 $transaction_persistent = 1
if $::facts['dockerhost2'] == 'yes' { if $::facts['dockerhost2'] == 'yes' {
$hostnet = 'yes' $hostnet = true
} }
file { '/usr/local/bin/proxysql': file { '/usr/local/bin/proxysql':

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

@ -127,6 +127,24 @@ $CONFIG = array (
], ],
'timeout' => 1.1 'timeout' => 1.1
], ],
<% elsif @location == 'gss-prod' -%>
'redis.cluster' => [
'failover_mode' => \RedisCluster::FAILOVER_ERROR,
'password' => '<%= @redis_cluster_password %>',
'read_timeout' => 0.0,
'seeds' => [
'redis1.drive.sunet.se:6379',
'redis2.drive.sunet.se:6379',
'redis3.drive.sunet.se:6379',
'redis1.drive.sunet.se:6380',
'redis2.drive.sunet.se:6380',
'redis3.drive.sunet.se:6380',
'redis1.drive.sunet.se:6381',
'redis2.drive.sunet.se:6381',
'redis3.drive.sunet.se:6381'
],
'timeout' => 1.1
],
<% elsif @environment == 'test' && ! @is_multinode -%> <% elsif @environment == 'test' && ! @is_multinode -%>
'redis.cluster' => [ 'redis.cluster' => [
'failover_mode' => \RedisCluster::FAILOVER_ERROR, 'failover_mode' => \RedisCluster::FAILOVER_ERROR,