Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Comptoir du Libre v3 - Upcoming version
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Comptoir
Comptoir du Libre v3 - Upcoming version
Commits
234a6fd8
Commit
234a6fd8
authored
8 months ago
by
Fabrice Gangler
Browse files
Options
Downloads
Patches
Plain Diff
feat(env): add WEBAPP_EXTERNAL_SILL_* variables
parent
348e98a0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
webapp/.env
+10
-0
10 additions, 0 deletions
webapp/.env
webapp/.env.prod
+22
-0
22 additions, 0 deletions
webapp/.env.prod
webapp/config/packages/twig.yaml
+3
-0
3 additions, 0 deletions
webapp/config/packages/twig.yaml
with
35 additions
and
0 deletions
webapp/.env
+
10
−
0
View file @
234a6fd8
...
@@ -29,6 +29,11 @@
...
@@ -29,6 +29,11 @@
# - WEBAPP_TIMEZONE Time Zone of web application (default: Europe/Paris)
# - WEBAPP_TIMEZONE Time Zone of web application (default: Europe/Paris)
# - WEBAPP_TRUSTED_HOSTS List of allowed domains and IP to prevent HTTP Host header attacks
# - WEBAPP_TRUSTED_HOSTS List of allowed domains and IP to prevent HTTP Host header attacks
#######################################################################################################################
#######################################################################################################################
# - WEBAPP_EXTERNAL_SILL_HOME_URL SILL website URL
# - WEBAPP_EXTERNAL_SILL_SOFWARE_FR_LINK SILL French URL to display a software.
# - WEBAPP_EXTERNAL_SILL_SOFWARE_EN_LINK SILL English URL to display a software.
# - WEBAPP_EXTERNAL_SILL_JSON_DATA_URL URL of SILL data in JSON format
#######################################################################################################################
# - WEBAPP_USER_CONFIG_RESET_PASSWORD_TOKEN_LIFETIME Lifetime of reset password token in seconds (default: 1200 = 20 minutes).
# - WEBAPP_USER_CONFIG_RESET_PASSWORD_TOKEN_LIFETIME Lifetime of reset password token in seconds (default: 1200 = 20 minutes).
# - WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH Minimum user password length (default: 12)
# - WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH Minimum user password length (default: 12)
# - WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY Public display of software version (default: true)
# - WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY Public display of software version (default: true)
...
@@ -84,6 +89,11 @@ WEBAPP_USER_CONFIG_PASSWORD_RESET_TOKEN_LIFETIME=1200
...
@@ -84,6 +89,11 @@ WEBAPP_USER_CONFIG_PASSWORD_RESET_TOKEN_LIFETIME=1200
WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH=12
WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH=12
WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY=true
WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY=true
#######################################################################
#######################################################################
WEBAPP_EXTERNAL_SILL_HOME_URL='https://code.gouv.fr/sill/'
WEBAPP_EXTERNAL_SILL_SOFWARE_FR_LINK='https://code.gouv.fr/sill/fr/software?id='
WEBAPP_EXTERNAL_SILL_SOFWARE_EN_LINK='https://code.gouv.fr/sill/en/software?id='
WEBAPP_EXTERNAL_SILL_JSON_DATA_URL='https://code.gouv.fr/sill/api/sill.json'
#######################################################################
# Webapp - List of allowed domains and IP to prevent HTTP Host header attacks
# Webapp - List of allowed domains and IP to prevent HTTP Host header attacks
WEBAPP_TRUSTED_HOSTS=''
WEBAPP_TRUSTED_HOSTS=''
...
...
This diff is collapsed.
Click to expand it.
webapp/.env.prod
+
22
−
0
View file @
234a6fd8
...
@@ -29,11 +29,18 @@
...
@@ -29,11 +29,18 @@
# - WEBAPP_TIMEZONE Time Zone of web application (default: Europe/Paris)
# - WEBAPP_TIMEZONE Time Zone of web application (default: Europe/Paris)
# - WEBAPP_TRUSTED_HOSTS List of allowed domains and IP to prevent HTTP Host header attacks
# - WEBAPP_TRUSTED_HOSTS List of allowed domains and IP to prevent HTTP Host header attacks
#######################################################################################################################
#######################################################################################################################
# - WEBAPP_EXTERNAL_SILL_HOME_URL SILL website URL
# - WEBAPP_EXTERNAL_SILL_SOFWARE_FR_LINK SILL French URL to display a software
# - WEBAPP_EXTERNAL_SILL_SOFWARE_EN_LINK SILL English URL to display a software
# - WEBAPP_EXTERNAL_SILL_JSON_DATA_URL URL of SILL data in JSON format
#######################################################################################################################
# - WEBAPP_USER_CONFIG_RESET_PASSWORD_TOKEN_LIFETIME Lifetime of reset password token in seconds (default: 1200 = 20 minutes).
# - WEBAPP_USER_CONFIG_RESET_PASSWORD_TOKEN_LIFETIME Lifetime of reset password token in seconds (default: 1200 = 20 minutes).
# - WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH Minimum user password length (default: 12)
# - WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH Minimum user password length (default: 12)
# - WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY Public display of software version (default: true)
# - WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY Public display of software version (default: true)
#######################################################################################################################
#######################################################################################################################
# Environment
# Environment
APP_ENV=prod
APP_ENV=prod
...
@@ -100,6 +107,21 @@ WEBAPP_TRUSTED_HOSTS='^example\.org$'
...
@@ -100,6 +107,21 @@ WEBAPP_TRUSTED_HOSTS='^example\.org$'
# WEBAPP_TRUSTED_HOSTS='^(.+\.)?example\.org$'
# WEBAPP_TRUSTED_HOSTS='^(.+\.)?example\.org$'
##################################################################################################
##################################################################################################
#######################################################################################################################
# SILL website URL
WEBAPP_EXTERNAL_SILL_HOME_URL='https://code.gouv.fr/sill/'
# SILL French URL to display a software
WEBAPP_EXTERNAL_SILL_SOFWARE_FR_LINK='https://code.gouv.fr/sill/fr/software?id='
# SILL English URL to display a software
WEBAPP_EXTERNAL_SILL_SOFWARE_EN_LINK='https://code.gouv.fr/sill/en/software?id='
# URL of SILL data in JSON format
WEBAPP_EXTERNAL_SILL_JSON_DATA_URL='https://code.gouv.fr/sill/api/sill.json'
#######################################################################################################################
#######################################################################################################################
# Lifetime of reset password token in seconds
# Lifetime of reset password token in seconds
...
...
This diff is collapsed.
Click to expand it.
webapp/config/packages/twig.yaml
+
3
−
0
View file @
234a6fd8
...
@@ -6,6 +6,9 @@ twig:
...
@@ -6,6 +6,9 @@ twig:
software_name
:
'
%env(SOFTWARE_NAME)%'
software_name
:
'
%env(SOFTWARE_NAME)%'
software_release
:
'
%env(SOFTWARE_RELEASE)%'
software_release
:
'
%env(SOFTWARE_RELEASE)%'
software_release_allow_public_display
:
'
%env(bool:WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY)%'
software_release_allow_public_display
:
'
%env(bool:WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY)%'
external_sill_hompage
:
'
%env(WEBAPP_EXTERNAL_SILL_HOME_URL)%'
external_sill_software_fr_link
:
'
%env(WEBAPP_EXTERNAL_SILL_SOFWARE_FR_LINK)%'
external_sill_software_en_link
:
'
%env(WEBAPP_EXTERNAL_SILL_SOFWARE_EN_LINK)%'
when@test
:
when@test
:
twig
:
twig
:
...
...
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