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

Moving dev to haproxy.

Browse source
This commit is contained in:
Samuel Clay 2013-04-23 18:35:37 -07:00
parent 20fb0c024b
commit 06677b706a
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fabfile.py vendored
View file

@ -694,11 +694,11 @@ def maintenance_off():
run('mv templates/maintenance_on.html templates/maintenance_off.html')
run('git checkout templates/maintenance_off.html')
def setup_haproxy():
def setup_haproxy(debug=False):
sudo('ufw allow 81') # nginx moved
sudo('ufw allow 1936') # haproxy stats
sudo('apt-get install -y haproxy')
sudo('apt-get remove haproxy')
sudo('apt-get remove -y haproxy')
with cd(env.VENDOR_PATH):
run('wget http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev17.tar.gz')
run('tar -xf haproxy-1.5-dev17.tar.gz')
@ -708,7 +708,10 @@ def setup_haproxy():
put('config/haproxy-init', '/etc/init.d/haproxy', use_sudo=True)
sudo('chmod u+x /etc/init.d/haproxy')
sudo('mkdir -p /etc/haproxy')
put('../secrets-newsblur/configs/haproxy.conf', '/etc/haproxy/haproxy.cfg', use_sudo=True)
if debug:
put('config/debug_haproxy.conf', '/etc/haproxy/haproxy.cfg', use_sudo=True)
else:
put('../secrets-newsblur/configs/haproxy.conf', '/etc/haproxy/haproxy.cfg', use_sudo=True)
sudo('echo "ENABLED=1" > /etc/default/haproxy')
cert_path = "%s/config/certificates" % env.NEWSBLUR_PATH
run('cat %s/newsblur.com.crt > %s/newsblur.pem' % (cert_path, cert_path))

2
media/js/newsblur/reader/reader.js
View file

@ -3864,7 +3864,7 @@
} else if (force || !this.socket || !this.socket.socket.connected) {
var server = window.location.protocol + '//' + window.location.hostname;
var https = _.string.startsWith(window.location.protocol, 'https');
var local = NEWSBLUR.Globals.debug || _.any(['dev', 'debug'], function(hostname) {
var local = NEWSBLUR.Globals.debug || _.any(['debug'], function(hostname) {
return _.string.contains(window.location.host, hostname);
});
var port = https ? 443 : 80;