Commit Graph

25 Commits

Author SHA1 Message Date
Clark Boylan d4f390b626 Retire this repo
The opendev project has been moving away from puppet and this is one of
the puppet modules that is no longer used. To simplify things for us we
are taking the extra step of retiring this repo.

Change-Id: I577721e214940a0c25c1a22bd98adc6de83c8b56
2022-02-17 11:57:26 -08:00
Jeremy Stanley fb4deb2cb2 Wait to join channels until identified by NickServ
With all our channels mode +r these days, the first few the meetbot
attempts to join are rejected while NickServ is still chewing on the
identify command. Use the supybot configuration option to delay
joining until we get identification confirmed.

Change-Id: I0631cfbba46dfe3c23ff5e455f2ac941b5655c28
2018-08-24 16:46:27 +00:00
Zuul 2c87234ddd Merge "Use httpd::vhost $content parameter" 2018-07-20 18:06:10 +00:00
Zuul fbd5b1515e Merge "Fix template variables" 2018-07-02 20:57:45 +00:00
Colleen Murphy e40a90fa3e Use httpd::vhost $content parameter
Use the new $content parameter of httpd::vhost instead of $template.
This way, the template gets rendered within the scope where it assumes
most of its variables are, and doesn't need to use the scope object
which doesn't work within a defined type. This will ensure the template
keeps working on puppet 4. This also requires adjusting some of the
template parameters that had previously been correctly scoped from the
httpd::vhost defined type.

Depends-On: https://review.openstack.org/570824

Change-Id: I3a45e99e3355d1e59d57d3d989cc03d253529bf2
2018-05-29 11:22:24 +02:00
Colleen Murphy 63153c941e Fix template variables
In the httpd module, serveraliases defaults to undef, which evaluates to
nil in ERB templates. Ensure the template checks for nil values so that
the ServerAlias line is only included if there is a server alias.

Also correct the variable usage in the index.html.erb template.

Change-Id: Ibde097b7dd407884336154a318ec4c5661fda03c
2018-05-29 08:33:03 +02:00
Colleen Murphy 9cd6a4d6a0 Use instance variables in puppet template
Using local ruby variables in puppet ERB templates was deprecated in
puppet 3 and doesn't work any more in puppet 4. Access these values as
ruby instance variables instead.

Change-Id: I957a5f1c679f0a2172d1a1b88040ae91e239e627
2018-04-20 22:07:03 +02:00
Paul Belanger a45ee742a0
Add support for systemd init scripts
This is needed to support ubuntu xenial.

Change-Id: If30bff94ee0136fbadee7ce994b25842a1cc4270
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-12-13 14:21:21 -05:00
Jenkins d630829e3a Merge "Fix deprecated warnings" 2016-06-16 16:54:29 +00:00
Paul Belanger 1f95777306
Fix deprecated warnings
Change-Id: I179b1cb031f0c9a349e174912167ec43aac9bf89
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-27 16:08:28 -04:00
Paul Belanger e1db3a5db0
Add Apache 2.4 syntax
Change-Id: I5b7f86820a7570856541ba868800c60d7f41346e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-25 20:47:33 -04:00
Morgan Fainberg e5545cbaef Add Bugtracker plugin to meetbot supybot
Add the Bugtracker plugin to the supybot used for meetbot (OpenStack).
This will restore the response of bug information to the channel when
a user references a bug in a message (e.g. 'bug XXXXXX').

Change-Id: I3ee3f1fa516bf1607ba6e79c6f911190a49b0161
2015-01-28 11:02:18 -08:00
James E. Blair 40abbdad88 Add more @ signs to meetbot vhost
Because puppet likes @ signs now.

Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
2014-09-12 10:42:05 -07:00
James E. Blair 7cf8168049 Serve the statusbot alert file from eavesdrop
Change-Id: I5c1a4adc25bab62564effba527122e57c229d1c5
2013-12-11 11:50:42 -08:00
Jeremy Stanley 0004d26ce0 Serve IRC log files as MIME type text/plain.
* modules/meetbot/manifests/site.pp: Specify a nondefault vhost
template.

* modules/meetbot/templates/vhost.erb: New file, similar in content
to the default puppetlabs-apache vhost template but forcing MIME
type text/plain and a default encoding of UTF-8 for files ending in
a .log suffix.

Change-Id: Ief0253c2baac32b126472d0f97f0aa503adbbd7f
2013-07-20 20:36:32 +00:00
Monty Taylor 0a18477e51 Add #openstack-infra to eavesdrop
There have been general requests for more logging of more things. I
think we might have a longer discussion there. But recently there have
been specific requests about -infra. I think that since discussions
around the gate and rather wide-spread project concerns wind up
happening in infra, we should definitely start logging it, and then we
can talk about whether other team channels should be logged or not.

Made this use an array of channels rather than a string for sanity.

Change-Id: I3f3e82aa86155d1ac3010ca3c3ade006b7a26793
2013-07-16 17:44:17 -04:00
Clark Boylan f4aaca2d91 Kill trailing whitespace.
Killed trailing whitespace in the puppet repo files using
`sed -r 's/\s+$//'`. Skip binary files and html templates for lodgeit
and mailman.

Change-Id: Ib43493161d8f0e8fae1426b22fb1737832ca14cd
Reviewed-on: https://review.openstack.org/12969
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2012-10-05 23:27:31 +00:00
James E. Blair 7a36ca73fe Add meetingname to meetbot log files.
Change-Id: Ic0f9e1fa3af5ff7367e7580091808d77842369c7
Reviewed-on: https://review.openstack.org/11750
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2012-08-22 16:24:31 +00:00
Monty Taylor f537545de1 Clean up post-apache move carnage.
Change-Id: Ieeb8469126d64df75e7fa0fff67618daa6990674
Reviewed-on: https://review.openstack.org/11246
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 17:49:33 +00:00
Monty Taylor 54b66b723e Align all web server usage on apache module.
Change-Id: Idd712a8ee5ec81c6b88b7d3e2270dce4da254927
Reviewed-on: https://review.openstack.org/10838
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 17:03:46 +00:00
Andrew Hutchings 820c908e6c Fix mime types
Fixes mime types for meeting logs.

Fixes bug #992719

Change-Id: I41f160bfff3e2dd5f1be1cd20f879adefeb16881
2012-05-02 10:52:08 +01:00
Andrew Hutchings 2ba931f0a7 Set log file mime type
Log files were using a binary mime type, set to text/plain so they can be read on the server

Change-Id: I23aef66949d1b336fc82db1f4843e039bbbb71b3
2012-05-01 15:17:29 +01:00
Andrew Hutchings 1ab5129e23 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
2012-05-01 14:59:32 +01:00
Andrew Hutchings 4910ec2630 Rename meetbot site
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
2012-04-26 18:26:28 +01:00
Andrew Hutchings e2116d36f2 Puts meetbot under control of puppet
Adds meetbot and an nginx setup to puppet.  See manifests/site.pp for usage

Change-Id: I47dcf2884a06441b482585bf5dae9f7d0bd7e543
2012-04-24 16:35:09 +01:00