upstream/kallithea Commit - r4210:277684f2

Rename some strings in defaults found in config files

Bradley M. Kuhn -

r4210:277684f2 kallithea-2.2.5-r...

parent child

.hgignore

0 +1 -1

             ^\.project$
             ^\.pydevproject$
             ^\.coverage$
-            ^rhodecode\.db$
+            ^kallithea\.db$
             ^test\.db$
             ^RhodeCode\.egg-info$
             ^rc.*\.ini$

development.ini

0 +11 -11

             ################################################################################
             #email_to = admin@localhost
             #error_email_from = paste_error@localhost
-            #app_email_from = rhodecode-noreply@localhost
+            #app_email_from = kallithea-noreply@localhost
             #error_message =
             #email_prefix = [RhodeCode]
             ## is set to more than one worker
             #workers = 1
             ## process name
-            #proc_name = rhodecode
+            #proc_name = kallithea
             ## type of worker class, one of sync, eventlet, gevent, tornado
             ## recommended for bigger setup is using of of other than sync one
             #worker_class = sync
             #http = 0.0.0.0:5000
             ## set as deamon and redirect all output to file
-            #daemonize = ./uwsgi_rhodecode.log
+            #daemonize = ./uwsgi_kallithea.log
             ## master process PID
-            #pidfile = ./uwsgi_rhodecode.pid
+            #pidfile = ./uwsgi_kallithea.pid
             ## stats server with workers statistics, use uwsgitop
             ## for monitoring, `uwsgitop 127.0.0.1:1717`
             ## instance-id prefix
             ## a prefix key for this instance used for cache invalidation when running
-            ## multiple instances of rhodecode, make sure it's globally unique for
+            ## multiple instances of kallithea, make sure it's globally unique for
-            ## all running rhodecode instances. Leave empty if you don't use it
+            ## all running kallithea instances. Leave empty if you don't use it
             instance_id =
             ## alternative return HTTP header for failed authentication. Default HTTP
             ## db session ##
             #beaker.session.type = ext:database
-            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
             #beaker.session.table_name = db_session
             ## encrypted cookie client side session, good for many instances ##
             ## file based cookies (default) ##
             #beaker.session.type = file
-            beaker.session.key = rhodecode
+            beaker.session.key = kallithea
             beaker.session.secret = develop-rc-uytcxaz
             ## Secure encrypted cookie. Requires AES and AES python libraries
             #########################################################
             ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
             #########################################################
-            #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+            #sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
-            sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
+            sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/kallithea
-            #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+            #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/kallithea
             sqlalchemy.db1.echo = false
             sqlalchemy.db1.pool_recycle = 3600
             sqlalchemy.db1.convert_unicode = true

kallithea/bin/template.ini.mako

0 +11 -11

             </%text>
             #email_to = admin@localhost
             #error_email_from = paste_error@localhost
-            #app_email_from = rhodecode-noreply@localhost
+            #app_email_from = kallithea-noreply@localhost
             #error_message =
             #email_prefix = [RhodeCode]
             <%text>## is set to more than one worker</%text>
             workers = 1
             <%text>## process name</%text>
-            proc_name = rhodecode
+            proc_name = kallithea
             <%text>## type of worker class, one of sync, eventlet, gevent, tornado</%text>
             <%text>## recommended for bigger setup is using of of other than sync one</%text>
             worker_class = sync
             http = 0.0.0.0:5000
             <%text>## set as deamon and redirect all output to file</%text>
-            #daemonize = ./uwsgi_rhodecode.log
+            #daemonize = ./uwsgi_kallithea.log
             <%text>## master process PID</%text>
-            pidfile = ./uwsgi_rhodecode.pid
+            pidfile = ./uwsgi_kallithea.pid
             <%text>## stats server with workers statistics, use uwsgitop</%text>
             <%text>## for monitoring</%text>
             <%text>## instance-id prefix</%text>
             <%text>## a prefix key for this instance used for cache invalidation when running</%text>
-            <%text>## multiple instances of rhodecode, make sure it's globally unique for</%text>
+            <%text>## multiple instances of kallithea, make sure it's globally unique for</%text>
-            <%text>## all running rhodecode instances. Leave empty if you don't use it</%text>
+            <%text>## all running kallithea instances. Leave empty if you don't use it</%text>
             instance_id =
             <%text>## alternative return HTTP header for failed authentication. Default HTTP</%text>
             </%text>
             <%text>## db session ##</%text>
             #beaker.session.type = ext:database
-            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
             #beaker.session.table_name = db_session
             <%text>## encrypted cookie client side session, good for many instances ##</%text>
             <%text>## file based cookies (default) ##</%text>
             #beaker.session.type = file
-            beaker.session.key = rhodecode
+            beaker.session.key = kallithea
             beaker.session.secret = ${uuid()}
             <%text>## Secure encrypted cookie. Requires AES and AES python libraries</%text>
             </%text>
             %if database_engine == 'sqlite':
             # SQLITE [default]
-            sqlalchemy.db1.url = sqlite:///${here}/rhodecode.db?timeout=60
+            sqlalchemy.db1.url = sqlite:///${here}/kallithea.db?timeout=60
             %elif database_engine == 'postgres':
             # POSTGRESQL
-            sqlalchemy.db1.url = postgresql://user:pass@localhost/rhodecode
+            sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
             %elif database_engine == 'mysql':
             # MySQL
-            sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode
+            sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
             %endif
             # see sqlalchemy docs for others

kallithea/config/deployment.ini_tmpl

0 +11 -11

             ################################################################################
             #email_to = admin@localhost
             #error_email_from = paste_error@localhost
-            #app_email_from = rhodecode-noreply@localhost
+            #app_email_from = kallithea-noreply@localhost
             #error_message =
             #email_prefix = [RhodeCode]
             ## is set to more than one worker
             #workers = 1
             ## process name
-            #proc_name = rhodecode
+            #proc_name = kallithea
             ## type of worker class, one of sync, eventlet, gevent, tornado
             ## recommended for bigger setup is using of of other than sync one
             #worker_class = sync
             #http = 127.0.0.1:5000
             ## set as deamon and redirect all output to file
-            #daemonize = ./uwsgi_rhodecode.log
+            #daemonize = ./uwsgi_kallithea.log
             ## master process PID
-            #pidfile = ./uwsgi_rhodecode.pid
+            #pidfile = ./uwsgi_kallithea.pid
             ## stats server with workers statistics, use uwsgitop
             ## for monitoring, `uwsgitop 127.0.0.1:1717`
             ## instance-id prefix
             ## a prefix key for this instance used for cache invalidation when running
-            ## multiple instances of rhodecode, make sure it's globally unique for
+            ## multiple instances of kallithea, make sure it's globally unique for
-            ## all running rhodecode instances. Leave empty if you don't use it
+            ## all running kallithea instances. Leave empty if you don't use it
             instance_id =
             ## alternative return HTTP header for failed authentication. Default HTTP
             ## db session ##
             #beaker.session.type = ext:database
-            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
             #beaker.session.table_name = db_session
             ## encrypted cookie client side session, good for many instances ##
             ## file based cookies (default) ##
             #beaker.session.type = file
-            beaker.session.key = rhodecode
+            beaker.session.key = kallithea
             beaker.session.secret = ${app_instance_uuid}
             ## Secure encrypted cookie. Requires AES and AES python libraries
             #########################################################
             # SQLITE [default]
-            sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+            sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
             # POSTGRESQL
-            # sqlalchemy.db1.url = postgresql://user:pass@localhost/rhodecode
+            # sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
             # MySQL
-            # sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode
+            # sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
             # see sqlalchemy docs for others

kallithea/tests/scripts/create_rc.sh

0 +4 -4

             #!/bin/sh
-            psql -U postgres -h localhost -c 'drop database if exists rhodecode;'
+            psql -U postgres -h localhost -c 'drop database if exists kallithea;'
-            psql -U postgres -h localhost -c 'create database rhodecode;'
+            psql -U postgres -h localhost -c 'create database kallithea;'
-            paster setup-db rc.ini --force-yes --user=marcink --password=qweqwe --email=marcin@python-blog.com --repos=/home/marcink/repos --no-public-access
+            paster setup-db rc.ini --force-yes --user=username --password=qweqwe --email=username@example.com --repos=/home/username/repos --no-public-access
-            API_KEY=`psql -R " " -A -U postgres -h localhost -c "select api_key from users where admin=TRUE" -d rhodecode | awk '{print $2}'`
+            API_KEY=`psql -R " " -A -U postgres -h localhost -c "select api_key from users where admin=TRUE" -d kallithea | awk '{print $2}'`
             echo "run those after running server"
             paster serve rc.ini --pid-file=rc.pid --daemon
             sleep 3

production.ini

0 +11 -11

             ################################################################################
             #email_to = admin@localhost
             #error_email_from = paste_error@localhost
-            #app_email_from = rhodecode-noreply@localhost
+            #app_email_from = kallithea-noreply@localhost
             #error_message =
             #email_prefix = [RhodeCode]
             ## is set to more than one worker
             #workers = 1
             ## process name
-            #proc_name = rhodecode
+            #proc_name = kallithea
             ## type of worker class, one of sync, eventlet, gevent, tornado
             ## recommended for bigger setup is using of of other than sync one
             #worker_class = sync
             #http = 127.0.0.1:5000
             ## set as deamon and redirect all output to file
-            #daemonize = ./uwsgi_rhodecode.log
+            #daemonize = ./uwsgi_kallithea.log
             ## master process PID
-            #pidfile = ./uwsgi_rhodecode.pid
+            #pidfile = ./uwsgi_kallithea.pid
             ## stats server with workers statistics, use uwsgitop
             ## for monitoring, `uwsgitop 127.0.0.1:1717`
             ## instance-id prefix
             ## a prefix key for this instance used for cache invalidation when running
-            ## multiple instances of rhodecode, make sure it's globally unique for
+            ## multiple instances of kallithea, make sure it's globally unique for
-            ## all running rhodecode instances. Leave empty if you don't use it
+            ## all running kallithea instances. Leave empty if you don't use it
             instance_id =
             ## alternative return HTTP header for failed authentication. Default HTTP
             ## db session ##
             #beaker.session.type = ext:database
-            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
             #beaker.session.table_name = db_session
             ## encrypted cookie client side session, good for many instances ##
             ## file based cookies (default) ##
             #beaker.session.type = file
-            beaker.session.key = rhodecode
+            beaker.session.key = kallithea
             beaker.session.secret = production-rc-uytcxaz
             ## Secure encrypted cookie. Requires AES and AES python libraries
             #########################################################
             ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
             #########################################################
-            #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+            #sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
-            sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
+            sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/kallithea
-            #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+            #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/kallithea
             sqlalchemy.db1.echo = false
             sqlalchemy.db1.pool_recycle = 3600
             sqlalchemy.db1.convert_unicode = true

test.ini

0 +5 -5

             ################################################################################
             #email_to = admin@localhost
             #error_email_from = paste_error@localhost
-            #app_email_from = rhodecode-noreply@localhost
+            #app_email_from = kallithea-noreply@localhost
             #error_message =
             #email_prefix = [RhodeCode]
             ## instance-id prefix
             ## a prefix key for this instance used for cache invalidation when running
-            ## multiple instances of rhodecode, make sure it's globally unique for
+            ## multiple instances of kallithea, make sure it's globally unique for
-            ## all running rhodecode instances. Leave empty if you don't use it
+            ## all running kallithea instances. Leave empty if you don't use it
             instance_id =
             ## alternative return HTTP header for failed authentication. Default HTTP
             ## db session ##
             #beaker.session.type = ext:database
-            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
+            #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
             #beaker.session.table_name = db_session
             ## encrypted cookie client side session, good for many instances ##
             #beaker.session.type = file
-            beaker.session.key = rhodecode
+            beaker.session.key = kallithea
             ## secure cookie requires AES python libraries
             #beaker.session.encrypt_key = <key_for_encryption>
             #beaker.session.validate_key = <validation_key>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages