diff options
| author | Milo Casagrande <milo@ubuntu.com> | 2013-01-22 10:42:27 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo@ubuntu.com> | 2013-01-22 10:42:27 +0100 |
| commit | e99397ef9622d3f85e89107c8d4f772e742241f7 (patch) | |
| tree | 3d1e00661cee8e32390f87cf52557001d2b72285 | |
| parent | 1e331cd6528662c0f1a8154af9be8cd701616e40 (diff) | |
Fixed RabbitMQ setup string, fixed print statements.
| -rw-r--r-- | scripts/rhodecode-setup | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup index d439482..a4e8714 100644 --- a/scripts/rhodecode-setup +++ b/scripts/rhodecode-setup @@ -316,7 +316,7 @@ def setup_rabbitmq_server(user, password, vhost): execute_command(cmd_args) cmd_args = ["rabbitmqctl", "set_permissions", "-p", vhost, user, - "\".*\" \".*\" \".*\""] + '".*"', '".*"', '".*"'] execute_command(cmd_args) @@ -445,7 +445,7 @@ def start_services(no_celery): pass -def print_install_report(args, home_dir): +def print_install_report(args, home_dir, config_file): """Prints a final report with all the installation data. :param args: The command line arguments. @@ -454,6 +454,7 @@ def print_install_report(args, home_dir): print "\nRhodeCode Information" print "\tCode cloned from: %s" % args.rhodecode_git_url print "\tInstallation Dir: %s" % home_dir + print "\tConfiguration file: %s" % config_file print "\tData Dir: %s" % args.rhodecode_data_dir print "\tRepos Dir: %s" % args.repos_dir print "\tAdmin Username: %s" % args.rhodecode_admin_usr @@ -467,7 +468,7 @@ def print_install_report(args, home_dir): print "\tDatabase Backend: PostreSQL" print "\tDatabase Name: %s" % args.dbname print "\nCelery/RabbitMQ Integration\n" - print "\tCelery deactivated: %s" % args.no_celery + print "\tCelery activated: %s" % (not args.no_celery) if not args.no_celery: print "\tRabbitMQ User: %s" % args.rabbitmq_usr print "\tRabbitMQ Password: %s" % args.rabbitmq_pwd @@ -536,4 +537,4 @@ if __name__ == '__main__': install_upstart_conf(args.no_celery) - print_install_report(args, home_dir) + print_install_report(args, home_dir, rhodecode_conf) |