Page MenuHomeSoftware Heritage
Files F8395880

No OneTemporary
Actions

View Options

diff --git a/manifests/docs_web.pp b/manifests/docs_web.pp
index 74f2051..ad71c56 100644
--- a/manifests/docs_web.pp
+++ b/manifests/docs_web.pp
@@ -1,105 +1,106 @@
# Deployment of web-facing static documentation
class profile::docs_web {
$docs_basepath = hiera('docs::basepath')
$docs_vhost_name = hiera('docs::vhost::name')
$docs_vhost_docroot = hiera('docs::vhost::docroot')
$docs_vhost_docroot_group = hiera('docs::vhost::docroot_group')
$docs_vhost_docroot_mode = hiera('docs::vhost::docroot_mode')
$docs_vhost_ssl_protocol = hiera('docs::vhost::ssl_protocol')
$docs_vhost_ssl_honorcipherorder = hiera('docs::vhost::ssl_honorcipherorder')
$docs_vhost_ssl_cipher = hiera('docs::vhost::ssl_cipher')
$docs_vhost_hsts_header = hiera('docs::vhost::hsts_header')
include ::profile::ssl
include ::profile::apache::common
::apache::vhost {"${docs_vhost_name}_non-ssl":
servername => $docs_vhost_name,
port => '80',
docroot => $docs_vhost_docroot,
+ manage_docroot => false, # will be managed by the SSL resource
redirect_status => 'permanent',
redirect_dest => "https://${docs_vhost_name}/",
}
$ssl_cert_name = 'star_softwareheritage_org'
$ssl_cert = $::profile::ssl::certificate_paths[$ssl_cert_name]
$ssl_ca = $::profile::ssl::ca_paths[$ssl_cert_name]
$ssl_key = $::profile::ssl::private_key_paths[$ssl_cert_name]
::apache::vhost {"${docs_vhost_name}_ssl":
servername => $docs_vhost_name,
port => '443',
ssl => true,
ssl_protocol => $docs_vhost_ssl_protocol,
ssl_honorcipherorder => $docs_vhost_ssl_honorcipherorder,
ssl_cipher => $docs_vhost_ssl_cipher,
ssl_cert => $ssl_cert,
ssl_ca => $ssl_ca,
ssl_key => $ssl_key,
headers => [$docs_vhost_hsts_header],
docroot => $docs_vhost_docroot,
docroot_group => $docs_vhost_docroot_group,
docroot_mode => $docs_vhost_docroot_mode,
directories => [{
'path' => $docs_vhost_docroot,
'require' => 'all granted',
'options' => ['Indexes', 'FollowSymLinks', 'MultiViews'],
}],
require => [
File[$ssl_cert],
File[$ssl_ca],
File[$ssl_key],
],
}
$icinga_checks_file = '/etc/icinga2/conf.d/exported-checks.conf'
@@::icinga2::object::service {"docs http redirect on ${::fqdn}":
service_name => 'docs http redirect',
import => ['generic-service'],
host_name => $::fqdn,
check_command => 'http',
vars => {
http_address => $docs_vhost_name,
http_vhost => $docs_vhost_name,
http_uri => '/',
},
target => $icinga_checks_file,
tag => 'icinga2::exported',
}
@@::icinga2::object::service {"docs https on ${::fqdn}":
service_name => 'docs https',
import => ['generic-service'],
host_name => $::fqdn,
check_command => 'http',
vars => {
http_address => $docs_vhost_name,
http_vhost => $docs_vhost_name,
http_ssl => true,
http_sni => true,
http_uri => '/',
http_onredirect => sticky
},
target => $icinga_checks_file,
tag => 'icinga2::exported',
}
@@::icinga2::object::service {"docs https certificate ${::fqdn}":
service_name => 'docs https certificate',
import => ['generic-service'],
host_name => $::fqdn,
check_command => 'http',
vars => {
http_address => $docs_vhost_name,
http_vhost => $docs_vhost_name,
http_ssl => true,
http_sni => true,
http_certificate => 60,
},
target => $icinga_checks_file,
tag => 'icinga2::exported',
}
}

File Metadata

Mime Type
text/x-diff
Expires
Jun 4 2025, 7:46 PM (12 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3399366

Event Timeline

About · Developer information · Legal