public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into social

Browse source 
* master:
  Adding app04, updating new app server bootstrap script.

Conflicts:
	fabfile.py
This commit is contained in:
Samuel Clay 2012-05-21 09:44:17 -07:00
commit 613fcd91b4
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/hosts
View file

@ -3,6 +3,7 @@
199.15.250.228 app01 app01.newsblur.com 199.15.250.228 app01 app01.newsblur.com
199.15.250.229 app02 app02.newsblur.com push 199.15.250.229 app02 app02.newsblur.com push
199.15.252.156 app03 app03.newsblur.com dev 199.15.252.156 app03 app03.newsblur.com dev
199.15.252.109 app04 app04.newsblur.com www
199.15.253.218 db01 db01.newsblur.com 199.15.253.218 db01 db01.newsblur.com
199.15.252.50 db02 db02.newsblur.com 199.15.252.50 db02 db02.newsblur.com
199.15.253.226 db03 db03.newsblur.com 199.15.253.226 db03 db03.newsblur.com

4
config/nginx.newsblur.conf
View file

@ -18,8 +18,8 @@ server {
listen 443 default_server ssl; listen 443 default_server ssl;
ssl on; ssl on;
ssl_certificate /home/sclay/newsblur/config/certificates/www.newsblur.com.crt; ssl_certificate /home/sclay/newsblur/config/certificates/newsblur.com.crt;
ssl_certificate_key /home/sclay/newsblur/config/certificates/www.newsblur.com.key; ssl_certificate_key /home/sclay/newsblur/config/certificates/newsblur.com.key;
client_max_body_size 4M; client_max_body_size 4M;
server_name www.newsblur.com push.newsblur.com 199.15.250.228 127.0.0.1; server_name www.newsblur.com push.newsblur.com 199.15.250.228 127.0.0.1;

39
fabfile.py vendored
View file

@ -31,14 +31,14 @@ env.VENDOR_PATH = "~/projects/code"
env.user = 'sclay' env.user = 'sclay'
env.roledefs ={ env.roledefs ={
'local': ['localhost'], 'local': ['localhost'],
'web': ['www.newsblur.com',
'app02.newsblur.com'],
'dev': ['dev.newsblur.com'],
'app': ['app01.newsblur.com', 'app': ['app01.newsblur.com',
'app02.newsblur.com', 'app02.newsblur.com',
'app03.newsblur.com'], 'app03.newsblur.com',
'app04.newsblur.com'],
'dev': ['dev.newsblur.com'],
'web': ['www.newsblur.com',
'app02.newsblur.com',
'app04.newsblur.com'],
'db': ['db01.newsblur.com', 'db': ['db01.newsblur.com',
'db02.newsblur.com', 'db02.newsblur.com',
'db03.newsblur.com', 'db03.newsblur.com',
@ -252,10 +252,14 @@ def setup_app():
setup_app_firewall() setup_app_firewall()
setup_app_motd() setup_app_motd()
copy_app_settings() copy_app_settings()
copy_certificates()
configure_nginx()
setup_gunicorn(supervisor=True) setup_gunicorn(supervisor=True)
update_gunicorn() update_gunicorn()
setup_node() setup_node()
configure_node() configure_node()
pre_deploy()
deploy()
def setup_db(): def setup_db():
setup_common() setup_common()
@ -357,11 +361,11 @@ def setup_psycopg():
def setup_python(): def setup_python():
# sudo('easy_install -U pip') # sudo('easy_install -U pip')
# sudo('easy_install -U fabric django==1.3.1 readline pyflakes iconv celery django-celery django-celery-with-redis django-compress South django-extensions pymongo stripe BeautifulSoup pyyaml nltk lxml oauth2 pytz boto seacucumber django_ses mongoengine redis requests') sudo('easy_install -U fabric django==1.3.1 readline pyflakes iconv celery django-celery django-celery-with-redis django-compress South django-extensions pymongo stripe BeautifulSoup pyyaml nltk lxml oauth2 pytz boto seacucumber django_ses mongoengine redis requests')
put('config/pystartup.py', '.pystartup') put('config/pystartup.py', '.pystartup')
# with cd(os.path.join(env.NEWSBLUR_PATH, 'vendor/cjson')): with cd(os.path.join(env.NEWSBLUR_PATH, 'vendor/cjson')):
# sudo('python setup.py install') sudo('python setup.py install')
with settings(warn_only=True): with settings(warn_only=True):
sudo('su -c \'echo "import sys; sys.setdefaultencoding(\\\\"utf-8\\\\")" > /usr/lib/python2.7/sitecustomize.py\'') sudo('su -c \'echo "import sys; sys.setdefaultencoding(\\\\"utf-8\\\\")" > /usr/lib/python2.7/sitecustomize.py\'')
@ -378,7 +382,7 @@ def setup_hosts():
def config_pgbouncer(): def config_pgbouncer():
put('config/pgbouncer.conf', '/etc/pgbouncer/pgbouncer.ini', use_sudo=True) put('config/pgbouncer.conf', '/etc/pgbouncer/pgbouncer.ini', use_sudo=True)
# put('config/pgbouncer_userlist.txt', '/etc/pgbouncer/userlist.txt', use_sudo=True) put('config/pgbouncer_userlist.txt', '/etc/pgbouncer/userlist.txt', use_sudo=True)
sudo('echo "START=1" > /etc/default/pgbouncer') sudo('echo "START=1" > /etc/default/pgbouncer')
sudo('/etc/init.d/pgbouncer stop') sudo('/etc/init.d/pgbouncer stop')
with settings(warn_only=True): with settings(warn_only=True):
@ -387,7 +391,6 @@ def config_pgbouncer():
sudo('/etc/init.d/pgbouncer start') sudo('/etc/init.d/pgbouncer start')
def config_monit(): def config_monit():
# sudo('apt-get install -y monit')
put('config/monit.conf', '/etc/monit/conf.d/celery.conf', use_sudo=True) put('config/monit.conf', '/etc/monit/conf.d/celery.conf', use_sudo=True)
sudo('echo "startup=1" > /etc/default/monit') sudo('echo "startup=1" > /etc/default/monit')
sudo('/etc/init.d/monit restart') sudo('/etc/init.d/monit restart')
@ -506,7 +509,7 @@ def setup_staging():
run('touch logs/newsblur.log') run('touch logs/newsblur.log')
def setup_node(): def setup_node():
sudo('add-apt-repository ppa:chris-lea/node.js') sudo('add-apt-repository -y ppa:chris-lea/node.js')
sudo('apt-get update') sudo('apt-get update')
sudo('apt-get install -y nodejs') sudo('apt-get install -y nodejs')
run('curl http://npmjs.org/install.sh | sudo sh') run('curl http://npmjs.org/install.sh | sudo sh')
@ -521,17 +524,15 @@ def configure_node():
sudo('supervisorctl start node_unread') sudo('supervisorctl start node_unread')
sudo('supervisorctl start node_favicons') sudo('supervisorctl start node_favicons')
def copy_certificates():
# with cd(env.NEWSBLUR_PATH):
# run('mkdir -p config/certificates')
with cd(os.path.join(env.NEWSBLUR_PATH, 'config/certificates')):
put('data/www.newsblur.com.crt', 'www.newsblur.com.crt')
put('data/www.newsblur.com.nopass.key', 'www.newsblur.com.key')
def copy_app_settings(): def copy_app_settings():
put('config/settings/app_settings.py', '%s/local_settings.py' % env.NEWSBLUR_PATH) put('config/settings/app_settings.py', '%s/local_settings.py' % env.NEWSBLUR_PATH)
run('echo "\nSERVER_NAME = \\\\"`hostname`\\\\"" >> %s/local_settings.py' % env.NEWSBLUR_PATH) run('echo "\nSERVER_NAME = \\\\"`hostname`\\\\"" >> %s/local_settings.py' % env.NEWSBLUR_PATH)
def copy_certificates():
run('mkdir -p %s/config/certificates/' % env.NEWSBLUR_PATH)
put('config/certificates/comodo/newsblur.com.crt', '%s/config/certificates/' % env.NEWSBLUR_PATH)
put('config/certificates/comodo/newsblur.com.key', '%s/config/certificates/' % env.NEWSBLUR_PATH)
# ============== # ==============
# = Setup - DB = # = Setup - DB =
# ============== # ==============