Commits

Mikhail Korobov committed 502fd1c Merge

merge

Comments (0)

Files changed (4)

 pip-log.txt
 htmlcov
 .coverage
+stuff/
 
 #os files
 .DS_Store
 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 *
 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``

fab_deploy/config_templates/apache.config

 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 }}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.