promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
2 changed files with 27 additions and 0 deletions
Showing only changes of commit e97d061f46 - Show all commits

View File

@ -2,6 +2,7 @@
# mappings # mappings
profiles::haproxy::mappings::list: profiles::haproxy::mappings::list:
- 'puppetboard.main.unkin.net be_puppetboard' - 'puppetboard.main.unkin.net be_puppetboard'
- 'puppetdbapi.main.unkin.net be_puppetdbapi'
profiles::haproxy::backends: profiles::haproxy::backends:
be_puppetboard: be_puppetboard:
@ -17,6 +18,19 @@ profiles::haproxy::backends:
- set-header X-Forwarded-Port %[dst_port] - set-header X-Forwarded-Port %[dst_port]
- add-header X-Forwarded-Proto https if { dst_port 443 } - add-header X-Forwarded-Proto https if { dst_port 443 }
redirect: 'scheme https if !{ ssl_fc }' redirect: 'scheme https if !{ ssl_fc }'
be_puppetdbapi:
description: Backend for the PuppetDB API
collect_exported: false # handled in custom function
options:
balance: roundrobin
option:
- httpchk GET /
- forwardfor
cookie: SRVNAME insert
http-request:
- set-header X-Forwarded-Port %[dst_port]
- add-header X-Forwarded-Proto https if { dst_port 443 }
redirect: 'scheme https if !{ ssl_fc }'
be_letsencrypt: be_letsencrypt:
description: Backend for LetsEncrypt Verifications description: Backend for LetsEncrypt Verifications
collect_exported: true collect_exported: true
@ -67,3 +81,4 @@ profiles::haproxy::certlist::certificates:
# additional altnames # additional altnames
profiles::pki::vault::alt_names: profiles::pki::vault::alt_names:
- puppetboard.main.unkin.net - puppetboard.main.unkin.net
- puppetdbapi.main.unkin.net

View File

@ -18,4 +18,16 @@ class profiles::puppet::puppetdb_api (
export_scrape_job => true, export_scrape_job => true,
} }
# export haproxy balancemember
profiles::haproxy::balancemember { "${facts['networking']['fqdn']}_8080":
service => 'be_puppetdbapi',
ports => [8080],
options => [
"cookie ${facts['networking']['hostname']}",
'check',
'inter 2s',
'rise 3',
'fall 2',
]
}
} }