opendev/system-config
Code Issues Proposed changes

Merge "Use our meetbot branch"

Browse Source
This commit is contained in:
Jenkins 2012-04-30 18:07:45 +00:00 committed by Gerrit Code Review
commit b6880d3170
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/meetbot/manifests/init.pp
View File

@ -3,17 +3,17 @@ class vcs {
exec { "update_meetbot_repo": exec { "update_meetbot_repo":
command => "git pull --ff-only", command => "git pull --ff-only",
cwd => "/tmp/meetbot", cwd => "/opt/meetbot",
path => "/bin:/usr/bin", path => "/bin:/usr/bin",
onlyif => "test -d /tmp/meetbot" onlyif => "test -d /opt/meetbot"
} }
# otherwise get a new clone of it # otherwise get a new clone of it
exec { "clone_meebot_repo": exec { "clone_meebot_repo":
command => "git clone https://github.com/emonty/meetbot.git /tmp/meetbot", command => "git clone https://github.com/openstack-ci/meetbot.git /opt/meetbot",
path => "/bin:/usr/bin", path => "/bin:/usr/bin",
onlyif => "test ! -d /tmp/meetbot" onlyif => "test ! -d /opt/meetbot"
} }
} }
@ -53,7 +53,7 @@ class meetbot {
file { "/usr/share/pyshared/supybot/plugins/MeetBot": file { "/usr/share/pyshared/supybot/plugins/MeetBot":
ensure => directory, ensure => directory,
recurse => true, recurse => true,
source => "/tmp/meetbot/MeetBot", source => "/opt/meetbot/MeetBot",
require => Package["supybot"] require => Package["supybot"]
} }

2
modules/meetbot/manifests/site.pp
View File

@ -64,7 +64,7 @@ define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) {
file { "/var/lib/meetbot/${name}/ircmeeting": file { "/var/lib/meetbot/${name}/ircmeeting":
ensure => directory, ensure => directory,
recurse => true, recurse => true,
source => "/tmp/meetbot/ircmeeting", source => "/opt/meetbot/ircmeeting",
owner => 'meetbot', owner => 'meetbot',
require => File["/var/lib/meetbot/${name}"] require => File["/var/lib/meetbot/${name}"]
} }