Commits

theoden  committed 111ccab

2.1.3-5 from system.install_software
* extra_packages moved to mysql.install
* locales-all moved to apache.install
* curl, screen and memcached were dismissed

  • Participants
  • Parent commits 013dd44

Comments (0)

Files changed (3)

File fab_deploy/db/mysql.py

         if self.is_installed():
             puts('Mysql is already installed.')
             return
-
+        extra_packages = {
+            'lenny': ['libmysqlclient15-dev'],
+            'squeeze': ['libmysqlclient-dev'],
+            'maverick': ['libmysqlclient-dev'],
+            'lucid': ['libmysqlclient-dev'],
+        }
+        os = utils.detect_os()
+        if os not in extra_packages:
+            fabric_utils.abort('Your OS (%s) is unsupported now.' % os)
         passwd = self._get_root_password()
         self._preseed_password(passwd)
 
         system.aptitude_install('mysql-server')
+        system.aptitude_install(extra_packages[os])
 
     @task
     def is_installed(self):

File fab_deploy/system.py

         'libssl-dev', 'libcurl3-dev',
         'libxml2-dev', 'libxslt1-dev', # for lxml
 
-        'screen', 'locales-all', 'curl',
-        'memcached',
         'subversion',
     ]
-    extra_packages = {
-        'lenny': ['libmysqlclient15-dev'],
-        'squeeze': ['libmysqlclient-dev'],
-        'maverick': ['libmysqlclient-dev'],
-        'lucid': ['libmysqlclient-dev'],
-    }
-
-    os = utils.detect_os()
-    if os not in extra_packages:
-        fabric_utils.abort('Your OS (%s) is unsupported now.' % os)
-
-    aptitude_install(" ".join(common_packages + extra_packages[os]))
+    aptitude_install(" ".join(common_packages))
 
     # git and mercurial are outdated in stable Debian Lenny and
     # don't work with some source repositories on github and bitbucket

File fab_deploy/webserver/apache.py

 @utils.run_as_sudo
 def install():
     """ Installs apache. """
-    system.aptitude_install('apache2 libapache2-mod-wsgi libapache2-mod-rpaf')
+    system.aptitude_install('apache2 libapache2-mod-wsgi libapache2-mod-rpaf locales-all')
     sudo('rm -f /etc/apache2/sites-enabled/default')
     sudo('rm -f /etc/apache2/sites-enabled/000-default')
     setup_locale()