kallithea Changeset - a4715df40299

Changeset - a4715df40299

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 8 years ago 2017-05-30 02:59:45
mads@kiilerich.com

make-config: use %(here)s in the generated file instead of hardcoding absolute path

Restore what paster make-config did until we introduced gearbox in
d2aa8b1625a4. The make-config sub command was re-introduced in 6c8af2d22deb but
created files with absolute paths.

3 files changed with 8 insertions and 12 deletions:

kallithea/lib/paster_commands/make_config.py

kallithea/lib/paster_commands/template.ini.mako

scripts/generate-ini.py

0 comments (0 inline, 0 general)

kallithea/lib/paster_commands/make_config.py

➞

Show inline comments

@@ @@ -116,25 +116,24 @@ def _run(args): @@
                 kwargs[k] = v
         # update our template stored args
         tmpl_stored_args.update(kwargs)
     if args.show_defaults:
         for k,v in tmpl_stored_args.iteritems():
             print '%s=%s' % (k, v)
         sys.exit(0)
     # use default that cannot be replaced
     tmpl_stored_args.update({
         'uuid': lambda: uuid.uuid4().hex,
         'here': os.path.dirname(os.path.abspath(args.config_file)),
     })
     try:
         # built in template
         tmpl_file = os.path.join(here, TMPL)
         with open(tmpl_file, 'rb') as f:
             tmpl_data = f.read().decode('utf-8')
             tmpl = Template(tmpl_data).render(**tmpl_stored_args)
         with open(args.config_file, 'wb') as f:
             f.write(tmpl.encode('utf-8'))
         print 'Wrote new config file in %s' % (os.path.abspath(args.config_file))

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%text>################################################################################</%text>
 <%text>################################################################################</%text>
 # Kallithea - config file generated with kallithea-config                      #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 <%text>################################################################################</%text>
 <%text>################################################################################</%text>
 [DEFAULT]
 <%text>################################################################################</%text>
 <%text>## Email settings                                                             ##</%text>
 <%text>##                                                                            ##</%text>
 <%text>## Refer to the documentation ("Email settings") for more details.            ##</%text>
 <%text>##                                                                            ##</%text>
 <%text>## It is recommended to use a valid sender address that passes access         ##</%text>
 <%text>## validation and spam filtering in mail servers.                             ##</%text>
@@ @@ -173,33 +175,33 @@ port = ${port} @@
 #prefix = /<your-prefix>
 [app:main]
 use = egg:kallithea
 <%text>## enable proxy prefix middleware</%text>
 #filter-with = proxy-prefix
 full_stack = true
 static_files = true
 <%text>## Available Languages:</%text>
 <%text>## cs de fr hu ja nl_BE pl pt_BR ru sk zh_CN zh_TW</%text>
 lang =
 cache_dir = ${here}/data
 index_dir = ${here}/data/index
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 <%text>## perform a full repository scan on each server start, this should be</%text>
 <%text>## set to false after first startup, to allow faster server restarts.</%text>
 initial_repo_scan = false
 <%text>## uncomment and set this path to use archive download cache</%text>
-archive_cache_dir = ${here}/tarballcache
+archive_cache_dir = %(here)s/tarballcache
 <%text>## change this to unique ID for security</%text>
 app_instance_uuid = ${uuid()}
 <%text>## cut off limit for large diffs (size in bytes)</%text>
 cut_off_limit = 256000
 <%text>## force https in Kallithea, fixes https redirects, assumes it's always https</%text>
 force_https = false
 <%text>## use Strict-Transport-Security headers</%text>
 use_htsts = false
@@ @@ -328,26 +330,26 @@ celery.result.serialier = json @@
 #celery.amqp.task.result.expires = 18000
 celeryd.concurrency = 2
 celeryd.max.tasks.per.child = 1
 <%text>## If true, tasks will never be sent to the queue, but executed locally instead.</%text>
 celery.always.eager = false
 <%text>####################################</%text>
 <%text>###         BEAKER CACHE        ####</%text>
 <%text>####################################</%text>
 beaker.cache.data_dir = ${here}/data/cache/data
 beaker.cache.lock_dir = ${here}/data/cache/lock
 beaker.cache.data_dir = %(here)s/data/cache/data
 beaker.cache.lock_dir = %(here)s/data/cache/lock
 beaker.cache.regions = short_term,long_term,sql_cache_short
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
 beaker.cache.short_term.key_length = 256
 beaker.cache.long_term.type = memory
 beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 beaker.cache.sql_cache_short.type = memory
@@ @@ -485,25 +487,25 @@ debug = false @@
 <%text>##################################</%text>
 logview.sqlalchemy = #faa
 logview.pylons.templating = #bfb
 logview.pylons.util = #eee
 <%text>#########################################################</%text>
 <%text>### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###</%text>
 <%text>#########################################################</%text>
 %if database_engine == 'sqlite':
 # SQLITE [default]
-sqlalchemy.url = sqlite:///${here}/kallithea.db?timeout=60
+sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
 %elif database_engine == 'postgres':
 # POSTGRESQL
 sqlalchemy.url = postgresql://user:pass@localhost/kallithea
 %elif database_engine == 'mysql':
 # MySQL
 sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
 %endif
 # see sqlalchemy docs for others

scripts/generate-ini.py

➞

Show inline comments

@@ @@ -12,37 +12,34 @@ makofile = 'kallithea/lib/paster_command @@
 # the mako conditionals used in all other ini files and templates
 selected_mako_conditionals = set([
     "database_engine == 'sqlite'",
     "http_server == 'waitress'",
     "error_aggregation_service == 'appenlight'",
     "error_aggregation_service == 'sentry'",
 ])
 # the mako variables used in all other ini files and templates
 mako_variable_values = {
     'host': '127.0.0.1',
     'port': '5000',
     'here': '%(here)s',
     'uuid()': '${app_instance_uuid}',
+}
 # files to be generated from the mako template
 ini_files = [
     ('kallithea/tests/test.ini',
         '''
         Kallithea - config for tests:
         sqlalchemy and kallithea_test.sqlite
         custom logging
         The %(here)s variable will be replaced with the parent directory of this file
         ''',
+        {
             '[server:main]': {
                 'port': '4999',
             },
             '[app:main]': {
                 'app_instance_uuid': 'test',
                 'show_revision_number': 'true',
                 'beaker.cache.sql_cache_short.expire': '1',
                 'beaker.session.secret': '{74e0cd75-b339-478b-b129-07dd221def1f}',
                 'cache_dir': '%(here)s/../../data/test/cache',
                 'index_dir': '%(here)s/../../data/test/index',
@@ @@ -63,26 +60,24 @@ ini_files = [ @@
                 'formatter': 'color_formatter_sql',
             },
         },
     ),
     ('development.ini',
         '''
         Kallithea - Development config:
         listening on *:5000
         sqlite and kallithea.db
         initial_repo_scan = true
         debug = true
         verbose and colorful logging
         The %(here)s variable will be replaced with the parent directory of this file
         ''',
+        {
             '[server:main]': {
                 'host': '0.0.0.0',
             },
             '[app:main]': {
                 'initial_repo_scan': 'true',
                 'debug': 'true',
                 'app_instance_uuid': 'development-not-secret',
                 'beaker.session.secret': 'development-not-secret',
             },
             '[handler_console]': {

0 comments (0 inline, 0 general)