Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 1 addition and 34 deletions.
  1. +1 −4 Vagrantfile
  2. +0 −30 puppet/base.pp
View
5 Vagrantfile
@@ -11,10 +11,7 @@ Vagrant::Config.run do |config|
# 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://mathie-vagrant-boxes.s3.amazonaws.com/debian_squeeze_32.box"
-
- # There's no vm.box_url because I built our own custom image of Ubuntu 12.04 LTS
- # There was no ready-made image available on www.vagrantbox.es
+ config.vm.box_url = "http://files.holderdeord.no/dev/setup/hdo-devel.box"
# Access the box as 'hdo' user (with 'vagrant ssh')
# config.ssh.username = "hdo"
View
30 puppet/base.pp
@@ -1,30 +0,0 @@
-Exec { path => "/usr/bin:/bin" }
-
-exec { "apt-update":
- command => "/usr/bin/apt-get update",
-}
-
-Exec["apt-update"] -> Package <| |>
-
-if ! $::osfamily {
- case $::operatingsystem {
- 'RedHat', 'Fedora', 'CentOS', 'Scientific', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL': {
- $osfamily = 'RedHat'
- }
- 'ubuntu', 'debian': {
- $osfamily = 'Debian'
- }
- 'SLES', 'SLED', 'OpenSuSE', 'SuSE': {
- $osfamily = 'Suse'
- }
- 'Solaris', 'Nexenta': {
- $osfamily = 'Solaris'
- }
- default: {
- $osfamily = $::operatingsystem
- }
- }
-}
-
-
-include hdo

No commit comments for this range

Something went wrong with that request. Please try again.