diff --git a/setup/start.sh b/setup/start.sh index e1c7484d1..e2569ccf3 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -13,7 +13,6 @@ readonly BOX_SRC_DIR="${HOME_DIR}/box" readonly PLATFORM_DATA_DIR="${HOME_DIR}/platformdata" # platform data readonly APPS_DATA_DIR="${HOME_DIR}/appsdata" # app data readonly BOX_DATA_DIR="${HOME_DIR}/boxdata" # box data -readonly CONFIG_DIR="${HOME_DIR}/configs" readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly json="$(realpath ${script_dir}/../node_modules/.bin/json)" @@ -88,14 +87,6 @@ systemctl daemon-reload systemctl restart systemd-journald setfacl -n -m u:${USER}:r /var/log/journal/*/system.journal -echo "==> Creating config directory" -mkdir -p "${CONFIG_DIR}" - -# remove old cloudron.conf. Can be removed after 3.4 -rm -f "${CONFIG_DIR}/cloudron.conf" -$json -f /etc/cloudron/cloudron.conf -I -e "delete this.version" # remove the version field -chown -R "${USER}" /etc/cloudron - echo "==> Setting up unbound" # DO uses Google nameservers by default. This causes RBL queries to fail (host 2.0.0.127.zen.spamhaus.org) # We do not use dnsmasq because it is not a recursive resolver and defaults to the value in the interfaces file (which is Google DNS!) @@ -198,7 +189,6 @@ else fi echo "==> Changing ownership" -chown "${USER}:${USER}" -R "${CONFIG_DIR}" # be careful of what is chown'ed here. subdirs like mysql,redis etc are owned by the containers and will stop working if perms change chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" "${PLATFORM_DATA_DIR}/update" chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true diff --git a/src/test/setupTest b/src/test/setupTest index 7e5723fe6..efd8e8e34 100755 --- a/src/test/setupTest +++ b/src/test/setupTest @@ -10,7 +10,6 @@ readonly source_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd)" rm -rf $HOME/.cloudron_test 2>/dev/null || true # some of those docker container data requires sudo to be removed mkdir -p $HOME/.cloudron_test cd $HOME/.cloudron_test -mkdir -p configs mkdir -p appsdata mkdir -p boxdata/appicons boxdata/mail boxdata/certs boxdata/mail/dkim/localhost boxdata/mail/dkim/foobar.com mkdir -p platformdata/addons/mail platformdata/nginx/cert platformdata/nginx/applications platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup platformdata/logs/tasks