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-20 10:44:56 +02:00
parent eba9546cdc 472977fde4
commit 718bc0b496
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/lookup.pp
View file

@ -5,6 +5,9 @@ class sunetdrive::lookup (
) { ) {
$environment = sunetdrive::get_environment() $environment = sunetdrive::get_environment()
$config = lookup($environment, undef, undef, undef)
$public_url = "https://${config['site_name']}"
# Firewall settings # Firewall settings
@ -13,8 +16,10 @@ class sunetdrive::lookup (
$dbhost = 'proxysql_proxysql_1' $dbhost = 'proxysql_proxysql_1'
$gss_jwt_key = safe_hiera('gss_jwt_key') $gss_jwt_key = safe_hiera('gss_jwt_key')
$replication_auth = safe_hiera('replication_auth')
$mysql_user_password = safe_hiera('mysql_user_password') $mysql_user_password = safe_hiera('mysql_user_password')
$lookup_version = hiera("lookup_version_${environment}") $lookup_version = hiera("lookup_version_${environment}")
$email_sender = $config['email_sender']
#Create users #Create users
user { 'www-data': ensure => present, system => true } user { 'www-data': ensure => present, system => true }

25
templates/lookup/config.php.erb
View file

@ -1,16 +1,29 @@
<?php <?php
$CONFIG = [ $CONFIG = [
'AUTH_KEY' => "<%= @gss_jwt_key %>",
'DB' => [ 'DB' => [
'host' => "<%= @dbhost %>", 'host' => "<%= @dbhost %>",
'db' => "lookup" , 'db' => "lookup" ,
'user' => "lookup", 'user' => "lookup",
'pass' => "<%= @mysql_user_password %>", 'pass' => "<%= @mysql_user_password %>",
], ],
'EMAIL_SENDER' => '<%= @email_sender %>',
'ERROR_VERBOSE' => false,
'GLOBAL_SCALE' => true, 'GLOBAL_SCALE' => true,
'IP_BLACKLIST' => [
'AUTH_KEY' => "<%= @gss_jwt_key %>", ],
'MAX_REQUESTS' => 10000,
'MAX_SEARCH_PAGE' => 10,
'PUBLIC_URL' => '<%= @public_url %>',
'REPLICATION_AUTH' => '<%= @replication_auth %>',
'REPLICATION_HOSTS' => [
],
'SPAM_BLACKLIST' => [
],
'TWITTER' => [
'CONSUMER_KEY' => '',
'CONSUMER_SECRET' => '',
'ACCESS_TOKEN' => '',
'ACCESS_TOKEN_SECRET' => '',
],
]; ];