diff --git a/scripts/init-ubuntu.sh b/scripts/init-ubuntu.sh index bcf1e0180..388e8456d 100755 --- a/scripts/init-ubuntu.sh +++ b/scripts/init-ubuntu.sh @@ -117,7 +117,11 @@ if [[ "${ubuntu_version}" == "22.04" ]]; then cd /tmp && apt install -y --no-install-recommends ./libcollectdclient1_5.12.0-9_amd64.deb ./collectd-core_5.12.0-9_amd64.deb ./collectd_5.12.0-9_amd64.deb ./collectd-utils_5.12.0-9_amd64.deb && rm -f /tmp/collectd_*.deb echo -e "\nLD_PRELOAD=/usr/lib/python3.10/config-3.10-x86_64-linux-gnu/libpython3.10.so" >> /etc/default/collectd else - apt-get install -y --no-install-recommends collectd collectd-utils + if ! apt-get install -y --no-install-recommends collectd collectd-utils; then + # FQDNLookup is true in default debian config. The box code has a custom collectd.conf that fixes this + echo "Failed to install collectd, continuing anyway. Presumably because of http://mailman.verplant.org/pipermail/collectd/2015-March/006491.html" + fi + if [[ "${ubuntu_version}" == "20.04" ]]; then echo -e "\nLD_PRELOAD=/usr/lib/python3.8/config-3.8-x86_64-linux-gnu/libpython3.8.so" >> /etc/default/collectd fi @@ -139,7 +143,7 @@ sed -e '/Port 22/ i # NOTE: Cloudron only supports moving SSH to port 202. See h # https://bugs.launchpad.net/ubuntu/+source/base-files/+bug/1701068 echo "==> Disabling motd news" -if [ -f "/etc/default/motd-news" ]; then +if [[ -f "/etc/default/motd-news" ]]; then sed -i 's/^ENABLED=.*/ENABLED=0/' /etc/default/motd-news fi diff --git a/setup/start/collectd/collectd.conf b/setup/start/collectd/collectd.conf index 695a22436..3163507f2 100644 --- a/setup/start/collectd/collectd.conf +++ b/setup/start/collectd/collectd.conf @@ -13,7 +13,7 @@ ############################################################################## Hostname "localhost" -#FQDNLookup true +FQDNLookup false #BaseDir "/var/lib/collectd" #PluginDir "/usr/lib/collectd" #TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"