Skip to content

Commit 5d95510

Browse files
devopsecdevopsec
committed
Fix DNSmasq Install for Debian
1 parent 223522f commit 5d95510

File tree

2 files changed

+332
-9
lines changed

2 files changed

+332
-9
lines changed

‎dnsmasq/debian/12.sh‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,22 @@ if [[ "$DSIP_LIB_IMPORTED" != "1" ]]; then
99
fi
1010

1111
function install() {
12-
13-
# mask the service before running package manager to avoid faulty startup errors
14-
systemctl mask dnsmasq.service
15-
1612
apt-get install -y dnsmasq
1713

1814
if (( $? != 0 )); then
1915
printerr 'Failed installing new dns stack'
2016
return 1
2117
fi
2218

23-
# make sure we unmask before configuring the service ourselves
24-
systemctl unmask dnsmasq.service
19+
# configure init.d daemon
20+
cp -f ${DSIP_PROJECT_DIR}/dnsmasq/init.d/dnsmasq /etc/init.d/dnsmasq
21+
chmod 755 /etc/init.d/dnsmasq
22+
touch /usr/share/dnsmasq/installed-marker
2523

2624
# configure dnsmasq systemd service
27-
#cp -f ${DSIP_PROJECT_DIR}/dnsmasq/systemd/dnsmasq-v1.service /lib/systemd/system/dnsmasq.service
28-
#chmod 644 /lib/systemd/system/dnsmasq.service
29-
#systemctl daemon-reload
25+
cp -f ${DSIP_PROJECT_DIR}/dnsmasq/systemd/dnsmasq-v1.service /lib/systemd/system/dnsmasq.service
26+
chmod 644 /lib/systemd/system/dnsmasq.service
27+
systemctl daemon-reload
3028
systemctl enable dnsmasq
3129

3230
# backup the original resolv.conf

‎dnsmasq/init.d/dnsmasq‎

Lines changed: 325 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,325 @@
1+
#!/bin/sh
2+
### BEGIN INIT INFO
3+
# Provides: dnsmasq
4+
# Required-Start: $network $remote_fs $syslog
5+
# Required-Stop: $network $remote_fs $syslog
6+
# Default-Start: 2 3 4 5
7+
# Default-Stop: 0 1 6
8+
# Description: DHCP and DNS server
9+
### END INIT INFO
10+
11+
# Don't exit on error status
12+
set +e
13+
14+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
15+
DAEMON=/usr/sbin/dnsmasq
16+
NAME=dnsmasq
17+
DESC="DNS forwarder and DHCP server"
18+
INSTANCE="${2}"
19+
20+
# Most configuration options in /etc/default/dnsmasq are deprecated
21+
# but still honoured.
22+
ENABLED=1
23+
if [ -r /etc/default/${NAME}${INSTANCE:+.${INSTANCE}} ]; then
24+
. /etc/default/${NAME}${INSTANCE:+.${INSTANCE}}
25+
fi
26+
27+
# Get the system locale, so that messages are in the correct language, and the
28+
# charset for IDN is correct
29+
if [ -r /etc/default/locale ]; then
30+
. /etc/default/locale
31+
export LANG
32+
fi
33+
34+
# The following test ensures the dnsmasq service is not started, when the
35+
# package 'dnsmasq' is removed but not purged, even if the dnsmasq-base
36+
# package is still in place.
37+
test -e /usr/share/dnsmasq/installed-marker || exit 0
38+
39+
test -x ${DAEMON} || exit 0
40+
41+
# Provide skeleton LSB log functions for backports which don't have LSB functions.
42+
if [ -f /lib/lsb/init-functions ]; then
43+
. /lib/lsb/init-functions
44+
else
45+
log_warning_msg () {
46+
echo "${@}."
47+
}
48+
49+
log_success_msg () {
50+
echo "${@}."
51+
}
52+
53+
log_daemon_msg () {
54+
echo -n "${1}: ${2}"
55+
}
56+
57+
log_end_msg () {
58+
if [ "${1}" -eq 0 ]; then
59+
echo "."
60+
elif [ "${1}" -eq 255 ]; then
61+
/bin/echo -e " (warning)."
62+
else
63+
/bin/echo -e " failed!"
64+
fi
65+
}
66+
fi
67+
68+
# RESOLV_CONF:
69+
# If the resolvconf package is installed then use the resolv conf file
70+
# that it provides as the default. Otherwise use /etc/resolv.conf as
71+
# the default.
72+
#
73+
# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit
74+
# filename is set there then this inhibits the use of the resolvconf-provided
75+
# information.
76+
#
77+
# Note that if the resolvconf package is installed it is not possible to
78+
# override it just by configuration in /etc/dnsmasq.conf, it is necessary
79+
# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq.
80+
81+
if [ ! "${RESOLV_CONF}" ] &&
82+
[ "${IGNORE_RESOLVCONF}" != "yes" ] &&
83+
[ -x /sbin/resolvconf ]
84+
then
85+
RESOLV_CONF=/run/dnsmasq/resolv.conf
86+
fi
87+
88+
for INTERFACE in ${DNSMASQ_INTERFACE}; do
89+
DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -i ${INTERFACE}"
90+
done
91+
92+
for INTERFACE in ${DNSMASQ_EXCEPT}; do
93+
DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -I ${INTERFACE}"
94+
done
95+
96+
if [ ! "${DNSMASQ_USER}" ]; then
97+
DNSMASQ_USER="dnsmasq"
98+
fi
99+
100+
# This tells dnsmasq to ignore DNS requests that don't come from a local network.
101+
# It's automatically ignored if --interface --except-interface, --listen-address
102+
# or --auth-server exist in the configuration, so for most installations, it will
103+
# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq
104+
# from being vulnerable to DNS-reflection attacks.
105+
106+
DNSMASQ_OPTS="${DNSMASQ_OPTS} --local-service"
107+
108+
# If the dns-root-data package is installed, then the trust anchors will be
109+
# available in ROOT_DS, in BIND zone-file format. Reformat as dnsmasq
110+
# --trust-anchor options.
111+
112+
ROOT_DS="/usr/share/dns/root.ds"
113+
114+
if [ -f ${ROOT_DS} ]; then
115+
DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne "s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp" $ROOT_DS | tr '\n' ' '`"
116+
fi
117+
118+
start()
119+
{
120+
# Return
121+
# 0 if daemon has been started
122+
# 1 if daemon was already running
123+
# 2 if daemon could not be started
124+
125+
# /run may be volatile, so we need to ensure that
126+
# /run/dnsmasq exists here as well as in postinst
127+
if [ ! -d /run/dnsmasq ]; then
128+
mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || return 2 ; }
129+
chown dnsmasq:nogroup /run/dnsmasq || return 2
130+
fi
131+
[ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq
132+
133+
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null || return 1
134+
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} -- \
135+
-x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \
136+
${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \
137+
${MAILTARGET:+ -t ${MAILTARGET}} \
138+
${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \
139+
${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \
140+
${DHCP_LEASE:+ -l ${DHCP_LEASE}} \
141+
${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \
142+
${RESOLV_CONF:+ -r ${RESOLV_CONF}} \
143+
${CACHESIZE:+ -c ${CACHESIZE}} \
144+
${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \
145+
${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} \
146+
|| return 2
147+
}
148+
149+
start_resolvconf()
150+
{
151+
# If interface "lo" is explicitly disabled in /etc/default/dnsmasq
152+
# Then dnsmasq won't be providing local DNS, so don't add it to
153+
# the resolvconf server set.
154+
for interface in ${DNSMASQ_EXCEPT}; do
155+
[ ${interface} = lo ] && return
156+
done
157+
158+
# Also skip this if DNS functionality is disabled in /etc/dnsmasq.conf
159+
if grep -qs '^port=0' /etc/dnsmasq.conf; then
160+
return
161+
fi
162+
163+
if [ -x /sbin/resolvconf ] ; then
164+
echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.${NAME}${INSTANCE:+.${INSTANCE}}
165+
fi
166+
return 0
167+
}
168+
169+
stop()
170+
{
171+
# Return
172+
# 0 if daemon has been stopped
173+
# 1 if daemon was already stopped
174+
# 2 if daemon could not be stopped
175+
# other if a failure occurred
176+
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --name ${NAME}
177+
}
178+
179+
stop_resolvconf()
180+
{
181+
if [ -x /sbin/resolvconf ] ; then
182+
/sbin/resolvconf -d lo.${NAME}${INSTANCE:+.${INSTANCE}}
183+
fi
184+
return 0
185+
}
186+
187+
status()
188+
{
189+
# Return
190+
# 0 if daemon is running
191+
# 1 if daemon is dead and pid file exists
192+
# 3 if daemon is not running
193+
# 4 if daemon status is unknown
194+
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null
195+
case "${?}" in
196+
0) [ -e "/run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid" ] && return 1 ; return 3 ;;
197+
1) return 0 ;;
198+
*) return 4 ;;
199+
esac
200+
}
201+
202+
case "${1}" in
203+
start)
204+
test "${ENABLED}" != "0" || exit 0
205+
log_daemon_msg "Starting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
206+
start
207+
case "${?}" in
208+
0)
209+
log_end_msg 0
210+
start_resolvconf
211+
exit 0
212+
;;
213+
1)
214+
log_success_msg "(already running)"
215+
exit 0
216+
;;
217+
*)
218+
log_end_msg 1
219+
exit 1
220+
;;
221+
esac
222+
;;
223+
stop)
224+
stop_resolvconf
225+
if [ "${ENABLED}" != "0" ]; then
226+
log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
227+
fi
228+
stop
229+
RETVAL="${?}"
230+
if [ "${ENABLED}" = "0" ]; then
231+
case "${RETVAL}" in
232+
0) log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"; log_end_msg 0 ;;
233+
esac
234+
exit 0
235+
fi
236+
case "${RETVAL}" in
237+
0) log_end_msg 0 ; exit 0 ;;
238+
1) log_warning_msg "(not running)" ; exit 0 ;;
239+
*) log_end_msg 1; exit 1 ;;
240+
esac
241+
;;
242+
checkconfig)
243+
${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1
244+
RETVAL="${?}"
245+
exit ${RETVAL}
246+
;;
247+
restart|force-reload)
248+
test "${ENABLED}" != "0" || exit 1
249+
${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1
250+
if [ ${?} -ne 0 ]; then
251+
NAME="configuration syntax check"
252+
RETVAL="2"
253+
else
254+
stop_resolvconf
255+
stop
256+
RETVAL="${?}"
257+
fi
258+
log_daemon_msg "Restarting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
259+
case "${RETVAL}" in
260+
0|1)
261+
sleep 2
262+
start
263+
case "${?}" in
264+
0)
265+
log_end_msg 0
266+
start_resolvconf
267+
exit 0
268+
;;
269+
*)
270+
log_end_msg 1
271+
exit 1
272+
;;
273+
esac
274+
;;
275+
*)
276+
log_end_msg 1
277+
exit 1
278+
;;
279+
esac
280+
;;
281+
status)
282+
log_daemon_msg "Checking ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
283+
status
284+
case "${?}" in
285+
0) log_success_msg "(running)" ; exit 0 ;;
286+
1) log_success_msg "(dead, pid file exists)" ; exit 1 ;;
287+
3) log_success_msg "(not running)" ; exit 3 ;;
288+
*) log_success_msg "(unknown)" ; exit 4 ;;
289+
esac
290+
;;
291+
dump-stats)
292+
kill -s USR1 `cat /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid`
293+
;;
294+
systemd-start-resolvconf)
295+
start_resolvconf
296+
;;
297+
systemd-stop-resolvconf)
298+
stop_resolvconf
299+
;;
300+
systemd-exec)
301+
# /run may be volatile, so we need to ensure that
302+
# /run/dnsmasq exists here as well as in postinst
303+
if [ ! -d /run/dnsmasq ]; then
304+
mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || return 2 ; }
305+
chown dnsmasq:nogroup /run/dnsmasq || return 2
306+
fi
307+
exec ${DAEMON} -x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \
308+
${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \
309+
${MAILTARGET:+ -t ${MAILTARGET}} \
310+
${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \
311+
${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \
312+
${DHCP_LEASE:+ -l ${DHCP_LEASE}} \
313+
${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \
314+
${RESOLV_CONF:+ -r ${RESOLV_CONF}} \
315+
${CACHESIZE:+ -c ${CACHESIZE}} \
316+
${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \
317+
${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}}
318+
;;
319+
*)
320+
echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload|dump-stats|status}" >&2
321+
exit 3
322+
;;
323+
esac
324+
325+
exit 0

0 commit comments

Comments
 (0)