##// END OF EJS Templates
fix(tests): explicitly disable env_expand for test suite to prevent problems with DB connections during tests
super-admin -
r5549:4be441f6 default
parent child Browse files
Show More
@@ -71,6 +71,9 b' use = egg:rhodecode-enterprise-ce'
71 ; enable proxy prefix middleware, defined above
71 ; enable proxy prefix middleware, defined above
72 #filter-with = proxy-prefix
72 #filter-with = proxy-prefix
73
73
74 ; control if environmental variables to be expanded into the .ini settings
75 #rhodecode.env_expand = true
76
74 ; #############
77 ; #############
75 ; DEBUG OPTIONS
78 ; DEBUG OPTIONS
76 ; #############
79 ; #############
@@ -71,6 +71,9 b' use = egg:rhodecode-enterprise-ce'
71 ; enable proxy prefix middleware, defined above
71 ; enable proxy prefix middleware, defined above
72 #filter-with = proxy-prefix
72 #filter-with = proxy-prefix
73
73
74 ; control if environmental variables to be expanded into the .ini settings
75 #rhodecode.env_expand = true
76
74 ; encryption key used to encrypt social plugin tokens,
77 ; encryption key used to encrypt social plugin tokens,
75 ; remote_urls with credentials etc, if not set it defaults to
78 ; remote_urls with credentials etc, if not set it defaults to
76 ; `beaker.session.secret`
79 ; `beaker.session.secret`
@@ -109,6 +109,9 b' class SettingsMaker:'
109 return envvar_value
109 return envvar_value
110
110
111 def env_expand(self):
111 def env_expand(self):
112 if self.settings.get('rhodecode.env_expand') == 'false':
113 return
114
112 replaced = {}
115 replaced = {}
113 for k, v in self.settings.items():
116 for k, v in self.settings.items():
114 if k not in set_keys:
117 if k not in set_keys:
@@ -71,6 +71,9 b' use = egg:rhodecode-enterprise-ce'
71 ; enable proxy prefix middleware, defined above
71 ; enable proxy prefix middleware, defined above
72 #filter-with = proxy-prefix
72 #filter-with = proxy-prefix
73
73
74 ; control if environmental variables to be expanded into the .ini settings
75 rhodecode.env_expand = false
76
74 ; encryption key used to encrypt social plugin tokens,
77 ; encryption key used to encrypt social plugin tokens,
75 ; remote_urls with credentials etc, if not set it defaults to
78 ; remote_urls with credentials etc, if not set it defaults to
76 ; `beaker.session.secret`
79 ; `beaker.session.secret`
@@ -225,6 +228,13 b' license_token = abra-cada-bra1-rce3'
225 ; This flag hides sensitive information on the license page such as token, and license data
228 ; This flag hides sensitive information on the license page such as token, and license data
226 license.hide_license_info = false
229 license.hide_license_info = false
227
230
231 ; Import EE license from this license path
232 #license.import_path = %(here)s/rhodecode_enterprise.license
233
234 ; import license 'if-missing' or 'force' (always override)
235 ; if-missing means apply license if it doesn't exist. 'force' option always overrides it
236 license.import_path_mode = if-missing
237
228 ; supervisor connection uri, for managing supervisor and logs.
238 ; supervisor connection uri, for managing supervisor and logs.
229 supervisor.uri =
239 supervisor.uri =
230
240
@@ -658,6 +668,12 b' vcs.connection_timeout = 3600'
658 ; It uses cache_region `cache_repo`
668 ; It uses cache_region `cache_repo`
659 vcs.methods.cache = false
669 vcs.methods.cache = false
660
670
671 ; Filesystem location where Git lfs objects should be stored
672 vcs.git.lfs.storage_location = /var/opt/rhodecode_repo_store/.cache/git_lfs_store
673
674 ; Filesystem location where Mercurial largefile objects should be stored
675 vcs.hg.largefiles.storage_location = /var/opt/rhodecode_repo_store/.cache/hg_largefiles_store
676
661 ; ####################################################
677 ; ####################################################
662 ; Subversion proxy support (mod_dav_svn)
678 ; Subversion proxy support (mod_dav_svn)
663 ; Maps RhodeCode repo groups into SVN paths for Apache
679 ; Maps RhodeCode repo groups into SVN paths for Apache
General Comments 0
You need to be logged in to leave comments. Login now