separate built config
This commit is contained in:
parent
56f0d18b11
commit
0c8cf318a7
1 changed files with 2 additions and 1 deletions
|
@ -239,7 +239,7 @@ class mastodon (
|
||||||
timeout => 0,
|
timeout => 0,
|
||||||
require => File['/usr/local/bin/install_mastodon.sh'],
|
require => File['/usr/local/bin/install_mastodon.sh'],
|
||||||
}
|
}
|
||||||
$real_config = $mastodon_config + {
|
$built_config = {
|
||||||
LOCAL_DOMAIN => $hostname,
|
LOCAL_DOMAIN => $hostname,
|
||||||
DB_PASS => $db_password,
|
DB_PASS => $db_password,
|
||||||
DB_USER => $db_user,
|
DB_USER => $db_user,
|
||||||
|
@ -249,6 +249,7 @@ class mastodon (
|
||||||
SECRET_KEY_BASE => $secret_key_base,
|
SECRET_KEY_BASE => $secret_key_base,
|
||||||
OTP_SECRET => $otp_secret,
|
OTP_SECRET => $otp_secret,
|
||||||
}
|
}
|
||||||
|
$real_config = $mastodon_config + $built_config
|
||||||
file { "${mastodon_home}/live/.env.production":
|
file { "${mastodon_home}/live/.env.production":
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
content => template('mastodon/env.production.erb'),
|
content => template('mastodon/env.production.erb'),
|
||||||
|
|
Loading…
Reference in a new issue