From 5e565f0374840245e5012fb57ba0af24de78e34b Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 11 Mar 2023 12:18:03 +0100 Subject: Draft proxmox proxy support + route53 --- personal_infra/puppet/modules/proxmox/manifests/proxy.pp | 2 +- .../puppet/modules/proxmox/manifests/proxy_host.pp | 15 +++++++++++++++ personal_infra/puppet/site/h1.pdp7.net.pp | 11 ++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 personal_infra/puppet/modules/proxmox/manifests/proxy_host.pp (limited to 'personal_infra/puppet') diff --git a/personal_infra/puppet/modules/proxmox/manifests/proxy.pp b/personal_infra/puppet/modules/proxmox/manifests/proxy.pp index 65f93cb6..2a07c44c 100644 --- a/personal_infra/puppet/modules/proxmox/manifests/proxy.pp +++ b/personal_infra/puppet/modules/proxmox/manifests/proxy.pp @@ -21,7 +21,7 @@ class proxmox::proxy ($mail, $base_hostname) { file {'/etc/apache2/sites-enabled/test.conf': content => @("EOT") - MDomain $base_hostname + MDomain $base_hostname auto MDCertificateAgreement accepted MDContactEmail $mail MDNotifyCmd /usr/local/bin/notify_md_renewal diff --git a/personal_infra/puppet/modules/proxmox/manifests/proxy_host.pp b/personal_infra/puppet/modules/proxmox/manifests/proxy_host.pp new file mode 100644 index 00000000..33b28de0 --- /dev/null +++ b/personal_infra/puppet/modules/proxmox/manifests/proxy_host.pp @@ -0,0 +1,15 @@ +define proxmox::proxy_host (String[1] $target) { + file {"/etc/apache2/sites-enabled/$title.conf": + content => @("EOT") + MDomain $title + + + ServerName $title + SSLEngine on + + | EOT + , + } + ~> + Service['apache2'] +} diff --git a/personal_infra/puppet/site/h1.pdp7.net.pp b/personal_infra/puppet/site/h1.pdp7.net.pp index ef0ff1ea..b64871c1 100644 --- a/personal_infra/puppet/site/h1.pdp7.net.pp +++ b/personal_infra/puppet/site/h1.pdp7.net.pp @@ -1,11 +1,16 @@ node 'h1.pdp7.net' { class {'proxmox::freeipa':} + class {'dns_dhcp':} + + # TODO: ugly; tinc scripts require this :( + package {'net-tools':} + class {'proxmox::proxy': mail => lookup('mail.root_mail'), base_hostname => lookup('network.public_hostname'), } - class {'dns_dhcp':} - # TODO: ugly; tinc scripts require this :( - package {'net-tools':} + proxmox::proxy_host {'ipsilon-test.pdp7.net': + target => 'ipsilon-test.h1.int.pdp7.net', + } } -- cgit v1.2.3