Skip to content
This repository has been archived by the owner on Oct 6, 2018. It is now read-only.

Commit

Permalink
Merge pull request #57 from actown/develop
Browse files Browse the repository at this point in the history
Pass puppet-lint.
  • Loading branch information
kotoko committed Aug 29, 2013
2 parents f239bd7 + 940e7e5 commit d77150a
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions vagrant/puppet/manifests/default.pp
Expand Up @@ -3,7 +3,6 @@
Exec { path => '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/' }
exec { 'echo this works': }


#set up updated apt-get repos

group { 'puppet': ensure => 'present' }
Expand Down Expand Up @@ -61,7 +60,7 @@
}

package { 'virtualenvwrapper':
ensure => latest,
ensure => latest,
provider => pip,
}

Expand All @@ -76,13 +75,15 @@
}


#add/setup virtualenvwrapper to auto start and add a tmux config that acts more like screen
# add/setup virtualenvwrapper to auto start

file { '.bash_aliases':
path => '/home/vagrant/.bash_aliases',
source => '/vagrant/files/bash_aliases',
}

# add a tmux config that acts more like screen

file { '.tmux.conf':
path => '/home/vagrant/.tmux.conf',
source => '/vagrant/files/tmux.conf',
Expand All @@ -91,16 +92,16 @@

file { '/vagrant/files/install_venv.sh':
ensure => 'present',
mode => 777,
source => '/vagrant/files/install_venv.sh',
mode => '0777',
source => '/vagrant/files/install_venv.sh',
}

exec { '/vagrant/files/install_venv.sh':
exec { '/vagrant/files/install_venv.sh':
require => [
Package['python-virtualenv'],
Package['virtualenvwrapper'],
File['.bash_aliases'],
File['/vagrant/files/install_venv.sh'],
],
logoutput => "on_failure"
logoutput => 'on_failure'
}

0 comments on commit d77150a

Please sign in to comment.