diff --git a/install_nextcloud.sh b/install_nextcloud.sh index 4cf974c..86c7da0 100755 --- a/install_nextcloud.sh +++ b/install_nextcloud.sh @@ -1480,12 +1480,17 @@ else echo "# -" >> $log_file echononl "Add key for ColaboraOnline Repository.." - #echo "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D" >> $log_file - #apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D >> $log_file 2>&1 - echo "wget -O /tmp/co-apt.key \\ + #echo "wget -O /tmp/co-apt.key \\ + #https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg" >> $log_file + + #wget -O /tmp/co-apt.key \ + # https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg >> $log_file 2>&1 + + echo "wget -O /etc/apt/trusted.gpg.d/collaboraonline-release-keyring.gpg \\ https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg" >> $log_file - wget -O /tmp/co-apt.key \ + + wget -O /etc/apt/trusted.gpg.d/collaboraonline-release-keyring.gpg \ https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg >> $log_file 2>&1 if [[ "$?" -gt 0 ]]; then @@ -1495,13 +1500,14 @@ else else echo "" >> $log_file echo "apt-key add /tmp/co-apt.key" >> $log_file - apt-key add /tmp/co-apt.key >> $log_file 2>&1 - if [[ "$?" -eq 0 ]]; then - echo_ok - else - _failed=true - echo_failed - fi + + #apt-key add /tmp/co-apt.key >> $log_file 2>&1 + #if [[ "$?" -eq 0 ]]; then + # echo_ok + #else + # _failed=true + # echo_failed + #fi fi if $_failed ; then @@ -1525,14 +1531,29 @@ else echo "# -" >> $log_file echononl "Add debian Repository for ColaboraOnline" +# cat <> $log_file +#cat < /etc/apt/sources.list.d/collaboraonline.list +#deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian${os_version} ./ +#EOF +#END +# cat < /etc/apt/sources.list.d/collaboraonline.list 2>> $log_file +#deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian${os_version} ./ +#EOF + cat <> $log_file -cat < /etc/apt/sources.list.d/collaboraonline.list -deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian${os_version} ./ -EOF +cat < /etc/apt/sources.list.d/collaboraonline.sources +Types: deb +URIs: https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb +Suites: ./ +Signed-By: /etc/apt/trusted.gpg.d/collaboraonline-release-keyring.gpg END - cat < /etc/apt/sources.list.d/collaboraonline.list 2>> $log_file -deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian${os_version} ./ + cat < /etc/apt/sources.list.d/collaboraonline.sources 2>> $log_file +Types: deb +URIs: https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb +Suites: ./ +Signed-By: /etc/apt/trusted.gpg.d/collaboraonline-release-keyring.gpg EOF + if [ "$?" = 0 ]; then echo_ok else