Граф коммитов

454 Коммитов

Автор SHA1 Сообщение Дата
Dan Offord 5ac6606f62 Merge pull request #1 from liv3d/move_custom_config
Move custom config to above the main log block
2016-11-17 15:53:37 +00:00
Dan Offord 9088121a28 Move custom config to above the main log block
This is required so that anything added to the custom config, doesn't
also get added to /var/log/messages, which the block before captures
2016-11-17 15:38:57 +00:00
Steffen Zieger eb0a61e999 drop .conf extension from rsyslog::modlad, fixes #238 2016-10-28 20:17:41 +02:00
Steffen Zieger bf03e3304c do not inherit rsyslog class from rsyslog::database, refs #237 2016-10-25 17:41:10 +02:00
Steffen Zieger b21ed1c8f1 fix relative class name inclusion, refs #237 2016-10-25 17:14:02 +02:00
Steffen Zieger 6b4d7d4ac0 do not inherit from rsyslog class, refs #237 2016-10-25 17:09:25 +02:00
Steffen Zieger 9f15579ab7 Merge pull request #235 from thlapin/fix_pr_217
Fix conditionals in rsyslog.conf template to work with both Puppet 3 and 4.
2016-10-25 16:20:53 +02:00
Steffen Zieger cf91f81602 Merge pull request #236 from treydock/imjournal-default-rhel7
Use default for imjournalStateFile on EL7
2016-10-25 16:20:17 +02:00
Trey Dockendorf 705124d057 Use default for imjournalStateFile on EL7 that matches fresh install defaults 2016-10-10 11:09:21 -04:00
Thomas Lapinski dad8f23d9a Fix conditionals in rsyslog.conf template to work with both Puppet 3 and 4. 2016-10-06 11:29:10 +02:00
Steffen Zieger 2f089c8928 new release v4.0.3 2016-10-04 19:35:34 +02:00
Steffen Zieger adddbb7cd3 fix imjournal settings spelling 2016-10-04 19:31:01 +02:00
Steffen Zieger 6becf323f6 fix syntax error in params.pp 2016-10-04 19:29:01 +02:00
Steffen Zieger df75a15597 remove puppet-strings 2016-10-04 19:25:14 +02:00
Steffen Zieger 40add16d26 Merge pull request #229 from bschonec/emergency_log_fix
Nobody but "freebsd" gets Emergency messages (and more)
2016-10-04 18:05:25 +02:00
Steffen Zieger 6a7f0a8381 Merge pull request #217 from thlapin/imjournal_fix
Only set im_journal_* params for Redhat 7 by default where imjournal is loaded.
2016-10-04 18:04:37 +02:00
Brian Schonecker 5749e0962d Moved the <% end -%> statement after the 'freebsd' elseif statemt to allow emergency, uucp,news.crit and local7.* configurations. 2016-09-30 10:37:10 -04:00
Steffen Zieger e7813d08ec new release v4.0.2 2016-09-08 15:57:23 +02:00
Steffen Zieger 466dc5fcf7 fix another lint issue in tests/ 2016-09-08 14:31:52 +02:00
Steffen Zieger 6fa85882a2 fix some lint problems in tests/ 2016-09-08 14:23:27 +02:00
Steffen Zieger bcb80e24c2 remove forge deploy branch 2016-09-08 13:49:25 +02:00
Steffen Zieger 512cdf0c1b update forge password 2016-09-08 13:49:00 +02:00
Steffen Zieger 4fbb266235 Merge branch 'master' of github.com:saz/puppet-rsyslog 2016-09-08 13:47:34 +02:00
Steffen Zieger d007a4eb4c handle client::log_local_custom right, fixes #220 2016-09-08 13:47:27 +02:00
Thomas Lapinski 1c5f73ce71 Only set im_journal_* params for Redhat 7 by default where imjournal is loaded. 2016-08-22 10:19:42 +02:00
Steffen Zieger 43c1ee8c28 Merge pull request #213 from stevekupper/relay-server
added ability to run as a relay server and removed some trailing spaces
2016-08-07 14:10:22 +02:00
Steffen Zieger 44417157ae Release v4.0.1 2016-08-06 15:56:30 +02:00
Steffen Zieger 8b5561e833 update puppet version requirement 2016-08-06 15:56:06 +02:00
Steffen Zieger 49d0633df4 try another time to fix forge password 2016-08-06 15:46:49 +02:00
Steffen Zieger b983792121 fix forge password in travis yml 2016-08-06 14:58:22 +02:00
Steffen Zieger 7a8f8615cc Puppet < 3.0 is not tested anymore, starting with v4.0.0 2016-08-06 14:37:12 +02:00
Steffen Zieger 8587c293d4 workaround for travis-ci/dpl#487 during deployment 2016-08-06 14:31:13 +02:00
Steffen Zieger 7260a83989 install json_pure <= 2.0.1 before deploying 2016-08-06 14:26:32 +02:00
Steffen Zieger 7aa8360687 Release v4.0.0 2016-08-06 14:03:32 +02:00
Steffen Zieger f92386dd3d fix (hopefully) the last rubocop issue 2016-08-05 14:54:41 +02:00
Steffen Zieger 4d57e441e2 rest of rubocop changes 2016-08-05 14:21:51 +02:00
Steffen Zieger 4efbaeceab ignore vim temp files 2016-08-05 09:38:11 +02:00
Steffen Zieger 37748f72fc couple of rubocop changes 2016-08-05 09:18:33 +02:00
Steffen Zieger b47499b7b1 convert windows line endings to unix 2016-08-05 09:13:05 +02:00
Steffen Zieger e640de24aa execute rubocop task only on ruby >= 2.2 2016-08-05 08:30:24 +02:00
Steffen Zieger 50a96e3d57 require a higher ruby version for rubocop-rspec 2016-08-05 08:26:29 +02:00
Steffen Zieger 24c8fef2e8 depend on rubocop-rspec lower than 1.6 2016-08-05 08:16:58 +02:00
Steffen Zieger dcf76f653a fix some rubocop issues 2016-08-03 19:00:31 +02:00
Steffen Zieger a53fe92fca fix license name 2016-08-03 15:50:38 +02:00
Steffen Zieger 65e8443b50 improve testing of this module 2016-08-03 15:50:30 +02:00
Steffen Zieger dc30e40b36 various lint changes 2016-08-03 15:49:18 +02:00
Steffen Zieger 4664bb38ee fix config path for FreeBSD in spec tests 2016-08-03 12:48:46 +02:00
Steffen Zieger 2dbce1738b fix type in log_filter expression 2016-08-03 12:44:31 +02:00
Steffen Zieger a2e227d29a Merge pull request #214 from jthiltges/escape-quotes
Escape single-quotes in string
2016-08-02 20:17:42 +02:00
John Thiltges 922c0bd27e Escape single-quotes in string 2016-08-02 10:57:27 -05:00