Skip to content
This repository has been archived by the owner on Feb 7, 2021. It is now read-only.

Commit

Permalink
fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo Cruz committed Oct 13, 2017
2 parents 1c9dd69 + d4858b2 commit 021029f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions debian/postinst
Expand Up @@ -8,14 +8,14 @@ case ${1:-} in
install -o varnish -g varnish -d /var/lib/varnish-agent
test -f /var/lib/varnish-agent/boot.vcl || \
cat > /var/lib/varnish-agent/boot.vcl <<EOF
# Placeholder file installed by varnish-agent
# Placeholder file installed by varnish-agent
vcl 4.0;
vcl 4.0;
backend {
.host = "127.0.0.1";
.port = "8080";
}
backend {
.host = "127.0.0.1";
.port = "8080";
}
EOF
test -f /etc/varnish/agent_secret || \
(echo "varnish:$(head -c 8 /dev/urandom | base64)" > /etc/varnish/agent_secret && \
Expand Down

0 comments on commit 021029f

Please sign in to comment.