opendev/system-config
Code Issues Proposed changes

Rename meetbot site

Browse Source 
We use eavesdrop.o.o not meetbot.o.o
Also put nickserv pass in secret file (note the one that was in there is not the nickserv pass)

Change-Id: I254a07a49f8b0ba611f6eae6b33a266decdd5ed2
This commit is contained in:
Andrew Hutchings 2012-04-26 18:26:28 +01:00
parent 8c4e305392
commit 56c5d302c6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -253,7 +253,7 @@ node "planet.openstack.org" {
} }
} }
node "meetbot.openstack.org" { node "eavesdrop.openstack.org" {
class { 'openstack_server': class { 'openstack_server':
iptables_public_tcp_ports => [80] iptables_public_tcp_ports => [80]
} }
@ -263,7 +263,7 @@ node "meetbot.openstack.org" {
nick => "openstack", nick => "openstack",
network => "FreeNode", network => "FreeNode",
server => "chat.us.freenode.net:7000", server => "chat.us.freenode.net:7000",
url => "meetbot.openstack.org", url => "eavesdrop.openstack.org",
channels => "#openstack #openstack-dev #openstack-meeting", channels => "#openstack #openstack-dev #openstack-meeting",
use_ssl => "True" use_ssl => "True"
} }

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

@ -1,4 +1,5 @@
define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) { define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) {
$nickpass = file("/root/secret-files/${name}-nickserv.pass")
file { "/etc/nginx/sites-available/${name}-meetbot": file { "/etc/nginx/sites-available/${name}-meetbot":
ensure => 'present', ensure => 'present',

2
modules/meetbot/templates/supybot.conf.erb
View File

@ -972,7 +972,7 @@ supybot.plugins.Services.NickServ: NickServ
# Default value: # Default value:
### ###
supybot.plugins.Services.NickServ.password: supybot.plugins.Services.NickServ.password:
supybot.plugins.Services.NickServ.password.<%= nick %>: fsck1T321 supybot.plugins.Services.NickServ.password.<%= nick %>: <%= nickpass %>
### ###
# Determines what nick the 'ChanServ' service has. # Determines what nick the 'ChanServ' service has.