kallithea Changeset - 9de61c5b8694

Changeset - 9de61c5b8694

Parent rev.

Child rev.

[Not reviewed]

default

1 3 1

Thomas De Schampheleire - 7 years ago 2018-11-18 20:02:17
thomas.de_schampheleire@nokia.com

cli: convert 'gearbox install-iis' into 'kallithea-cli iis-install'

4 files changed with 20 insertions and 36 deletions:

docs/installation_iis.rst

kallithea/bin/kallithea_cli.py

kallithea/bin/kallithea_cli_iis.py

setup.py

0 comments (0 inline, 0 general)

docs/installation_iis.rst

➞

Show inline comments

@@ @@ -50,25 +50,25 @@ the advanced settings for the applicatio @@
 to run on the website and neither will Kallithea.
 .. note::
     The application pool can be the same as an existing application pool,
     as long as the Kallithea requirements are met by the existing pool.
 ISAPI handler
 ^^^^^^^^^^^^^
 The ISAPI handler can be generated using::
-    gearbox install-iis -c my.ini --virtualdir=/
+    kallithea-cli iis-install -c my.ini --virtualdir=/
 This will generate a ``dispatch.py`` file in the current directory that contains
 the necessary components to finalize an installation into IIS. Once this file
 has been generated, it is necessary to run the following command due to the way
 that ISAPI-WSGI is made::
     python2 dispatch.py install
 This accomplishes two things: generating an ISAPI compliant DLL file,
 ``_dispatch.dll``, and installing a script map handler into IIS for the
 ``--virtualdir`` specified above pointing to ``_dispatch.dll``.

kallithea/bin/kallithea_cli.py

➞

Show inline comments

@@ @@ -8,14 +8,15 @@ @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 'cli' is the main entry point for 'kallithea-cli', specified in setup.py as entry_points console_scripts
 from kallithea.bin.kallithea_cli_base import cli
 # import commands (they will add themselves to the 'cli' object)
 import kallithea.bin.kallithea_cli_config
 import kallithea.bin.kallithea_cli_iis
 import kallithea.bin.kallithea_cli_ishell
 import kallithea.bin.kallithea_cli_repo

kallithea/bin/kallithea_cli_iis.py

➞

Show inline comments

@@ @@ -2,39 +2,33 @@ @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.lib.paster_commands.install_iis
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 IIS installation tools for Kallithea
 """
 import click
 import kallithea
 import kallithea.bin.kallithea_cli_base as cli_base
 import os
 from kallithea.lib.paster_commands.common import BasePasterCommand
 import sys
 dispath_py_template = '''\
-# Created by Kallithea 'gearbox install-iis'
+# Created by Kallithea 'kallithea-cli iis-install'
 import sys
 if hasattr(sys, "isapidllhandle"):
     import win32traceutil
 import isapi_wsgi
 import os
 def __ExtensionFactory__():
     from paste.deploy import loadapp
     from paste.script.util.logging_config import fileConfig
     fileConfig('%(inifile)s')
@@ @@ -51,47 +45,37 @@ def __ExtensionFactory__(): @@
 if __name__=='__main__':
     from isapi.install import *
     params = ISAPIParameters()
     sm = [ScriptMapParams(Extension="*", Flags=0)]
     vd = VirtualDirParameters(Name="%(virtualdir)s",
                               Description = "Kallithea",
                               ScriptMaps = sm,
                               ScriptMapUpdate = "replace")
     params.VirtualDirs = [vd]
     HandleCommandLine(params)
 '''
 class Command(BasePasterCommand):
     '''Kallithea: Install into IIS using isapi-wsgi'''
 @cli_base.register_command(config_file=True)
 @click.option('--virtualdir', default='/',
         help='The virtual folder to install into on IIS.')
 def iis_install(virtualdir):
     """Install into IIS using isapi-wsgi."""
-    requires_db_session = False
+    config_file_abs = kallithea.CONFIG['__file__']
     def take_action(self, args):
         config_file = os.path.abspath(args.config_file)
         try:
             import isapi_wsgi
         except ImportError:
             self.error('missing requirement: isapi-wsgi not installed')
         sys.stderr.write('missing requirement: isapi-wsgi not installed\n')
         sys.exit(1)
         dispatchfile = os.path.join(os.getcwd(), 'dispatch.py')
-        print 'Writing %s' % dispatchfile
+    click.echo('Writing %s' % dispatchfile)
         with open(dispatchfile, 'w') as f:
             f.write(dispath_py_template % {
                 'inifile': config_file.replace('\\', '\\\\'),
                 'virtualdir': args.virtualdir,
             'inifile': config_file_abs.replace('\\', '\\\\'),
             'virtualdir': virtualdir,
                 })
-        print ('Run \'python "%s" install\' with administrative privileges '
+    click.echo('Run \'python "%s" install\' with administrative privileges '
             'to generate the _dispatch.dll file and install it into the '
             'default web site') % (dispatchfile,)
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)
         parser.add_argument('--virtualdir',
                       action='store',
                       dest='virtualdir',
                       default='/',
                       help='The virtual folder to install into on IIS')
         return parser
         'default web site' % dispatchfile)

setup.py

➞

Show inline comments

@@ @@ -151,19 +151,18 @@ setuptools.setup( @@
     entry_points="""
     [console_scripts]
     kallithea-api =    kallithea.bin.kallithea_api:main
     kallithea-gist =   kallithea.bin.kallithea_gist:main
     kallithea-config = kallithea.bin.kallithea_config:main
     kallithea-cli =    kallithea.bin.kallithea_cli:cli
     [paste.app_factory]
     main = kallithea.config.middleware:make_app
     [gearbox.commands]
     celeryd=kallithea.lib.paster_commands.celeryd:Command
     install-iis=kallithea.lib.paster_commands.install_iis:Command
     make-index=kallithea.lib.paster_commands.make_index:Command
     make-rcext=kallithea.lib.paster_commands.make_rcextensions:Command
     setup-db=kallithea.lib.paster_commands.setup_db:Command
     upgrade-db=kallithea.lib.dbmigrate:UpgradeDb
     """,
+)

0 comments (0 inline, 0 general)