EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicitly define from_file

refactor-builder
Eric Holscher 2014-04-08 17:42:35 -04:00
parent d0dac5b101
commit 036db9b807
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/fab/fabfile.py vendored
View File

@ -98,7 +98,7 @@ def install_packages(type=None):
sudo('apt-get update')
#sudo('apt-get install oracle-java7-installer')
if type == 'web':
sudo('apt-get install -y nginx nginx-extras git-core python-dev libpq-dev libxml2-dev libxslt-dev libjson-perl libi18n-acceptlanguage-perl')
sudo('apt-get install -y nginx-extras git-core python-dev libpq-dev libxml2-dev libxslt-dev libjson-perl libi18n-acceptlanguage-perl')
if type == 'backup':
sudo('apt-get install -y rsync')
@ -245,6 +245,14 @@ def host_file():
sudo("echo '%s' >> /etc/hosts " % host_string)
def nginx_configs():
with settings(host_string='root@162.209.99.176'):
context = {'host': 'Asgard'}
upload_template('../nginx/app.nginx.conf', '/etc/nginx/sites-enabled/readthedocs', context=context, backup=False)
upload_template('../nginx/lb.nginx.conf', '/etc/nginx/sites-enabled/lb', context=context, backup=False)
upload_template('../nginx/main.nginx.conf', '/etc/nginx/nginx.conf', context=context, backup=False)
# Perl config
sudo('mkdir -p /usr/share/nginx/perl/')
put('../salt/nginx/perl/lib/ReadTheDocs.pm', '/usr/share/nginx/perl/ReadTheDocs.pm')
with settings(host_string='root@newasgard'):
context = {'host': 'Asgard'}
upload_template('../nginx/app.nginx.conf', '/etc/nginx/sites-enabled/readthedocs', context=context, backup=False)

4
readthedocs/doc_builder/backends/sphinx.py
View File

@ -212,13 +212,17 @@ class PdfBuilder(BaseSphinx):
def move(self, **kwargs):
if not os.path.exists(self.target):
os.makedirs(self.target)
exact = os.path.join(self.old_artifact_path, "%s.pdf" % self.version.project.slug)
if os.path.exists(exact):
from_file = exact
else:
from_globs = glob(os.path.join(self.old_artifact_path, "*.pdf"))
if from_globs:
from_file = from_globs[0]
else:
from_file = None
if from_file:
to_file = os.path.join(self.target, "%s.pdf" % self.version.project.slug)
run('mv -f %s %s' % (from_file, to_file))