Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Traefik
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
library
Traefik
Merge requests
!9
Merging develop into main
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Merging develop into main
develop
into
main
Overview
0
Commits
1
Pipelines
2
Changes
1
Merged
jurgenhaas
requested to merge
develop
into
main
2 years ago
Overview
0
Commits
1
Pipelines
2
Changes
1
Expand
Add CI config
composer/plugin/drupal-environment#7 (closed)
Add PHP quality tools
Update Traefik to 2.7 Add support for Traefik Hub
#9 (closed)
Name containers explicitly
#8 (closed)
Changing ownership of new files and directories to the user
#8 (closed)
Fix typo
#8 (closed)
Only change ownership if we have a user env variable
Support for Drupal 10
Bump PHP version
Update Traefik to 2.9 Update Portainer to 2.17.1 Update Hub to 1.0.1 Add support for automatic cert renewal with http or dns challenge
Fix portainer and hub router config
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
45b13f5a
1 commit,
2 years ago
1 file
+
4
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Traefik.php
+
4
−
6
Options
@@ -329,12 +329,10 @@ class Traefik {
$config
[
'services'
][
'traefik'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls=true'
;
$config
[
'services'
][
'traefik'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls.certresolver=lakedrops'
;
if
(
$this
->
addon_portainer
)
{
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls=true'
;
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls.certresolver=lakedrops'
;
}
if
(
$this
->
hub_token
)
{
$config
[
'services'
][
'hub-agent'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls=true'
;
$config
[
'services'
][
'hub-agent'
][
'labels'
][]
=
'traefik.http.routers.traefik.tls.certresolver=lakedrops'
;
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.frontend.tls=true'
;
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.frontend.tls.certresolver=lakedrops'
;
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.edge.tls=true'
;
$config
[
'services'
][
'portainer'
][
'labels'
][]
=
'traefik.http.routers.edge.tls.certresolver=lakedrops'
;
}
if
(
$this
->
dns_challenge
&&
$this
->
dns_challenge_provider
!==
''
)
{
$config
[
'services'
][
'traefik'
][
'command'
][]
=
'--certificatesresolvers.lakedrops.acme.dnschallenge=true'
;
Loading