From 7179bdbfbc86ced6ace7f3a4ede97e40a49dfc48 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Tue, 1 May 2012 14:58:02 +0100 Subject: [PATCH] Fix meetbot logs Fixes bug #992597 Adds new basic index page (to be themed at a later date) Moves nginx file serving to somewhere safer Adds /irclogs link Change-Id: Idae341741cd852e98b93a5b89d720615789fd328 --- modules/meetbot/manifests/site.pp | 23 +++++++++++++++++++++++ modules/meetbot/templates/index.html.erb | 16 ++++++++++++++++ modules/meetbot/templates/nginx.erb | 6 +++++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 modules/meetbot/templates/index.html.erb diff --git a/modules/meetbot/manifests/site.pp b/modules/meetbot/manifests/site.pp index 90a7243273..7b68f5aac1 100644 --- a/modules/meetbot/manifests/site.pp +++ b/modules/meetbot/manifests/site.pp @@ -21,6 +21,29 @@ define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) { require => File["/var/lib/meetbot"] } + file { "/srv/meetbot-${name}": + ensure => directory, + } + + file { "/srv/meetbot-${name}/index.html": + ensure => present, + content => template("meetbot/index.html.erb"), + require => File["/srv/meetbot-${name}"] + } + + file { "/srv/meetbot-${name}/irclogs": + ensure => link, + target => "/var/lib/meetbot/${name}/logs/ChannelLogger/${network}/", + require => File["/srv/meetbot-${name}"] + } + + file { "/srv/meetbot-${name}/meetings": + ensure => link, + target => "/var/lib/meetbot/${name}/meetings/", + require => File["/srv/meetbot-${name}"] + } + + file { "/var/lib/meetbot/${name}/conf": ensure => directory, owner => 'meetbot', diff --git a/modules/meetbot/templates/index.html.erb b/modules/meetbot/templates/index.html.erb new file mode 100644 index 0000000000..7f59643e8f --- /dev/null +++ b/modules/meetbot/templates/index.html.erb @@ -0,0 +1,16 @@ + + + + + + <%= name.capitalize %> IRC log server + + +

Welcome to <%= name.capitalize %> IRC log server

+ + + diff --git a/modules/meetbot/templates/nginx.erb b/modules/meetbot/templates/nginx.erb index 94af1f301a..71e4a63409 100644 --- a/modules/meetbot/templates/nginx.erb +++ b/modules/meetbot/templates/nginx.erb @@ -1,9 +1,13 @@ server { listen 80; server_name <%= url %>; - root /var/lib/meetbot/<%= name %>; + root /srv/meetbot-<%= name %>; location /meetings { autoindex on; } + + location /irclogs { + autoindex on; + } }