Commit Graph
519 Commits
Author SHA1 Message Date
Travis Rowland 8cf2e208ff Merge branch 'master' into bernick_18.04 2018-07-18 08:17:52 -07:00
Travis Rowland 924f874d7e Update Dockerfile 2018-07-18 08:17:29 -07:00
Travis Rowland b89b718067 Merge pull request #497 from rwky/logrotate-permissions-fix
Fix /var/log permissions on syslog-ng startup
2018-07-18 08:09:40 -07:00
Travis Rowland 422781c7cf Merge branch 'master' into logrotate-permissions-fix 2018-07-18 08:08:34 -07:00
Travis Rowland ed15d0d250 Merge pull request #487 from unilynx/support-maketest-on-osx
Allow 'make test' to work on macOS by publishing the SSH port
2018-07-18 07:45:32 -07:00
David Bernick a018aba0c2 syslog fix 2018-07-16 12:46:18 -04:00
Rowan Wookey dd9d23f1ea Fix /var/log permissions on syslog-ng startup 2018-06-30 10:58:14 +01:00
Arnold Hendriks d796c2e32c Add gpg-agent and dirmngr so 'apt-key' works out of the box again, just like it did on the 16.04 phusion image 2018-04-27 20:40:49 +02:00
Arnold Hendriks f936902c23 Update syslog configuration (took the diff between stock 16.04 and phusion 16.04 to figure out what to apply to the stock 18.04 syslog conf) as it complains about old config format 2018-04-27 20:40:49 +02:00
Arnold Hendriks 43791943e5 Update the baseimage to use, see https://hub.docker.com/r/library/ubuntu/tags/
Taking the bionic tag because so far the 'latest' and 18.04 tags haven't been updated yet
2018-04-27 20:40:48 +02:00
Arnold Hendriks 2f0e1ad0b8 Allow 'make test' to work on macOS by publishing the SSH port and using that during tests, as the IP address cannot be directly reached on macOS docker 2018-04-09 23:08:01 +02:00
Travis Rowland 92a357a41f Merge pull request #478 from andres-h/master
fix syslog reload
2018-04-02 00:49:31 -07:00
Travis Rowland 996e31b743 Incrementing version AFFECTS #485 2018-04-02 00:25:08 -07:00
Andres Heinloo cb8cd8ad82 fix syslog reload 2018-03-16 18:24:00 +01:00
Floor Drees 69a8fc1246 update Code of Conduct with contact persons 2018-03-05 10:30:11 +01:00
Travis Rowland 12718e6954 Merge pull request #470 from davidhiendl/master
fixed syslog warning when using --tty as described in #468
2018-03-04 19:53:43 -03:00
David Hiendl be8fc49e52 fixed syslog warning when using --tty as described in #468 2018-02-22 08:53:27 +01:00
Travis Rowland 14896d9181 Merge pull request #466 from phusion/readme-fix
removed syslog-forwarder from readme
2018-02-19 17:13:21 -08:00
Zsolt Ero 9d63ae751c RAM usage updated in readme 2018-02-17 02:28:14 +01:00
Zsolt Ero c5b6ed442d readme fix 2018-02-17 02:05:21 +01:00
Zsolt Ero c40591ee2c removed syslog-forwarder from readme 2018-02-17 02:03:32 +01:00
Travis Rowland be5d910bad Merge pull request #445 from phusion/Theaxiom-patch-1
my_init exits with 0 on SIGINT after runit is started
2018-01-31 23:09:55 -08:00
Travis Rowland db73c10615 Merge branch 'master' into Theaxiom-patch-1 2018-01-31 22:57:45 -08:00
Travis Rowland 733dac8706 Merge pull request #465 from rdxmb/master
README.md -> fix SSH docs
2018-01-31 22:56:16 -08:00
Marc Bihlmaier 768d4b4d3f fix SSH README.md 2018-01-31 11:33:17 +01:00
rdxmb b20ebe448c Merge pull request #1 from phusion/master
Rebase
2018-01-31 11:18:19 +01:00
Travis Rowland adf8fd7805 Latest tag not yet necessary 2018-01-26 02:51:52 -08:00
Travis Rowland 670f189553 Merge pull request #463 from phusion/ci-test
Ci test
2018-01-26 02:44:52 -08:00
Travis Rowland e81e664a72 Push master as latest 2018-01-26 02:36:46 -08:00
Travis Rowland 6b8be06bba GitLab CI is better 2018-01-26 02:26:03 -08:00
Travis Rowland efc5865789 Was using incorrect variable replacements 2018-01-26 02:17:56 -08:00
Travis Rowland 300b96fb93 build local Dockerfile 2018-01-26 02:01:09 -08:00
Travis Rowland 1bffe76e6a don't remove image 2018-01-26 01:58:22 -08:00
Travis Rowland 7a639692ab Automated Docker builds 2018-01-26 01:54:38 -08:00
Travis Rowland fdfe6b1937 Merge pull request #449 from phusion/Theaxiom-patch-2
Incrementing version AFFECTS #448
2018-01-26 01:25:41 -08:00
Travis Rowland 90e411fec2 Merge branch 'master' into Theaxiom-patch-1 2017-11-23 15:13:09 -08:00
Travis Rowland 95d89dd251 Merge branch 'master' into Theaxiom-patch-2 2017-11-23 15:12:00 -08:00
Travis Rowland 06e2983ba9 Merge pull request #453 from sundbry/sigint-logging
Fork syslog-ng into a new process group via bash monitor mode
2017-11-23 15:11:35 -08:00
Travis Rowland 5ab2367f76 Merge branch 'master' into sigint-logging 2017-11-23 12:28:39 -08:00
Travis Rowland 61d585bce9 Merge pull request #447 from kamermans/bugfix/syslog_unclean_shutdown
Gracefully handle syslog-ng shutdown
2017-11-23 12:28:14 -08:00
Ryan Sundberg b77633463f Fork syslog-ng into a new process group via bash monitor mode
This prevents SIGINT from a user interrupt from prematurely quitting syslog-ng.
See https://github.com/phusion/baseimage-docker/issues/450
2017-11-22 23:18:19 -08:00
Steve Kamerman 9bb3117b0c Merge branch 'master' into bugfix/syslog_unclean_shutdown 2017-11-03 17:14:19 -04:00
Travis Rowland 338238d685 Merge branch 'master' into Theaxiom-patch-2 2017-11-02 11:47:18 -07:00
Travis Rowland c5680a44b1 Merge pull request #446 from phusion/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2017-11-02 11:46:51 -07:00
Travis Rowland 4468bb296e Incrementing version AFFECTS #448 2017-11-02 09:34:12 -07:00
Steve Kamerman 25d13ef2b8 Gracefully handle syslog-ng shutdown 2017-11-01 17:26:31 -04:00
Travis Rowland 4cb596bfc9 Create CODE_OF_CONDUCT.md 2017-11-01 12:16:33 -07:00
Travis Rowland 42c48d8465 Merge pull request #425 from sundbry/syslog-shutdown
Start syslog-ng before runit, and stop after runit.
2017-11-01 12:06:35 -07:00
Ryan Sundberg 18a10580e1 Syslog-ng start and stop, preserving stdout file descriptor 2017-10-31 15:41:59 -07:00
Ryan Sundberg d765626688 Prefix syslog-ng shutdown scripts with boot order 2017-10-31 14:24:18 -07:00