diff --git a/rhodecode/websetup.py b/rhodecode/websetup.py --- a/rhodecode/websetup.py +++ b/rhodecode/websetup.py @@ -4,26 +4,24 @@ ~~~~~~~~~~~~~~~~~~ Weboperations and setup for rhodecode - + :created_on: Dec 11, 2010 :author: marcink - :copyright: (C) 2009-2010 Marcin Kuzminski + :copyright: (C) 2009-2011 Marcin Kuzminski :license: GPLv3, see COPYING for more details. """ -# 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; version 2 -# of the License or (at your opinion) any later version of the license. -# +# 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. +# along with this program. If not, see . import os import logging @@ -34,21 +32,18 @@ from rhodecode.lib.db_manage import DbMa log = logging.getLogger(__name__) + def setup_app(command, conf, vars): """Place any commands to setup rhodecode here""" dbconf = conf['sqlalchemy.db1.url'] - dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], tests=False) + dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], + tests=False) dbmanage.create_tables(override=True) dbmanage.set_db_version() - dbmanage.config_prompt(None) + dbmanage.create_settings(dbmanage.config_prompt(None)) dbmanage.create_default_user() dbmanage.admin_prompt() dbmanage.create_permissions() dbmanage.populate_default_permissions() load_environment(conf.global_conf, conf.local_conf, initial=True) - - - - -