External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-09 06:32:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

dnsmasq.sh: Don't fix it if it ain't broken

Browse Source 
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2024-10-12 23:07:25 +02:00
parent 7ed6552110
commit 94332db835
No known key found for this signature in database
GPG Key ID: 44FD368932E645C1
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ncp/CONFIG/nc-datadir.sh
View File

@ -103,7 +103,7 @@ configure()
cd /var/www/nextcloud cd /var/www/nextcloud
[[ "$BUILD_MODE" == 1 ]] || save_maintenance_mode [[ "$BUILD_MODE" == 1 ]] || save_maintenance_mode
echo "moving data directory from ${SRCDIR} to ${BASEDIR}..." echo "moving data directory from ${SRCDIR} to ${DATADIR}..."
# use subvolumes, if BTRFS # use subvolumes, if BTRFS
[[ "$(stat -fc%T "${BASEDIR}")" == "btrfs" ]] && ! is_docker && { [[ "$(stat -fc%T "${BASEDIR}")" == "btrfs" ]] && ! is_docker && {

19
bin/ncp/NETWORKING/dnsmasq.sh
View File

@ -14,30 +14,39 @@ install()
set -x set -x
apt-get update apt-get update
apt-get install --no-install-recommends -y dnsmasq apt-get install --no-install-recommends -y dnsmasq
sleep 10
rc=0 rc=0
service dnsmasq status > /dev/null 2>&1 || rc=$? service dnsmasq status > /dev/null 2>&1 || rc=$?
[[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]] && command -v systemd-resolve > /dev/null || { if [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]]
then
echo "Applying workaround for dnsmasq bug (compare issue #1446)" echo "Applying workaround for dnsmasq bug (compare issue #1446)"
mkdir -p /etc/systemd/resolved.conf.d mkdir -p /etc/systemd/resolved.conf.d
if systemctl status systemd-resolved if systemctl status systemd-resolved
then then
cat <<EOF > /etc/systemd/resolved.conf.d/nostublistener.conf cat <<EOF > /etc/systemd/resolved.conf.d/nostublistener.conf
[Resolve] [Resolve]
DNSStubListener=no DNSStubListener=no
EOF EOF
[[ "$INIT_SYSTEM" != "systemd" ]] || systemctl restart systemd-resolved [[ "$INIT_SYSTEM" != "systemd" ]] || systemctl restart systemd-resolved
else elif systemctl status resolvconf
then
systemctl stop resolvconf systemctl stop resolvconf
systemctl start dnsmasq systemctl start dnsmasq
systemctl status dnsmasq systemctl status dnsmasq
else
echo "dnsmasq failed to start and no workaround could be found. This means, the installer failed."
false
fi fi
# service systemd-resolved stop || true # service systemd-resolved stop || true
systemctl start dnsmasq systemctl start dnsmasq
systemctl status dnsmasq systemctl status dnsmasq
} fi
service dnsmasq stop service dnsmasq stop
[[ "$INIT_SYSTEM" != "systemd" ]] || systemctl start systemd-resolved || systemctl start resolvconf if [[ "$INIT_SYSTEM" == "systemd" ]] && systemctl list-unit-files resolvconf.service
then
systemctl start resolvconf
fi
update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service
return 0 return 0

5
install.sh
View File

@ -74,11 +74,6 @@ cp etc/ncp.cfg /usr/local/etc/
cp -r etc/ncp-templates /usr/local/etc/ cp -r etc/ncp-templates /usr/local/etc/
install_app lamp.sh install_app lamp.sh
if [[ -d "/run/systemd/system" ]] && is_lxc
then
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y systemd-resolved
systemctl enable systemd-resolved
fi
install_app bin/ncp/CONFIG/nc-nextcloud.sh install_app bin/ncp/CONFIG/nc-nextcloud.sh
run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh
rm /usr/local/etc/ncp-config.d/nc-nextcloud.cfg # armbian overlay is ro rm /usr/local/etc/ncp-config.d/nc-nextcloud.cfg # armbian overlay is ro