Changeset - 08c0326e9127
Parent rev.
Child rev.
[Not reviewed]
Merge default
0 3 0
Mads Kiilerich - 6 years ago 2020-02-12 14:52:11
mads@kiilerich.com
Merge stable
3 files changed with 19 insertions and 13 deletions:
development.ini
9
6
kallithea/lib/paster_commands/template.ini.mako
9
6
kallithea/templates/base/base.html
1
1
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -45,29 +45,29 @@ email_to =
 
## Default: (none)
 
## Examples:
 
#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 
#error_email_from = kallithea_errors@example.com
 
error_email_from =
 

			




	
	
	
		
 
## SMTP server settings

			




	
	
	
		
 
## If specifying credentials, make sure to use secure connections.

			




	
	
	
		
 
## Default: Send unencrypted unauthenticated mails to the specified smtp_server.

			




	
	
	
		
 
## For "SSL", use smtp_use_ssl = true and smtp_port = 465.

			




	
	
	
		
 
## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587.

			




	
	
	
		
 
smtp_server =

			




	
	
	
		
 
#smtp_username =

			




	
	
	
		
 
#smtp_password =

			




	
	
	
		
 
smtp_username =

			




	
	
	
		
 
smtp_password =

			




	
	
	
		
 
smtp_port =

			




	
	
	
		
 
#smtp_use_ssl = false

			




	
	
	
		
 
#smtp_use_tls = false

			




	
	
	
		
 
smtp_use_ssl = false

			




	
	
	
		
 
smtp_use_tls = false

			




	
	
	
		
 

			




	
	
	
		
 
## Entry point for 'gearbox serve'

			




	
	
	
		
 
[server:main]

			




	
	
	
		
 
#host = 127.0.0.1

			




	
	
	
		
 
host = 0.0.0.0

			




	
	
	
		
 
port = 5000

			




	
	
	
		
 

			




	
	
	
		
 
## WAITRESS ##

			




	
	
	
		
 
use = egg:waitress#main

			




	
	
	
		
 
## number of worker threads

			




	
	
	
		
 
threads = 1

			




	
	
	
		
 
## MAX BODY SIZE 100GB

			




	
	
		
 
@@ -250,25 +250,25 @@ ssh_enabled = false

			




	
	
	
		
 
###        CELERY CONFIG        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 

			




	
	
	
		
 
use_celery = false

			




	
	
	
		
 

			




	
	
	
		
 
## Example: connect to the virtual host 'rabbitmqhost' on localhost as rabbitmq:

			




	
	
	
		
 
broker.url = amqp://rabbitmq:qewqew@localhost:5672/rabbitmqhost

			




	
	
	
		
 

			




	
	
	
		
 
celery.imports = kallithea.lib.celerylib.tasks

			




	
	
	
		
 
celery.accept.content = pickle

			




	
	
	
		
 
celery.result.backend = amqp

			




	
	
	
		
 
celery.result.dburi = amqp://

			




	
	
	
		
 
celery.result.serialier = json

			




	
	
	
		
 
celery.result.serializer = json

			




	
	
	
		
 

			




	
	
	
		
 
#celery.send.task.error.emails = true

			




	
	
	
		
 
#celery.amqp.task.result.expires = 18000

			




	
	
	
		
 

			




	
	
	
		
 
celeryd.concurrency = 2

			




	
	
	
		
 
celeryd.max.tasks.per.child = 1

			




	
	
	
		
 

			




	
	
	
		
 
## If true, tasks will never be sent to the queue, but executed locally instead.

			




	
	
	
		
 
celery.always.eager = false

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###         BEAKER CACHE        ####

			




	
	
		
 
@@ -321,28 +321,31 @@ session.secret = development-not-secret

			




	
	
	
		
 

			




	
	
	
		
 
## Database storage of session data.

			




	
	
	
		
 
#session.type = ext:database

			




	
	
	
		
 
#session.sa.url = postgresql://postgres:qwe@localhost/kallithea

			




	
	
	
		
 
#session.table_name = db_session

			




	
	
	
		
 

			




	
	
	
		
 
############################

			




	
	
	
		
 
## ERROR HANDLING SYSTEMS ##

			




	
	
	
		
 
############################

			




	
	
	
		
 

			




	
	
	
		
 
# Propagate email settings to ErrorReporter of TurboGears2

			




	
	
	
		
 
# You do not normally need to change these lines

			




	
	
	
		
 
get trace_errors.error_email = email_to

			




	
	
	
		
 
get trace_errors.smtp_server = smtp_server

			




	
	
	
		
 
get trace_errors.smtp_port = smtp_port

			




	
	
	
		
 
get trace_errors.from_address = error_email_from

			




	
	
	
		
 
get trace_errors.error_email = email_to

			




	
	
	
		
 
get trace_errors.smtp_username = smtp_username

			




	
	
	
		
 
get trace_errors.smtp_password = smtp_password

			




	
	
	
		
 
get trace_errors.smtp_use_tls = smtp_use_tls

			




	
	
	
		
 

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## WARNING: *DEBUG MODE MUST BE OFF IN A PRODUCTION ENVIRONMENT*              ##

			




	
	
	
		
 
## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##

			




	
	
	
		
 
## execute malicious code after an exception is raised.                       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
#debug = false

			




	
	
	
		
 
debug = true

			




	
	
	
		
 

			




	
	
	
		
 
##################################

			




	
	
	
		
 
###       LOGVIEW CONFIG       ###

			




	
	
	
		
 
##################################

			




        

    


    
    

    

        

                

                    kallithea/lib/paster_commands/template.ini.mako
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -46,29 +46,29 @@ email_to =

			




	
	
	
		
 
<%text>## Default: (none)</%text>

			




	
	
	
		
 
<%text>## Examples:</%text>

			




	
	
	
		
 
#error_email_from = Kallithea Errors <kallithea-noreply@example.com>

			




	
	
	
		
 
#error_email_from = kallithea_errors@example.com

			




	
	
	
		
 
error_email_from =

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## SMTP server settings</%text>

			




	
	
	
		
 
<%text>## If specifying credentials, make sure to use secure connections.</%text>

			




	
	
	
		
 
<%text>## Default: Send unencrypted unauthenticated mails to the specified smtp_server.</%text>

			




	
	
	
		
 
<%text>## For "SSL", use smtp_use_ssl = true and smtp_port = 465.</%text>

			




	
	
	
		
 
<%text>## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587.</%text>

			




	
	
	
		
 
smtp_server =

			




	
	
	
		
 
#smtp_username =

			




	
	
	
		
 
#smtp_password =

			




	
	
	
		
 
smtp_username =

			




	
	
	
		
 
smtp_password =

			




	
	
	
		
 
smtp_port =

			




	
	
	
		
 
#smtp_use_ssl = false

			




	
	
	
		
 
#smtp_use_tls = false

			




	
	
	
		
 
smtp_use_ssl = false

			




	
	
	
		
 
smtp_use_tls = false

			




	
	
	
		
 

			




	
	
	
		
 
%if http_server != 'uwsgi':

			




	
	
	
		
 
<%text>## Entry point for 'gearbox serve'</%text>

			




	
	
	
		
 
[server:main]

			




	
	
	
		
 
host = ${host}

			




	
	
	
		
 
port = ${port}

			




	
	
	
		
 

			




	
	
	
		
 
%if http_server == 'gearbox':

			




	
	
	
		
 
<%text>## Gearbox default web server ##</%text>

			




	
	
	
		
 
use = egg:gearbox#wsgiref

			




	
	
	
		
 
<%text>## nr of worker threads to spawn</%text>

			




	
	
	
		
 
threadpool_workers = 1

			




	
	
		
 
@@ -356,25 +356,25 @@ ssh_locale = ${ssh_locale}

			




	
	
	
		
 
<%text>###        CELERY CONFIG        ####</%text>

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
use_celery = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Example: connect to the virtual host 'rabbitmqhost' on localhost as rabbitmq:</%text>

			




	
	
	
		
 
broker.url = amqp://rabbitmq:qewqew@localhost:5672/rabbitmqhost

			




	
	
	
		
 

			




	
	
	
		
 
celery.imports = kallithea.lib.celerylib.tasks

			




	
	
	
		
 
celery.accept.content = pickle

			




	
	
	
		
 
celery.result.backend = amqp

			




	
	
	
		
 
celery.result.dburi = amqp://

			




	
	
	
		
 
celery.result.serialier = json

			




	
	
	
		
 
celery.result.serializer = json

			




	
	
	
		
 

			




	
	
	
		
 
#celery.send.task.error.emails = true

			




	
	
	
		
 
#celery.amqp.task.result.expires = 18000

			




	
	
	
		
 

			




	
	
	
		
 
celeryd.concurrency = 2

			




	
	
	
		
 
celeryd.max.tasks.per.child = 1

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## If true, tasks will never be sent to the queue, but executed locally instead.</%text>

			




	
	
	
		
 
celery.always.eager = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 
<%text>###         BEAKER CACHE        ####</%text>

			




	
	
		
 
@@ -426,28 +426,31 @@ session.secret = ${uuid()}

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Database storage of session data.</%text>

			




	
	
	
		
 
#session.type = ext:database

			




	
	
	
		
 
#session.sa.url = postgresql://postgres:qwe@localhost/kallithea

			




	
	
	
		
 
#session.table_name = db_session

			




	
	
	
		
 

			




	
	
	
		
 
<%text>############################</%text>

			




	
	
	
		
 
<%text>## ERROR HANDLING SYSTEMS ##</%text>

			




	
	
	
		
 
<%text>############################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
# Propagate email settings to ErrorReporter of TurboGears2

			




	
	
	
		
 
# You do not normally need to change these lines

			




	
	
	
		
 
get trace_errors.error_email = email_to

			




	
	
	
		
 
get trace_errors.smtp_server = smtp_server

			




	
	
	
		
 
get trace_errors.smtp_port = smtp_port

			




	
	
	
		
 
get trace_errors.from_address = error_email_from

			




	
	
	
		
 
get trace_errors.error_email = email_to

			




	
	
	
		
 
get trace_errors.smtp_username = smtp_username

			




	
	
	
		
 
get trace_errors.smtp_password = smtp_password

			




	
	
	
		
 
get trace_errors.smtp_use_tls = smtp_use_tls

			




	
	
	
		
 

			




	
	
	
		
 
%if error_aggregation_service == 'appenlight':

			




	
	
	
		
 
<%text>####################</%text>

			




	
	
	
		
 
<%text>### [appenlight] ###</%text>

			




	
	
	
		
 
<%text>####################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## AppEnlight is tailored to work with Kallithea, see</%text>

			




	
	
	
		
 
<%text>## http://appenlight.com for details how to obtain an account</%text>

			




	
	
	
		
 
<%text>## you must install python package `appenlight_client` to make it work</%text>

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## appenlight enabled</%text>

			




	
	
	
		
 
appenlight = false

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -154,25 +154,25 @@

			




	
	
	
		
 
              %if c.db_repo.fork:

			




	
	
	
		
 
               <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">

			




	
	
	
		
 
                   <i class="icon-git-compare"></i>${_('Compare Fork')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i>${_('Compare')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i>${_('Search')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              ## TODO: this check feels wrong, it would be better to have a check for permissions

			




	
	
	
		
 
              ## also it feels like a job for the controller

			




	
	
	
		
 
              %if request.authuser.username != 'default':

			




	
	
	
		
 
                  <li>

			




	
	
	
		
 
                   <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});">

			




	
	
	
		
 
                   <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="return toggleFollowingRepo(this, ${c.db_repo.repo_id});">

			




	
	
	
		
 
                    <span class="show-follow"><i class="icon-heart-empty"></i>${_('Follow')}</span>

			




	
	
	
		
 
                    <span class="show-following"><i class="icon-heart"></i>${_('Unfollow')}</span>

			




	
	
	
		
 
                   </a>

			




	
	
	
		
 
                  </li>

			




	
	
	
		
 
                  <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-fork"></i>${_('Fork')}</a></li>

			




	
	
	
		
 
                  <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i>${_('Create Pull Request')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
             </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    </div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.