diff --git a/manifests/init.pp b/manifests/init.pp index 86b18a1..4a14d4f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -336,23 +336,23 @@ class mastodon ( post_hook_commands => ['systemctl start apache2'], } apache::vhost { $hostname: - ensure => $ensure, - access_log_file => $hostname, - add_listen => false, - error_log_file => $hostname, - docroot => "${mastodon_home}/live/public", - manage_docroot => false, - proxy_preserve_host => true, - proxy_add_headers => true, - port => 443, - priority => 15, - protocols => [ + ensure => $ensure, + access_log_file => $hostname, + add_listen => false, + error_log_file => $hostname, + docroot => "${mastodon_home}/live/public", + manage_docroot => false, + proxy_preserve_host => true, + proxy_add_headers => true, + port => 443, + priority => 15, + protocols => [ 'h2', 'http/1.1', ], - protocols_honor_order => true, - proxy_requests => false, - proxy_pass => [ + protocols_honor_order => true, + proxy_requests => false, + proxy_pass => [ { 'path' => '/500.html', 'url' => '!' }, { 'path' => '/sw.js', 'url' => '!' }, { 'path' => '/robots.txt', 'url' => '!' }, @@ -360,7 +360,7 @@ class mastodon ( { 'path' => '/browserconfig.xml', 'url' => '!' }, { 'path' => '/mask-icon.svg', 'url' => '!' }, ], - custom_fragment => ' + custom_fragment => ' ServerSignature Off ProxyPass /api/v1/streaming ws://localhost:4000 @@ -368,18 +368,18 @@ class mastodon ( ProxyPass / http://localhost:3000/ ProxyPassReverse / http://localhost:3000/ ', - proxy_pass_match => [ + proxy_pass_match => [ { 'path' => '^(/.*\.(png|ico)$)', 'url' => '!' }, { 'path' => '^/(assets|avatars|emoji|headers|packs|sounds|system)', 'url' => '!' }, ], - request_headers => [ + request_headers => [ 'set X-Forwarded-Proto "https"', ], - headers => [ + headers => [ 'always set Strict-Transport-Security "max-age=31536000"', 'always set Strict-Transport-Security "max-age=15552001; includeSubDomains"', ], - directories => [ + directories => [ { 'path' => '^/(assets|avatars|emoji|headers|packs|sounds|system)', 'provider' => 'locationmatch', @@ -393,7 +393,7 @@ class mastodon ( 'require' => 'all granted', }, ], - error_documents => [ + error_documents => [ { 'error_code' => '500', 'document' => '/500' }, { 'error_code' => '501', 'document' => '/501' }, { 'error_code' => '502', 'document' => '/502' },