diff options
Diffstat (limited to 'provisioning/modules/pixelated')
-rw-r--r-- | provisioning/modules/pixelated/manifests/apt.pp | 4 | ||||
-rw-r--r-- | provisioning/modules/pixelated/manifests/source.pp | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index 434ae01e..e1af0aba 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -5,7 +5,7 @@ class pixelated::apt { file { '/etc/apt/sources.list.d/pixelated.list': content => "deb http://packages.pixelated-project.org/debian wheezy-snapshots main\ndeb http://packages.pixelated-project.org/debian wheezy main\n", owner => 'root', - require => Exec[add_pixelated_key], + require => Exec['add_pixelated_key'], notify => Exec['apt_get_update'], } @@ -25,7 +25,7 @@ class pixelated::apt { file { '/etc/apt/sources.list.d/leap.list': content => "deb http://deb.leap.se/0.6 wheezy main", owner => 'root', - require => Exec[add_pixelated_key], + require => Exec['add_leap_key'], notify => Exec['apt_get_update'], } file { '/tmp/0x1E34A1828E20790_leap_archive_key': diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp index 8fd98dda..5ebec288 100644 --- a/provisioning/modules/pixelated/manifests/source.pp +++ b/provisioning/modules/pixelated/manifests/source.pp @@ -25,13 +25,22 @@ class pixelated::source { } class install_pixelated { + $virtualenv_path = "/home/vagrant/user-agent-venv" + exec { 'install-pixelated': environment => 'USERNAME=vagrant', - command => '/bin/bash /vagrant/install-pixelated.sh', + command => "/vagrant/install-pixelated.sh -v \"${virtualenv_path}\"", cwd => '/vagrant', user => 'vagrant', timeout => 0 } + + exec { 'add_virtualenv_to_bashrc': + command => "/bin/bash -c 'echo \"source ${virtualenv_path} ; cd /vagrant\" >> /home/vagrant/.bashrc'", + unless => "/bin/grep \"source ${virtualenv_path}\" /home/vagrant/.bashrc", + user => 'vagrant', + require => Exec['install-pixelated'] + } } Stage['main'] -> Stage['install_pixelated'] |