fix certification issue on update

- the joinscript does not run each update
- ship the config directly in the container
- make the cert available through preinst
- put the cert on the right spot and call update-ca-certificates in setup

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2020-01-16 09:42:11 +01:00
Родитель cd435871f6
Коммит 76abf3411c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 7424F1874854DF23
5 изменённых файлов: 8 добавлений и 10 удалений

Просмотреть файл

@ -63,6 +63,8 @@ RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
lbzip2 \
unattended-upgrades
COPY resources/ldap.conf /etc/ldap/
RUN apt clean
RUN a2enmod headers

10
inst
Просмотреть файл

@ -72,7 +72,6 @@ nextcloud_main() {
nextcloud_modify_users "$@"
nextcloud_add_Administrator_to_admin_group
nextcloud_mark_initial_conig_done
nextcloud_import_ucs_certificates
detect_collabora
detect_onlyoffice
joinscript_save_current_version
@ -398,15 +397,6 @@ nextcloud_modify_users() {
done
}
nextcloud_import_ucs_certificates () {
cat /etc/univention/ssl/ucsCA/CAcert.pem | \
docker exec -i "$(ucr get appcenter/apps/nextcloud/container)" \
bash -c 'cat > /usr/local/share/ca-certificates/ucs-root-ca.crt'
docker exec "$(ucr get appcenter/apps/nextcloud/container)" update-ca-certificates
docker exec -i "$(ucr get appcenter/apps/nextcloud/container)" \
bash -c "sed -i 's#TLS_CACERT.*#TLS_CACERT /usr/local/share/ca-certificates/ucs-root-ca.crt#' /etc/ldap/ldap.conf"
}
nextcloud_mark_initial_conig_done() {
touch "$NC_PERMCONFDIR/initial_config_done" || die "Could not touch initial config flag"
}

Просмотреть файл

@ -40,4 +40,6 @@ EOL
chmod +x "$NC_UCR_FILE"
cp /etc/univention/ssl/ucsCA/CAcert.pem "$NC_PERMCONFDIR/ucs.crt"
exit 0

1
resources/ldap.conf Normal file
Просмотреть файл

@ -0,0 +1 @@
TLS_CACERT /usr/local/share/ca-certificates/ucs.crt

3
setup
Просмотреть файл

@ -49,6 +49,9 @@ error_msg() {
NC_DATADIR="$NC_PERMDATADIR/nextcloud-data"
NC_UCR_FILE="$NC_PERMCONFDIR/ucr"
mv "$NC_PERMCONFDIR/ucs.crt" /usr/local/share/ca-certificates/ucs.crt 2>&1 | error_msg
update-ca-certificates 2>&1 | error_msg
cd /var/www/html
if [ ! -x occ ]; then
error_msg "/var/www/html/occ missing or not executable – was the docker container modified manually?"