[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r599: Migrated supybot is working; turn it live.

[Jeff Licquia]

------------------------------------------------------------
revno: 599
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-07-10 14:59:48 -0400
message:
  Migrated supybot is working; turn it live.
modified:
  modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf
  modules/supybot/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf	2014-06-26 19:55:16 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf	2014-07-10 18:59:48 +0000
@@ -120,13 +120,22 @@
 
     # irc
 
-    ProxyPass /irc http://vm1.linuxbase.org/irc
-    ProxyPassReverse /irc http://vm1.linuxbase.org/irc
-
-    <Location /irc>
-        Order allow,deny
-        Allow from all
-    </Location>
+    Alias /irc/meetbot /opt/supybot/config/meetbot
+    Alias /irc/logs /opt/supybot/config/logs/ChannelLogger/freenode
+
+    <Directory /opt/supybot/config/meetbot>
+       Options Indexes FollowSymLinks
+       AllowOverride All
+       order allow,deny
+       allow from all
+    </Directory>
+
+    <Directory /opt/supybot/config/logs/ChannelLogger/freenode>
+       Options Indexes FollowSymLinks
+       AllowOverride All
+       order allow,deny
+       allow from all
+    </Directory>
 
 </VirtualHost>
 
@@ -240,13 +249,22 @@
 
     # irc
 
-    ProxyPass /irc http://vm1.linuxbase.org/irc
-    ProxyPassReverse /irc http://vm1.linuxbase.org/irc
-
-    <Location /irc>
-        Order allow,deny
-        Allow from all
-    </Location>
+    Alias /irc/meetbot /opt/supybot/config/meetbot
+    Alias /irc/logs /opt/supybot/config/logs/ChannelLogger/freenode
+
+    <Directory /opt/supybot/config/meetbot>
+       Options Indexes FollowSymLinks
+       AllowOverride All
+       order allow,deny
+       allow from all
+    </Directory>
+
+    <Directory /opt/supybot/config/logs/ChannelLogger/freenode>
+       Options Indexes FollowSymLinks
+       AllowOverride All
+       order allow,deny
+       allow from all
+    </Directory>
 
    SetEnv BZR_HOME /var/lib/wwwrun
 

=== modified file 'modules/supybot/manifests/init.pp'
--- a/modules/supybot/manifests/init.pp	2014-07-10 18:17:54 +0000
+++ b/modules/supybot/manifests/init.pp	2014-07-10 18:59:48 +0000
@@ -38,14 +38,14 @@
         ensure => present,
         source => 'puppet:///modules/supybot/supybot.init',
         mode   => 0755,
-#        notify => Service['supybot'],
+        notify => Service['supybot'],
     }
 
-#    service { 'supybot':
-#        ensure     => running,
-#        hasrestart => false,
-#        require    => [ File['/etc/init.d/supybot'],
-#                        Exec['install-supybot'] ],
-#    }
+    service { 'supybot':
+        ensure     => running,
+        hasrestart => false,
+        require    => [ File['/etc/init.d/supybot'],
+                        Exec['install-supybot'] ],
+    }
 
 }