mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-17 06:52:27 +01:00
Added [an option](doc/environment.md#OPENLAB_SSL_VERIFY) to allow set verify ssl option for OpenLab
This commit is contained in:
parent
8bf6eac99b
commit
cd733053c9
@ -1,5 +1,7 @@
|
|||||||
# Changelog Fab-manager
|
# Changelog Fab-manager
|
||||||
|
|
||||||
|
- Added [an option](doc/environment.md#OPENLAB_SSL_VERIFY) to allow set verify ssl option for OpenLab
|
||||||
|
|
||||||
## v5.3.4 2022 March 01
|
## v5.3.4 2022 March 01
|
||||||
|
|
||||||
- Fix line break on home events' cards
|
- Fix line break on home events' cards
|
||||||
|
12
Gemfile.lock
12
Gemfile.lock
@ -157,7 +157,7 @@ GEM
|
|||||||
hashery (2.1.2)
|
hashery (2.1.2)
|
||||||
hashie (4.1.0)
|
hashie (4.1.0)
|
||||||
htmlentities (4.3.4)
|
htmlentities (4.3.4)
|
||||||
httparty (0.18.1)
|
httparty (0.20.0)
|
||||||
mime-types (~> 3.0)
|
mime-types (~> 3.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (1.8.10)
|
i18n (1.8.10)
|
||||||
@ -202,9 +202,9 @@ GEM
|
|||||||
message_format (0.0.6)
|
message_format (0.0.6)
|
||||||
twitter_cldr (~> 5.0)
|
twitter_cldr (~> 5.0)
|
||||||
method_source (1.0.0)
|
method_source (1.0.0)
|
||||||
mime-types (3.3.1)
|
mime-types (3.4.1)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2021.0225)
|
mime-types-data (3.2022.0105)
|
||||||
mimemagic (0.4.3)
|
mimemagic (0.4.3)
|
||||||
nokogiri (~> 1)
|
nokogiri (~> 1)
|
||||||
rake
|
rake
|
||||||
@ -245,8 +245,8 @@ GEM
|
|||||||
omniauth-rails_csrf_protection (0.1.2)
|
omniauth-rails_csrf_protection (0.1.2)
|
||||||
actionpack (>= 4.2)
|
actionpack (>= 4.2)
|
||||||
omniauth (>= 1.3.1)
|
omniauth (>= 1.3.1)
|
||||||
openlab_ruby (0.0.5)
|
openlab_ruby (0.0.7)
|
||||||
httparty (~> 0.13)
|
httparty (~> 0.20)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
parallel (1.19.1)
|
parallel (1.19.1)
|
||||||
parser (2.7.0.4)
|
parser (2.7.0.4)
|
||||||
@ -506,4 +506,4 @@ DEPENDENCIES
|
|||||||
webpacker (~> 5.x)
|
webpacker (~> 5.x)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.2.19
|
2.2.21
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
Openlab.configure do |config|
|
Openlab.configure do |config|
|
||||||
config.base_uri = Rails.application.secrets.openlab_base_uri if Rails.application.secrets.openlab_base_uri
|
config.base_uri = Rails.application.secrets.openlab_base_uri if Rails.application.secrets.openlab_base_uri
|
||||||
|
config.httparty_verify = Rails.application.secrets.openlab_ssl_verify
|
||||||
|
config.httparty_verify_peer = Rails.application.secrets.openlab_ssl_verify_peer
|
||||||
end
|
end
|
||||||
|
@ -31,6 +31,8 @@ development:
|
|||||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||||
|
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||||
|
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||||
@ -61,6 +63,8 @@ test:
|
|||||||
fullcalendar_locale: en
|
fullcalendar_locale: en
|
||||||
postgresql_language_analyzer: french
|
postgresql_language_analyzer: french
|
||||||
openlab_base_uri:
|
openlab_base_uri:
|
||||||
|
openlab_ssl_verify:
|
||||||
|
openlab_ssl_verify_peer:
|
||||||
navinum_api_login:
|
navinum_api_login:
|
||||||
navinum_api_password:
|
navinum_api_password:
|
||||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||||
@ -99,6 +103,8 @@ staging:
|
|||||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||||
|
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||||
|
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||||
@ -140,6 +146,8 @@ production:
|
|||||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||||
|
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||||
|
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||||
|
@ -147,7 +147,7 @@ A comma separated list of scopes that will be requested when authenticating with
|
|||||||
|
|
||||||
SSO_DEBUG
|
SSO_DEBUG
|
||||||
|
|
||||||
If set to `true`, the SSO authentication process will print more debug logs.
|
If set to `true`, the SSO authentication process will print more debug logs.
|
||||||
Use in accordance with LOG_LEVEL=debug.
|
Use in accordance with LOG_LEVEL=debug.
|
||||||
Please do not enable this in production, as it can expose sensitive information.
|
Please do not enable this in production, as it can expose sensitive information.
|
||||||
<a name="internationalization-settings"></a>
|
<a name="internationalization-settings"></a>
|
||||||
@ -275,6 +275,15 @@ Accordingly, `RAILS_LOCALE` and `APP_LOCALE` must be configured to `zu`.
|
|||||||
OPENLAB_BASE_URI
|
OPENLAB_BASE_URI
|
||||||
|
|
||||||
Set this variable to `https://openprojects.fab-manager.com` if you want to use the common projects repository or set it to your own OpenLab server.
|
Set this variable to `https://openprojects.fab-manager.com` if you want to use the common projects repository or set it to your own OpenLab server.
|
||||||
|
Typically, `DEFAULT_PROTOCOL` will be `https` (`http` if you are in development, or if you set `ALLOW_INSECURE_HTTP`).
|
||||||
|
The variable `DEFAULT_HOST` should be your domain name (eg. fabmanager.example.com), and is also used for visits statistics (configuration of Google Analytics).
|
||||||
|
These two variables are also used for SSO authentication.
|
||||||
|
|
||||||
|
<a name="OPENLAB_SSL_VERIFY"></a>
|
||||||
|
|
||||||
|
OPENLAB_SSL_VERIFY
|
||||||
|
|
||||||
|
Set this variable to `false` if you want to disable verify ssl certs.
|
||||||
|
|
||||||
<a name="other-settings"></a>
|
<a name="other-settings"></a>
|
||||||
## Other settings
|
## Other settings
|
||||||
|
@ -54,6 +54,7 @@ EXCEL_DATE_FORMAT=dd/mm/yyyy
|
|||||||
# OpenLab Projects
|
# OpenLab Projects
|
||||||
# do not change this URL
|
# do not change this URL
|
||||||
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
||||||
|
OPENLAB_SSL_VERIFY=true
|
||||||
|
|
||||||
# System settings
|
# System settings
|
||||||
LOG_LEVEL=debug
|
LOG_LEVEL=debug
|
||||||
|
@ -39,6 +39,7 @@ UIB_DATE_FORMAT=dd/MM/yyyy
|
|||||||
EXCEL_DATE_FORMAT=dd/mm/yyyy
|
EXCEL_DATE_FORMAT=dd/mm/yyyy
|
||||||
|
|
||||||
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
||||||
|
OPENLAB_SSL_VERIFY=true
|
||||||
|
|
||||||
LOG_LEVEL=debug
|
LOG_LEVEL=debug
|
||||||
DISK_SPACE_MB_ALERT=1024
|
DISK_SPACE_MB_ALERT=1024
|
||||||
|
Loading…
x
Reference in New Issue
Block a user