Commit Graph

38 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
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 3197184609 Fix $manage_index if statement
Without this patch, with puppet 3, if the $manage_index variable is set,
it is ignored, since the conditional compares the string 'manage_index'
to the value 'true'. With puppet 4, this would cause a syntax error.

Change-Id: If9dc13515059a2c148ddde3108b256feb3bc1298
2018-05-08 19:26:59 -07: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
Paul Belanger 82a00dacba
Support ubuntu xenial plugins directory
Looks like the location of plugins directory has changed in
ubuntu-xenial. Update manifiest to support both xenial and trusty.

Update service to subscribe to /opt/meetbot this way we don't need to
know which plugins directory is needed when on xenial or trusty.

Change-Id: I70a06093bbb1119aed52627f2a4bf1d07b74cd5b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-12-12 17:58:30 -05:00
Philip Marc Schwartz 2117e374f4 Update pip provider to use openstack_pip provider
Change-Id: Ib0b8a025ad7a0c068fb35178b782ae7c84ad9958
Signed-off-by: Philip Marc Schwartz <philip@progmad.com>
2016-06-16 10:20:07 -04:00
Jenkins d23b9ca9e0 Merge "Fix path issue for /usr/sbin/nologin" 2016-05-27 21:03:35 +00:00
Paul Belanger dada00e5ab
Fix path issue for /usr/sbin/nologin
Change-Id: I4842783ca433a41632dcde8d815d8f957e5a0b66
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-27 16:02:01 -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
Andrey Nikitin ed0dfe85bd Indentation of the parameters is refactored
Indentation of those parameters is changed to follow
Puppet Style Guide recommendation [0].

[0]. https://docs.puppetlabs.com/guides/style_guide.html

Change-Id: I2ba64dd2438caf0eb6ed7a4bd8683708dfb83178
2016-03-22 12:38:22 +03:00
Paul Belanger da89a62596 Remove logic to check for puppetlabs-apache
Now that puppet-httpd has been fully migrated too, we can remove this
obsolete logic.

Change-Id: I7d796a2808891fb686a753d3148204e305b88606
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2015-08-19 09:50:10 -04:00
Colleen Murphy eb6f0e587f Add Gemfile and puppet 4 checks
In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. This patch also
corrects lint errors caught by the puppet-lint-empty-check gem.

The $vhost_extra default was changed from empty string to undef, which
will be evaluated as nil in the template and will result in the same
behavior (printing nothing) if left unset.

Change-Id: I31588fb2d4c1894ad9785cd001100a83f4736f2f
2015-08-07 11:53:39 -07:00
Paul Belanger e3b276c650 Migrate to puppet-httpd module
puppet-httpd is the openstack-infra version of puppetlabs-apache
(0.0.4) release.

This patchset will remove the puppetlabs-apache namespace from -infra
allowing for possible future patchsets to use newer puppetlabs-apache
modules.

Change-Id: I39d337bd09ede21289be67c3c2666aa543e3ec3e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2015-07-21 10:12:41 -04:00
James E. Blair e6ff4136bb Make index management optional
We want to install our own index page, so make the management of
the index.html file optional, defaulting to true.

Change-Id: I09fd41a186eb5edf9368974415cf555c22bbf9d0
2015-05-20 09:33:50 -07:00
Monty Taylor 1adb9b728f Produce html logs for our IRC logs
There is a tool, irclog2html, that knows how to take directories of irc
logs and turn them in to formatted html with per-line links. Since we do
that for build logs, and the logs associated with meetings, it seems
only sane that we do it for channel logs.

The tool groks mtime, so it will skip previously produced logs, and will
overwrite current streaming logs each time it's run. We'll need to run
the command one time by hand first, because the first run might take a
bit to eat through our history.

Change-Id: Ieed2c80d945ee35b29887d672cd9ebbd9ece2188
2015-05-08 19:01:15 -04:00
Jeremy Stanley 80571d4b7a Correct source for plugins directory
Change-Id: I59de1445bf0589d69eef4e2bc61b4ca39ce4c260
2015-02-06 00:37:14 +00:00
Jeremy Stanley c5aecec93a Use present with vcsrepo bzr
undefined method 'latest' for Puppet::Type::Vcsrepo::ProviderBzr

The module documentation seems to use "present" everywhere instead.

Change-Id: Ia6e116b65b7a8b25c40fd289dc3172f5abcf2da7
2015-02-06 00:05:13 +00: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 7cf8168049 Serve the statusbot alert file from eavesdrop
Change-Id: I5c1a4adc25bab62564effba527122e57c229d1c5
2013-12-11 11:50:42 -08:00
Monty Taylor b583f4f0b3 Use cgit server instead of github for everything
We have a cgit server now, which means we should replace
all references to github with references to git.openstack.org.

Change-Id: I68ad1ce514fb4326c7d9940b5a84999af5b58562
2013-08-19 10:19:47 -07: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
Jeremy Stanley 94866a122c Remove remaining nginx removal cruft.
* modules/meetbot/manifests/init.pp: Remove a stray ensure absent
block for nginx configuration which tries to notify a nonexistent
service.

Change-Id: I4a086ea60afb777b72971b81ece3d53b99b29ff2
Reviewed-on: https://review.openstack.org/29863
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-05-22 16:17:25 +00:00
James E. Blair 779e1489ff Remove remove_nginx.
Remove remaining remove_nginx usage (it has been removed).

Change-Id: Icfd8c3ad7205777e50722ea82d1922bcad523e48
Reviewed-on: https://review.openstack.org/29819
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-05-20 20:40:03 +00:00
James E. Blair 525a7a2934 Don't automatically run meetbot/statusbot.
Change-Id: I8facfa48113d27fd18e700730a7a27a666bc2c40
Reviewed-on: https://review.openstack.org/28059
Reviewed-by: Jesse Keating <jesse.keating@rackspace.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
2013-05-10 17:26:40 +00:00
Monty Taylor 3e12ab5132 Rename CI to Infra in MANY MANY places.
Change-Id: I409bd50ae374e0288531f07cfeea34856c5f8067
Reviewed-on: https://review.openstack.org/17319
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
2012-12-16 17:30:47 +00:00
Paul Belanger 8434fa2d3d Puppet-lint / Refactor meetbot module
This started as a puppet-lint clean up and ended up more a refactoring
of some of the logic.

Change-Id: I5315571fbef8ff4ebe2ae77d2d2b19a6fcd5798d
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/14113
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-10-08 16:00:17 +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
Monty Taylor 4bf4a1ea7f Replace manual git work with vcsrepo module.
Change-Id: Ia0f3acd50aab07cc83d13cd12c8f7fc67f1c697d
Reviewed-on: https://review.openstack.org/10832
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-07 07:09:43 +00:00
Monty Taylor 14284283bb Make a class for each type of server.
Change-Id: I520b77a4d83958a6a1c2472e87b28f6b8822d890
2012-07-23 10:33:20 -05:00
Monty Taylor 18d26faad9 First pass at parameterizing secret infos.
Change-Id: Iee56a7e65be51ebf19a61eefd60cc93de6a764bf
2012-07-20 14:40:42 -07:00
James E. Blair 557a78174c Use unattended upgrades.
Stop using latest for packages installed by puppet.  This way,
all system packages get updated, not just some random ones.

The unattended-upgrades config will email root.  It is configured
for openstack servers and jenkins slaves, but not template hosts
so that it doesn't interfere with spin-up.

Also, fix some bits in the gerrit module that were causing
continuous restarts on gerrit-dev.

Install emacs.

Change-Id: I51c9083ccd3669f284fce4b50c36a37a0cac92d8
2012-06-05 22:59:46 +00: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 acd8cae704 Add auto-restart to meetbot
When the meetbot repo changes we should restart all instances using this repo

Change-Id: I4dedb2e05e2c053569cae23872e45f70f0796ed6
2012-05-01 08:55:04 +01:00
Andrew Hutchings 45940d0d2b Use our meetbot branch
Change-Id: I0938831d18a286d88434dda87bfa76b731f3f34e
2012-04-27 16:57:52 +01:00
Andrew Hutchings d7e037e321 Minor fixes to meetbot module
Make sure nginx reloads when deleting the symlink to the default setup
Make sure packages are latest so we get the latest security fixes

Change-Id: I3dbc529ead62591288cfe455d5c8348c62544dfa
2012-04-27 15:20:19 +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