public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-04-13 09:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating fabfile with new motd.

Browse source
This commit is contained in:
Samuel Clay 2015-05-06 19:22:53 -07:00
parent 2aee00fb99
commit 4443defc39
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/motd_app.txt
View file

@ -1,4 +1,6 @@
#!/bin/sh
echo "
^^ @@@@@@@@@ ^^ @@@@@@@@@
^^ ^^ @@@@@@@@@@@@@@@ ^^ ^^ @@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@ ^^ @@@@@@@@@@@@@@@@@@ ^^
@ -13,9 +15,10 @@
_ _ ____ _ _ _ ____ _
| \ | | | _ \| | | \ | | | _ \| |
| \| | _____ _____| |_) | |_ _ _ __ | \| | _____ _____| |_) | |_ _ _ __
| . ` |/ _ \ \ /\ / / __| _ <| | | | | '__| | . ' |/ _ \ \ /\ / / __| _ <| | | | | '__|
| |\ | __/\ V V /\__ \ |_) | | |_| | | | |\ | __/\ V V /\__ \ |_) | | |_| | |
|_| \_|\___| \_/\_/ |___/____/|_|\__,_|_| |_| \_|\___| \_/\_/ |___/____/|_|\__,_|_|
App Server App Server
"

44
fabfile.py vendored
View file

@ -81,6 +81,7 @@ def do_roledefs(split=False):
def list_do(): def list_do():
droplets = do(split=True) droplets = do(split=True)
pprint(droplets) pprint(droplets)
doapi = dop.client.Client(django_settings.DO_CLIENT_KEY, django_settings.DO_API_KEY) doapi = dop.client.Client(django_settings.DO_CLIENT_KEY, django_settings.DO_API_KEY)
droplets = doapi.show_active_droplets() droplets = doapi.show_active_droplets()
sizes = doapi.sizes() sizes = doapi.sizes()
@ -89,7 +90,10 @@ def list_do():
total_cost = 0 total_cost = 0
for droplet in droplets: for droplet in droplets:
roledef = re.split(r"([0-9]+)", droplet.name)[0] roledef = re.split(r"([0-9]+)", droplet.name)[0]
cost = int(sizes.get(droplet.size_id, 96)) * 10 size = int(sizes.get(droplet.size_id, 96))
if size == 512:
size = .5
cost = int(size * 10)
role_costs[roledef] += cost role_costs[roledef] += cost
total_cost += cost total_cost += cost
@ -217,11 +221,10 @@ def setup_app(skip_common=False):
if not skip_common: if not skip_common:
setup_common() setup_common()
setup_app_firewall() setup_app_firewall()
setup_app_motd() setup_motd('app')
copy_app_settings() copy_app_settings()
config_nginx() config_nginx()
setup_gunicorn(supervisor=True) setup_gunicorn(supervisor=True)
update_gunicorn()
# setup_node_app() # setup_node_app()
# config_node() # config_node()
deploy_web() deploy_web()
@ -243,7 +246,7 @@ def setup_db(engine=None, skip_common=False):
if not skip_common: if not skip_common:
setup_common() setup_common()
setup_db_firewall() setup_db_firewall()
setup_db_motd() setup_motd('db')
copy_db_settings() copy_db_settings()
# if engine == "memcached": # if engine == "memcached":
# setup_memcached() # setup_memcached()
@ -276,11 +279,10 @@ def setup_task(queue=None, skip_common=False):
if not skip_common: if not skip_common:
setup_common() setup_common()
setup_task_firewall() setup_task_firewall()
setup_task_motd() setup_motd('task')
copy_task_settings() copy_task_settings()
enable_celery_supervisor(queue) enable_celery_supervisor(queue)
setup_gunicorn(supervisor=False) setup_gunicorn(supervisor=False)
update_gunicorn()
config_monit_task() config_monit_task()
setup_usage_monitor() setup_usage_monitor()
done() done()
@ -646,9 +648,6 @@ def setup_app_firewall():
sudo('ufw allow 443') # https sudo('ufw allow 443') # https
sudo('ufw --force enable') sudo('ufw --force enable')
def setup_app_motd():
put('config/motd_app.txt', '/etc/motd.tail', use_sudo=True)
def remove_gunicorn(): def remove_gunicorn():
with cd(env.VENDOR_PATH): with cd(env.VENDOR_PATH):
sudo('rm -fr gunicorn') sudo('rm -fr gunicorn')
@ -656,6 +655,8 @@ def remove_gunicorn():
def setup_gunicorn(supervisor=True): def setup_gunicorn(supervisor=True):
if supervisor: if supervisor:
put('config/supervisor_gunicorn.conf', '/etc/supervisor/conf.d/gunicorn.conf', use_sudo=True) put('config/supervisor_gunicorn.conf', '/etc/supervisor/conf.d/gunicorn.conf', use_sudo=True)
sudo('supervisorctl reread')
restart_gunicorn()
# with cd(env.VENDOR_PATH): # with cd(env.VENDOR_PATH):
# sudo('rm -fr gunicorn') # sudo('rm -fr gunicorn')
# run('git clone git://github.com/benoitc/gunicorn.git') # run('git clone git://github.com/benoitc/gunicorn.git')
@ -830,9 +831,6 @@ def setup_db_firewall():
sudo('ufw --force enable') sudo('ufw --force enable')
def setup_db_motd():
put('config/motd_db.txt', '/etc/motd.tail', use_sudo=True)
def setup_rabbitmq(): def setup_rabbitmq():
sudo('echo "deb http://www.rabbitmq.com/debian/ testing main" >> /etc/apt/sources.list') sudo('echo "deb http://www.rabbitmq.com/debian/ testing main" >> /etc/apt/sources.list')
run('wget http://www.rabbitmq.com/rabbitmq-signing-key-public.asc') run('wget http://www.rabbitmq.com/rabbitmq-signing-key-public.asc')
@ -1070,8 +1068,11 @@ def setup_task_firewall():
sudo('ufw allow 80') sudo('ufw allow 80')
sudo('ufw --force enable') sudo('ufw --force enable')
def setup_task_motd(): def setup_motd(role='app'):
put('config/motd_task.txt', '/etc/motd.tail', use_sudo=True) motd = '/etc/update-motd.d/22-newsblur-motd'
put('config/motd_%s.txt' % role, motd, use_sudo=True)
sudo('chown root.root %s' % motd)
sudo('chmod a+x %s' % motd)
def enable_celery_supervisor(queue=None): def enable_celery_supervisor(queue=None):
if not queue: if not queue:
@ -1264,13 +1265,14 @@ def deploy_code(copy_assets=False, full=False, fast=False, reload=False):
run('rm -fr static/*') run('rm -fr static/*')
if copy_assets: if copy_assets:
transfer_assets() transfer_assets()
if reload: with settings(warn_only=True):
sudo('supervisorctl reload') if reload:
elif fast: sudo('supervisorctl reload')
kill_gunicorn() elif fast:
else: kill_gunicorn()
sudo('kill -HUP `cat /srv/newsblur/logs/gunicorn.pid`') else:
sudo('kill -HUP `cat /srv/newsblur/logs/gunicorn.pid`')
@parallel @parallel
def kill(): def kill():