public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:samuelclay/NewsBlur

Browse source 
Conflicts:
	fabfile.py
This commit is contained in:
Samuel Clay 2011-03-28 10:10:01 -04:00
commit e09b5f7c58
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/hosts
View file

@ -3,11 +3,11 @@
# 10.10 app01
# 10.5.1.100 db01
# 10.10 task01
# 10.5.1.101 task02
# 10.5.1.101 task02
199.15.250.228 app01 app01.newsblur.com
199.15.253.162 db01 db01.newsblur.com
199.15.250.229 task01 task01.newsblur.com
199.15.250.230 task02 task02.newsblur.com
199.15.250.231 task03 task03.newsblur.com
199.15.250.250 task04 task04.newsblur.com
199.15.250.228 app01 app01.newsblur.com
199.15.253.162 db01 db01.newsblur.com
199.15.250.229 db02 db02.newsblur.com
199.15.250.230 db03 db03.newsblur.com
199.15.250.231 task01 task01.newsblur.com
199.15.250.250 task02 task02.newsblur.com

1
config/pgbouncer.conf
View file

@ -2,6 +2,7 @@
[databases]
newsblur = host=db01 port=5432 dbname=newsblur user=newsblur password=
slave = host=db02 port=5432 dbname=newsblur user=newsblur password=
;; Configuation section
[pgbouncer]

6
config/toprc
View file

@ -4,11 +4,11 @@ Def fieldscur=AEhiqtoWKNbMcdfgjprsluvyzX
winflags=65528, sortindx=13, maxtasks=35
summclr=1, msgsclr=1, headclr=3, taskclr=1
Job fieldscur=ABcefgjlrstuvyzMKNHIWOPQDX
winflags=65465, sortindx=10, maxtasks=0
winflags=65465, sortindx=10, maxtasks=13
summclr=6, msgsclr=6, headclr=7, taskclr=6
Mem fieldscur=ANOPQRSTUVbcdefgjlMyzWHIKX
winflags=65465, sortindx=12, maxtasks=6
winflags=65465, sortindx=12, maxtasks=13
summclr=5, msgsclr=5, headclr=4, taskclr=5
Usr fieldscur=ABDECGfhijloPqrstuvyzMKNWX
winflags=65520, sortindx=15, maxtasks=50
winflags=65520, sortindx=15, maxtasks=62
summclr=3, msgsclr=3, headclr=2, taskclr=3

4
fabfile.py vendored
View file

@ -16,8 +16,8 @@ from django.conf import settings as django_settings
env.user = 'sclay'
env.roledefs ={
'app': ['www.newsblur.com'],
'db': ['db01.newsblur.com'],
'task': ['task01.newsblur.com', 'task02.newsblur.com', 'task03.newsblur.com', 'task04.newsblur.com'],
'db': ['db01.newsblur.com', 'db02.newsblur.com', 'db03.newsblur.com'],
'task': ['task01.newsblur.com', 'task02.newsblur.com'],
}
# ================

2
templates/recommendations/render_recommended_feed.xhtml
View file

@ -21,7 +21,7 @@
<img class="NB-recommended-favicon" src="data:image/png;base64,{{ recommended_feed.feed.icon.data }}" />
<div class="NB-recommended-title">{{ recommended_feed.feed.feed_title }}</div>
{# <div class="NB-recommended-link">{{ recommended_feed.feed.feed_link }}</div> #}
<div class="NB-recommended-description">{{ description }}</div>
<div class="NB-recommended-description">{{ description|safe }}</div>
<div class="NB-modal-submit">
<div class="NB-recommended-subscribers">
<b>{{ recommended_feed.feed.num_subscribers }}</b> subscriber{{ recommended_feed.feed.num_subscribers|pluralize }}