6 files changed, 40 insertions, 5 deletions
diff --git a/net-dns/getdns/files/stubby.confd b/net-dns/getdns/files/stubby.confd
deleted file mode 100644
index b862ea4a40d7..000000000000
--- a/net-dns/getdns/files/stubby.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/stubby: config file for /etc/init.d/stubby
-
-# See stubby -h for possible options to put here.
-STUBBY_OPTS=""
diff --git a/net-dns/getdns/files/stubby.confd-r1 b/net-dns/getdns/files/stubby.confd-r1
new file mode 100644
index 000000000000..9c8d83f07f79
--- /dev/null
+++ b/net-dns/getdns/files/stubby.confd-r1
@@ -0,0 +1,16 @@
+# /etc/conf.d/stubby: config file for /etc/init.d/stubby
+
+# Enter here Stubby YAML configuration file to use.
+STUBBY_CONFIG_FILE="/etc/stubby/stubby.yml"
+
+# Set here Stubby log level to use.
+# Following log levels are available:
+#	0: EMERG  - System is unusable
+#	1: ALERT  - Action must be taken immediately
+#	2: CRIT   - Critical conditions
+#	3: ERROR  - Error conditions
+#	4: WARN   - Warning conditions
+#	5: NOTICE - Normal, but significant, condition
+#	6: INFO   - Informational message
+#	7: DEBUG  - Debug-level message
+STUBBY_LOGLEVEL="5"
diff --git a/net-dns/getdns/files/stubby.initd b/net-dns/getdns/files/stubby.initd-r1
index 170db9be07fe..e6b799919e28 100755
--- a/net-dns/getdns/files/stubby.initd
+++ b/net-dns/getdns/files/stubby.initd-r1
@@ -2,8 +2,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
+stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
 command="capsh"
-command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${STUBBY_OPTS}'"
+command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
 pidfile="/var/run/stubby/stubby.pid"
 name="DNS Privacy Daemon"
 
@@ -18,4 +19,5 @@ depend()
 start_pre()
 {
 	checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
+	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
 }
diff --git a/net-dns/getdns/files/stubby.logrotate b/net-dns/getdns/files/stubby.logrotate
new file mode 100644
index 000000000000..48058782594c
--- /dev/null
+++ b/net-dns/getdns/files/stubby.logrotate
@@ -0,0 +1,7 @@
+/var/log/stubby.log {
+	rotate 4
+	compress
+	size 200k
+	noolddir
+	missingok
+}
diff --git a/net-dns/getdns/files/stubby.systemd b/net-dns/getdns/files/stubby.systemd
new file mode 100644
index 000000000000..b85b8e90b036
--- /dev/null
+++ b/net-dns/getdns/files/stubby.systemd
@@ -0,0 +1,12 @@
+[Unit]
+Description=stubby DNS resolver
+
+[Service]
+WorkingDirectory=/run/stubby
+ExecStart=/usr/bin/stubby
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+User=stubby
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/getdns/files/stubby.tmpfilesd b/net-dns/getdns/files/stubby.tmpfilesd
new file mode 100644
index 000000000000..bf70492743ad
--- /dev/null
+++ b/net-dns/getdns/files/stubby.tmpfilesd
@@ -0,0 +1,2 @@
+# tmpfiles.d (5) for use with stubby.service
+d /run/stubby 0750 root stubby - -