Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Docker for Drupal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Docker for Drupal
Commits
63d36e79
Commit
63d36e79
authored
1 year ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
drupal-environment#14
Add webserver response headers by traefik labels
parent
d74f0303
No related branches found
No related tags found
1 merge request
!85
Merging develop into main [MINOR_VERSION]
Pipeline
#1162181
passed
1 year ago
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Handler.php
+10
-0
10 additions, 0 deletions
src/Handler.php
templates/docker-compose.yml.twig
+13
-16
13 additions, 16 deletions
templates/docker-compose.yml.twig
with
23 additions
and
16 deletions
src/Handler.php
+
10
−
0
View file @
63d36e79
...
...
@@ -120,6 +120,16 @@ class Handler extends BaseHandler {
'webserver'
=>
[
'type'
=>
'apache'
,
'overwriteconfig'
=>
FALSE
,
'responseheader'
=>
[
'server'
=>
''
,
'strict_transport_security'
=>
'max-age=31536000; includeSubDomains'
,
'referrer_policy'
=>
'same-origin'
,
'permissions_policy'
=>
'accelerometer=(), camera=(), geolocation=(), gyroscope=(), microphone=(), payment=(), usb=()'
,
'cross_origin_embedder_policy'
=>
'unsafe-none'
,
'cross_origin_opener_policy'
=>
'same-origin'
,
'cross_origin_resource_policy'
=>
'cross-origin'
,
'x_permitted_cross_domain_policies'
=>
'none'
,
],
],
'mailhog'
=>
[
'enable'
=>
0
,
...
...
This diff is collapsed.
Click to expand it.
templates/docker-compose.yml.twig
+
13
−
16
View file @
63d36e79
...
...
@@ -49,10 +49,8 @@ services:
restart: unless-stopped
{%
endif
%}
environment:
{%
if
mailhog.enable
%}
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
{%
elseif
mailpit.enable
%}
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailpit:1025
{%
if
mailhog.enable
or
mailpit.enable
%}
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S
{%
if
mailhog.enable
%}
mailhog
{%
else
%}
mailpit
{%
endif
%}
:1025
{%
endif
%}
DB_HOST: mariadb
DB_USER: drupal
...
...
@@ -153,6 +151,17 @@ services:
labels:
traefik.enable: 'true'
traefik.docker.network: traefik-public
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-middleware
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-middleware.chain.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-headers@docker
{%
if
basicauth.enable
%}
,
{{
webserver.type
}}
-
{{
projectname
}}
-auth@docker
{%
endif
%}{%
for
domain
in
extradomains
%}
,
{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex
{{
loop.index
}}
@docker
{%
endfor
%}
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.server: '
{{
webserver.responseheader.server
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.strict-transport-security: '
{{
webserver.responseheader.strict_transport_security
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.referrer-policy: '
{{
webserver.responseheader.referrer_policy
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.permissions-policy: '
{{
webserver.responseheader.permissions_policy
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.cross-origin-embedder-policy: '
{{
webserver.responseheader.cross_origin_embedder_policy
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.cross-origin-opener-policy: '
{{
webserver.responseheader.cross_origin_opener_policy
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.cross-origin-resource-policy: '
{{
webserver.responseheader.cross_origin_resource_policy
}}
'
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-headers.headers.customresponseheaders.x-permitted-cross-domain-policies: '
{{
webserver.responseheader.x_permitted_cross_domain_policies
}}
'
{%
if
basicauth.enable
%}
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-auth.basicauth.users:
{{
basicauth.code
}}
{%
endif
%}
...
...
@@ -162,18 +171,6 @@ services:
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
{%
if
extradomains
|
default
([])
and
basicauth.enable
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-middleware
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-middleware.chain.middlewares:
{%
for
domain
in
extradomains
%}{%
if
loop.index
>
1
%}
,
{%
endif
%}{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex
{{
loop.index
}}
@docker
{%
endfor
%}
,
{{
webserver.type
}}
-
{{
projectname
}}
-auth@docker
{%
elseif
extradomains
|
default
([])
|
length
==
1
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex1@docker
{%
elseif
extradomains
|
default
([])
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-middleware
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-middleware.chain.middlewares:
{%
for
domain
in
extradomains
%}{%
if
loop.index
>
1
%}
,
{%
endif
%}{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex
{{
loop.index
}}
@docker
{%
endfor
%}
{%
elseif
basicauth.enable
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.middlewares:
{{
webserver.type
}}
-
{{
projectname
}}
-auth@docker
{%
endif
%}
{%
for
domain
in
extradomains
|
default
([])
%}
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex
{{
loop.index
}}
.redirectRegex.regex: "^https://
{{
domain
}}
/(.*)"
traefik.http.middlewares.
{{
webserver.type
}}
-
{{
projectname
}}
-redirectregex
{{
loop.index
}}
.redirectRegex.replacement: "https://
{{
projectdomain
}}
/$${1}"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment