Skip to content

Instantly share code, notes, and snippets.

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 7f78680..112ad70 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -5,6 +5,7 @@
<%- else -%>
@version: 3.3
<%- end -%>
+@include "scl.conf"
##
#!/bin/sh
TMPFILE=$(mktemp --tmpdir logrotate.XXXXXXXXXX)
cleanup() {
rm -f $TMPFILE
}
trap cleanup EXIT
test -x /usr/sbin/logrotate || exit 0
/usr/sbin/logrotate -v /etc/logrotate.conf > $TMPFILE 2>&1
@tfheen
tfheen / keybase.md
Created April 10, 2014 14:16
keybase.md

Keybase proof

I hereby claim:

  • I am tfheen on github.
  • I am tfheen (https://keybase.io/tfheen) on keybase.
  • I have a public key whose fingerprint is A284 11A5 9619 3171 3318 02C0 B65A 4871 CA19 D717

To claim this, I am signing this object:

diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py
index b222f75..c480477 100644
--- a/jenkins_jobs/builder.py
+++ b/jenkins_jobs/builder.py
@@ -32,7 +32,7 @@ import fnmatch
from jenkins_jobs.errors import JenkinsJobsException
logger = logging.getLogger(__name__)
-MAGIC_MANAGE_STRING = "<!-- Managed by Jenkins Job Builder -->"
+MAGIC_MANAGE_STRING = "<!-- Managed by Jenkins Job Builder: %s -->"
U-Boot 2013.04-dirty (Jul 10 2013 - 14:02:53)
I2C: ready
DRAM: 512 MiB
WARNING: Caches not enabled
NAND: No NAND device found!!!
0 MiB
MMC: OMAP SD/MMC: 0, OMAP SD/MMC: 1
*** Warning - readenv() failed, using default environment
Enten: mumudvb.service
[Unit]
Description=Digital television streaming program
[Service]
Type=forking
PermissionsStartOnly=true
ExecStartPre=/usr/local/sbin/run-before-mumudvb
ExecStart=/usr/bin/mumudvb --card 0 -c /etc/mumudvb/card0.conf
[Unit]
Description=lighty2
[Service]
ExecStart=/usr/local/sbin/lighttpd2 -c /etc/lighttpd2/angel.conf
Restart=on-failure
[Install]
WantedBy=multi-user.target
diff --git a/bin/varnishd/cache_dir.c b/bin/varnishd/cache_dir.c
index 2463aa8..73cae9b 100644
--- a/bin/varnishd/cache_dir.c
+++ b/bin/varnishd/cache_dir.c
@@ -94,12 +94,14 @@ VDI_RecycleFd(struct sess *sp)
struct vbc *
VDI_GetFd(const struct director *d, struct sess *sp)
{
-
+ struct vbc *vbc;
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index c00d427..dc5f234 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -210,6 +210,9 @@ struct params {
unsigned bo_cache;
+ /* Install a SIGSEGV handler */
+ unsigned sigsegv_handler;
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index c00d427..dc5f234 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -210,6 +210,9 @@ struct params {
unsigned bo_cache;
+ /* Install a SIGSEGV handler */
+ unsigned sigsegv_handler;