1. Mikhail Korobov
  2. django-fab-deploy

Commits

theoden  committed 33cf0ce

Rejected installing from nginx.org repos,
since there is no "available/enabled" directory structure in them.

Nginx is now installed from backports in squeeze (to support uwsgi protocol).

  • Participants
  • Parent commits 40fb850
  • Branches uwsgi

Comments (0)

Files changed (2)

File fab_deploy/system.py

View file
  • Ignore whitespace
 def setup_package_sources():
     """ Adds additional repos to apt sources. """
     os = utils.detect_os()
-    nginx = {
-        'lucid': 'http://nginx.org/packages/ubuntu/ lucid nginx',
-        'squeeze': 'http://nginx.org/packages/debian/ squeeze nginx',
-    }
-    if os in nginx:
-        run('wget -O ./nginx_signing.key http://nginx.org/keys/nginx_signing.key')
-        sudo('sudo apt-key add ./nginx_signing.key')
-        sudo("echo 'deb %s' > /etc/apt/sources.list.d/nginx.list" % nginx[os])
     uwsgi = {
         'lucid': 'http://ppa.launchpad.net/uwsgi/release/ubuntu lucid main',
         'squeeze': 'http://ftp.ru.debian.org/debian testing main contrib non-free',

File fab_deploy/webserver/nginx.py

View file
  • Ignore whitespace
     def install(self):
         """ Installs nginx. """
         os = utils.detect_os()
-        options = {'lenny': '-t lenny-backports'}
+        options = {
+            'lenny': '-t lenny-backports',
+            'squeeze': '-t squeeze-backports'
+        }
         system.aptitude_install('nginx', options.get(os, ''))
         sudo('rm -f /etc/nginx/sites-enabled/default')