1. Mikhail Korobov
  2. django-fab-deploy

Commits

Mikhail Korobov  committed 502fd1c Merge

merge

  • Participants
  • Parent commits e83e029, d689678
  • Branches multiple web-servers

Comments (0)

Files changed (4)

File .hgignore

View file
 pip-log.txt
 htmlcov
 .coverage
+stuff/
 
 #os files
 .DS_Store

File MANIFEST.in

View file
 include *.txt
 include *.rst
 recursive-include fab_deploy/config_templates *.config
-include fab_deploy/config_templates/hgrc
 include fab_deploy/config_templates/django_wsgi.py
 recursive-include fab_deploy/example_reqs *.txt
 recursive-include docs *

File docs/CHANGES.rst

View file
 2) Replace ``{{ APACHE_PORT }}`` with ``{{ PORTS['apache'] }}`` in
    apache and nginx configs (``apache.conf`` and ``nginx.conf``);
 
-3) Add ``Listen 127.0.0.1:{{ {{ PORTS['apache'] }} }}`` directive to the
+3) Add ``Listen 127.0.0.1:{{ PORTS['apache'] }}`` directive to the
    top of your ``apache.conf``.
 
 4) Run ``apache.install``, ``apache.update_config`` and ``nginx.update_config``

File fab_deploy/config_templates/apache.config

View file
 Listen 127.0.0.1:{{ PORTS['apache'] }}
 NameVirtualHost 127.0.0.1:{{ PORTS['apache'] }}
-<VirtualHost 127.0.0.1:{{ PORTS['apache'] }}
+<VirtualHost 127.0.0.1:{{ PORTS['apache'] }}>
     ServerName {{ SERVER_NAME }}
     ServerAlias www.{{ SERVER_NAME }}
     ServerAdmin {{ SERVER_ADMIN }}