Commits

theoden  committed efc43ed

1.2-1.3 system.prepare_server was renamed to system.prepare

  • Participants
  • Parent commits c2eaff8

Comments (0)

Files changed (4)

File fab_deploy/deploy.py

     os = utils.detect_os()
     if not console.confirm("Is the OS detected correctly (%s)?" % os, default=False):
         abort("Detection fails. Please set env.conf.OS to correct value.")
-    system.prepare_server()
+    system.prepare()
     deploy_project()
 
 @task

File fab_deploy/system.py

            'ssh_add_key', 'ssh_add_root_key', 'install_sudo']
 
 @task
-def prepare_server():
+def prepare():
     """ Prepares server: installs system packages. """
     os = utils.detect_os()
     if os in ['lenny', 'squeeze']:

File fab_deploy_tests/preparevm.py

 from utils import setup_ssh, setup_sudo, private_key_path
 
 from fab_deploy.utils import update_env
-from fab_deploy.system import prepare_server
+from fab_deploy.system import prepare
 from fab_deploy.db import mysql, postgres
 from fab_deploy.webserver import nginx, apache
 
         box.snapshot_restore('fabtest-initial')
         setup_sudo()
         setup_ssh()
-        fab(prepare_server)
+        fab(prepare)
         fab(apache.install)
         fab(nginx.install)
         fab(mysql.install)

File fab_deploy_tests/tests/system_tests.py

 from fabtest import fab, FabricAbortException
 
 from fab_deploy.utils import run_as
-from fab_deploy.system import prepare_server, ssh_add_key
+from fab_deploy.system import prepare, ssh_add_key
 from fab_deploy.webserver import apache, nginx
 
 from fab_deploy_tests.utils import setup_ssh, public_key_path, setup_sudo
         setup_sudo()
         setup_ssh()
 
-        fab(prepare_server)
+        fab(prepare)
         self.assertPackageInstalled('memcached')
         self.assertPackageInstalled('python')