ソースを参照

Vagrant improvements

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24785 44c647ce-9c0f-0410-b52a-842ac1e357ba
rob 13 年 前
コミット
5e72bf3c30
2 ファイル変更4 行追加11 行削除
  1. 2 0
      Vagrantfile
  2. 2 11
      puppet/manifests/default.pp

+ 2 - 0
Vagrantfile

@@ -31,6 +31,8 @@ Vagrant::Config.run do |config|
   # computers to access the VM, whereas host only networking does not.
   config.vm.forward_port 80, 8081
 
+  # Hostname
+  config.vm.host_name = "zf1.dev"
 
   # Pass custom arguments to VBoxManage before booting VM
   config.vm.customize [

+ 2 - 11
puppet/manifests/default.pp

@@ -2,20 +2,11 @@ group { "puppet":
     ensure => "present",
 }
 
-File { owner => 0, group => 0, mode => 0644 }
-
-
-# Ensure that apt-get update has been run, else not all packages will install
-exec { 'update-apt':
-    command => "/usr/bin/apt-get update",
-}
-
 # install vim and all packages required to build PHP
-$packages = [ "vim", "curl", "libxpm-dev", "libmcrypt-dev", "libbz2-dev", "libcurl4-gnutls-dev", "libjpeg62-dev", "libpng12-dev", "libfreetype6-dev", "libt1-dev", "libgmp3-dev", "libmysqlclient-dev", "libpq-dev", "libpcre3-dev" ]
+$packages = [ "vim", "curl", "libxpm-dev", "libmcrypt-dev", "libbz2-dev", "libcurl4-gnutls-dev", "libjpeg62-dev", "libpng12-dev", "libfreetype6-dev", "libt1-dev", "libgmp3-dev", "libmysqlclient-dev", "libpq-dev", "libpcre3-dev", "libxml2-dev", "libxslt-dev", "make"]
 
 package { $packages :
-    ensure => latest,  # Don't use latest, or it will auto-update (or do if you like)
-    require => Exec["update-apt"],
+    ensure => installed,
 }
 
 # Update .bashrc