diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 6d0c8765e..674b18f03 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -20,6 +20,15 @@ when: not (is_debian_12 or is_ubuntu_2304 or is_ubuntu_2310) # 2020-03-31: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already. +#- name: Install Ubuntu keyrings on Debian +# get_url: +# url: +# dest: /etc/apt/keyrings/ +# mode: 0644 +# timeout: "{{ download_timeout }}" +# when: is_debian_12 + +# use key retrieval from mongodb - name: Use scripts/install_python2.sh to install python2 and virtualenv command: "{{ iiab_dir }}/scripts/install_python2.sh" when: is_debian_12 or is_ubuntu_2304 or is_ubuntu_2310 diff --git a/scripts/install_python2.sh b/scripts/install_python2.sh index 083904e03..3caa3f52e 100755 --- a/scripts/install_python2.sh +++ b/scripts/install_python2.sh @@ -45,10 +45,19 @@ case $ARCH in # trusted is used for Debian and RasPiOS as the keys would be missing for Ubuntu "arm64"|"amd64") - apt -y install ubuntu-keyring + #apt -y install ubuntu-keyring cat << EOF >> /etc/apt/sources.list.d/python2.list -deb [trusted=yes] http://ports.ubuntu.com/ jammy main universe -deb [trusted=yes] http://ports.ubuntu.com/ jammy-updates main universe +# gave 404 errors on U23.04 x86_64 VM +#deb [trusted=yes] http://ports.ubuntu.com/ jammy main universe +#deb [trusted=yes] http://ports.ubuntu.com/ jammy-updates main universe + +# works on U23.04 x86_64 VM need to circle back to U23.04 arm64 and confirm +deb [trusted=yes] http://archive.ubuntu.com/ubuntu jammy main universe +deb [trusted=yes] http://archive.ubuntu.com/ubuntu jammy-updates main universe + +# keys for Debian future work maybe +#deb [signed-by=/usr/share/keyrings/ubuntu-keyring-2018-archive.gpg] http://ports.ubuntu.com/ jammy main universe +#deb [signed-by=/usr/share/keyrings/ubuntu-keyring-2018-archive.gpg] http://ports.ubuntu.com/ jammy-updates main universe EOF ;; @@ -72,6 +81,7 @@ EOF # armhf compile flags differ between RasPiOS and Ubuntu if ! [ -f /etc/rpi-issue ]; then cat << EOF >> /etc/apt/sources.list.d/python2.list +# these might change deb http://ports.ubuntu.com/ jammy main universe deb http://ports.ubuntu.com/ jammy-updates main universe EOF