kallithea Changeset - a185042de98a

Changeset - a185042de98a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 6 years ago 2019-06-30 13:31:56
mads@kiilerich.com

kallithea-cli: set kallithea_cli_path when creating .ini file so it doesn't have to be set manually before using ssh

3 files changed with 14 insertions and 0 deletions:

kallithea/bin/kallithea_cli_base.py

kallithea/bin/kallithea_cli_config.py

kallithea/lib/paster_commands/template.ini.mako

0 comments (0 inline, 0 general)

kallithea/bin/kallithea_cli_base.py

➞

Show inline comments

@@ @@ -12,18 +12,28 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import click
 import functools
 import os
 import sys
 import kallithea
 import logging.config
 import paste.deploy
 # kallithea_cli is usually invoked through the 'kallithea-cli' wrapper script
 # that is installed by setuptools, as specified in setup.py console_scripts
 # entry_points. The script will be using the right virtualenv (if any), and for
 # Unix, it will contain #! pointing at the right python executable. The script
 # also makes sure sys.argv[0] points back at the script path, and that is what
 # can be used to invoke 'kallithea-cli' later.
 kallithea_cli_path = sys.argv[0]
 # This placeholder is the main entry point for the kallithea-cli command
 @click.group(context_settings=dict(help_option_names=['-h', '--help']))
 def cli():
     """Various commands to manage a Kallithea instance."""
 def register_command(config_file=False, config_file_initialize_app=False, hidden=False):

kallithea/bin/kallithea_cli_config.py

➞

Show inline comments

@@ @@ -60,12 +60,13 @@ def config_create(config_file, key_value @@
     should go.
     """
     mako_variable_values = {
         'git_hook_interpreter': sys.executable,
         'user_home_path': os.path.expanduser('~'),
         'kallithea_cli_path': cli_base.kallithea_cli_path,
+    }
     ini_settings = defaultdict(dict)
     section_name = None
     for parameter in key_value_pairs:
         parts = parameter.split('=', 1)

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -334,12 +334,15 @@ ssh_enabled = false @@
 %if user_home_path:
 ssh_authorized_keys = ${user_home_path}/.ssh/authorized_keys
 %endif
 <%text>## Path to be used in ssh_authorized_keys file to invoke kallithea-cli with ssh-serve.</%text>
 #kallithea_cli_path = /srv/kallithea/venv/bin/kallithea-cli
 %if kallithea_cli_path:
 kallithea_cli_path = ${kallithea_cli_path}
 %endif
 <%text>####################################</%text>
 <%text>###        CELERY CONFIG        ####</%text>
 <%text>####################################</%text>
 use_celery = false

0 comments (0 inline, 0 general)