[Pkg-mozext-commits] [itsalltext] 02/09: Added better vagrant file
David Prévot
taffit at moszumanska.debian.org
Sat Feb 28 15:56:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository itsalltext.
commit 87ccf12d9d9da95765acb2a06f5b8e18d14a31b3
Author: Christian Höltje <docwhat at gerf.org>
Date: Wed Feb 25 21:17:01 2015 -0500
Added better vagrant file
---
Vagrantfile | 127 ++++++-----------------------------------
vagrant/files/ff.sh | 14 -----
vagrant/manifests/precise32.pp | 27 ---------
3 files changed, 19 insertions(+), 149 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 6cce521..58e0172 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,115 +1,26 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-Vagrant.configure("2") do |config|
- # All Vagrant configuration is done here. The most common configuration
- # options are documented and commented below. For a complete reference,
- # please see the online documentation at vagrantup.com.
-
- # Every Vagrant virtual environment requires a box to build off of.
- config.vm.box = "precise32"
-
- # The url from where the 'config.vm.box' box will be fetched if it
- # doesn't already exist on the user's system.
- # config.vm.box_url = "http://domain.com/path/to/above.box"
- config.vm.box_url = "http://files.vagrantup.com/precise32.box"
-
- config.ssh.forward_agent = true
- config.ssh.forward_x11 = true
-
- # Create a forwarded port mapping which allows access to a specific port
- # within the machine from a port on the host machine. In the example below,
- # accessing "localhost:8080" will access port 80 on the guest machine.
- # config.vm.network :forwarded_port, guest: 80, host: 8080
-
- # Create a private network, which allows host-only access to the machine
- # using a specific IP.
- # config.vm.network :private_network, ip: "192.168.33.10"
-
- # Create a public network, which generally matched to bridged network.
- # Bridged networks make the machine appear as another physical device on
- # your network.
- # config.vm.network :public_network
-
- # Share an additional folder to the guest VM. The first argument is
- # the path on the host to the actual folder. The second argument is
- # the path on the guest to mount the folder. And the optional third
- # argument is a set of non-required options.
- # config.vm.synced_folder "../data", "/vagrant_data"
-
- # Provider-specific configuration so you can fine-tune various
- # backing providers for Vagrant. These expose provider-specific options.
- # Example for VirtualBox:
- #
- # config.vm.provider :virtualbox do |vb|
- # # Don't boot with headless mode
- # vb.gui = true
- #
- # # Use VBoxManage to customize the VM. For example to change memory:
- # vb.customize ["modifyvm", :id, "--memory", "1024"]
- # end
- #
- # View the documentation for the provider you're using for more
- # information on available options.
-
- # Enable provisioning with Puppet stand alone. Puppet manifests
- # are contained in a directory path relative to this Vagrantfile.
- # You will need to create the manifests directory and a manifest in
- # the file base.pp in the manifests_path directory.
- #
- # An example Puppet manifest to provision the message of the day:
- #
- # # group { "puppet":
- # # ensure => "present",
- # # }
- # #
- # # File { owner => 0, group => 0, mode => 0644 }
- # #
- # # file { '/etc/motd':
- # # content => "Welcome to your Vagrant-built virtual machine!
- # # Managed by Puppet.\n"
- # # }
- #
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "vagrant/manifests"
- puppet.manifest_file = "precise32.pp"
+Vagrant.configure('2') do |config|
+ config.vm.define 'linux', autostart: false do |linux|
+ linux.vm.box = 'precise32'
+ linux.vm.box_url = 'http://files.vagrantup.com/precise32.box'
+
+ linux.ssh.forward_agent = true
+ linux.ssh.forward_x11 = true
+
+ config.vm.provision 'shell', inline: <<-SHELL
+ sudo apt-get update
+ sudo apt-get install -y vim-athena firefox
+ SHELL
end
- # Enable provisioning with chef solo, specifying a cookbooks path, roles
- # path, and data_bags path (all relative to this Vagrantfile), and adding
- # some recipes and/or roles.
- #
- # config.vm.provision :chef_solo do |chef|
- # chef.cookbooks_path = "../my-recipes/cookbooks"
- # chef.roles_path = "../my-recipes/roles"
- # chef.data_bags_path = "../my-recipes/data_bags"
- # chef.add_recipe "mysql"
- # chef.add_role "web"
- #
- # # You may also specify custom JSON attributes:
- # chef.json = { :mysql_password => "foo" }
- # end
+ config.vm.define 'windows', autostart: false do |windows|
+ windows.vm.box = 'win7-ie11'
+ windows.vm.box_url = 'http://aka.ms/vagrant-win7-ie11'
+ end
- # Enable provisioning with chef server, specifying the chef server URL,
- # and the path to the validation key (relative to this Vagrantfile).
- #
- # The Opscode Platform uses HTTPS. Substitute your organization for
- # ORGNAME in the URL and validation key.
- #
- # If you have your own Chef Server, use the appropriate URL, which may be
- # HTTP instead of HTTPS depending on your configuration. Also change the
- # validation key to validation.pem.
- #
- # config.vm.provision :chef_client do |chef|
- # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
- # chef.validation_key_path = "ORGNAME-validator.pem"
- # end
- #
- # If you're using the Opscode platform, your validator client is
- # ORGNAME-validator, replacing ORGNAME with your organization name.
- #
- # If you have your own Chef Server, the default validation client name is
- # chef-validator, unless you changed the configuration.
- #
- # chef.validation_client_name = "ORGNAME-validator"
+ config.vm.provider :virtualbox do |vb|
+ vb.gui = true
+ end
end
diff --git a/vagrant/files/ff.sh b/vagrant/files/ff.sh
deleted file mode 100644
index 1787b82..0000000
--- a/vagrant/files/ff.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-for d in "$HOME/.mozilla/firefox/"*; do
- if [ -d "${d}" ]; then
- mkdir -p "${d}/extensions"
- echo '/vagrant/src/' > "${d}/extensions/itsalltext at docwhat.gerf.org"
- fi
-done
-
-exec firefox -jsconsole "$@"
-
-# EOF
diff --git a/vagrant/manifests/precise32.pp b/vagrant/manifests/precise32.pp
deleted file mode 100644
index e42bc60..0000000
--- a/vagrant/manifests/precise32.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-
-exec { "apt-update":
- command => "/usr/bin/apt-get update"
-}
-
-Exec["apt-update"] -> Package <| |>
-
-package { "firefox":
- ensure => latest,
-}
-package { "vim-athena":
- ensure => latest,
-}
-
-file { "/home/vagrant/bin":
- ensure => 'directory',
- mode => '0755',
- owner => 'vagrant',
-}
-
-file { "/home/vagrant/bin/ff.sh":
- source => "file:///vagrant/vagrant/files/ff.sh",
- mode => '0755',
- owner => 'vagrant',
- require => File['/home/vagrant/bin'],
-}
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/itsalltext.git
More information about the Pkg-mozext-commits
mailing list