From 6a62c44ce4047f575a3bace3b6e2b39df8e73044 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Fri, 8 Aug 2025 08:34:40 +0200 Subject: [PATCH 1/2] Removes ctorrent from repo --- debian/ogrepository.install | 1 - debian/ogrepository.postinst | 56 +------------------------------- installer/files/ctorrent.sources | 6 ---- 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 installer/files/ctorrent.sources diff --git a/debian/ogrepository.install b/debian/ogrepository.install index 525da26..00788a6 100644 --- a/debian/ogrepository.install +++ b/debian/ogrepository.install @@ -1,7 +1,6 @@ api/* /opt/opengnsys/ogrepository/api/ bin/* /opt/opengnsys/ogrepository/bin/ etc/* /opt/opengnsys/ogrepository/etc/ -installer/files/ctorrent.sources /etc/apt/sources.list.d/ installer/files/ogrepo-api.service /etc/systemd/system/ installer/files/ogrepo-smb.conf /etc/samba/ installer/ssh-keys/* /opt/opengnsys/ogrepository/etc/ diff --git a/debian/ogrepository.postinst b/debian/ogrepository.postinst index f4b344e..4a99dc3 100755 --- a/debian/ogrepository.postinst +++ b/debian/ogrepository.postinst @@ -40,28 +40,8 @@ USER="opengnsys" # Provisionar base de datos si es necesario en caso de instalación. - -# Detectar si es una instalación nueva o una actualización -# if [ "$1" = "configure" ] && [ -z "$2" ]; then -# systemd-run --no-block /bin/bash -c " -# sleep 10; -# apt update -y; -# for pkg in bittorrent bittornado ctorrent; do -# if ! dpkg -l | grep -qw \"\$pkg\"; then -# apt install -y \"\$pkg\" -# fi -# done -# " if [ "$1" = "configure" ] && [ -z "$2" ]; then - systemd-run --no-block /bin/bash -c " -sleep 10; -apt update -y; -for pkg in bittorrent bittornado ctorrent; do - if ! dpkg -l | grep -qw \"\$pkg\"; then - apt install -y \"\$pkg\" - fi -done -" + sed -i "s/%%OGREPOSITORY_USER%%/$SAMBA_USER/g" /etc/systemd/system/ogrepo-api.service sed -i "s/%%OGREPOSITORY_USER%%/$SAMBA_USER/g" /etc/samba/ogrepo-smb.conf @@ -150,38 +130,4 @@ systemctl enable ogrepo-api systemctl restart ogrepo-api systemctl restart smbd -# echo "ogrepository-trigger" > /var/lib/dpkg/triggers/ogrepository.trigger -# POST_INVOKE_SCRIPT="/var/lib/dpkg/info/ogrepository.trigger" - -# echo "Registrando post-invoke para instalación de paquetes adicionales..." - -# cat < "$POST_INVOKE_SCRIPT" -# #!/bin/sh -# set -e - -# echo "Ejecutando post-trigger: Instalando bittorrent, bittornado y ctorrent..." - -# export DEBIAN_FRONTEND=noninteractive -# apt-get update -# apt-get install -y bittorrent bittornado ctorrent - -# echo "Instalación de paquetes adicionales completada." - -# exit 0 -# EOF - -# chmod +x "$POST_INVOKE_SCRIPT" - -# # Intentar ejecutar el script ahora si no hay otro proceso de apt corriendo -# if ! pgrep -x "apt" > /dev/null; then -# echo "Ejecutando instalación de paquetes adicionales inmediatamente..." -# "$POST_INVOKE_SCRIPT" -# else -# echo "Apt está en uso, los paquetes se instalarán después." -# fi - -# find /opt/opengnsys/ogrepository -type f -name "*.py" -exec chmod +x {} \; - -# dpkg-trigger --by-package=ogrepository ogrepository-trigger - exit 0 diff --git a/installer/files/ctorrent.sources b/installer/files/ctorrent.sources deleted file mode 100644 index dc5dea0..0000000 --- a/installer/files/ctorrent.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ftp.de.debian.org/debian -Suites: buster -Components: main -Signed-By: /usr/share/keyrings/debian-archive-buster-stable.gpg - From acc5f3d445b84b0dadce756c545ce278a618e7d9 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Fri, 8 Aug 2025 08:49:33 +0200 Subject: [PATCH 2/2] refs #2609 Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48fe097..456d8ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ - OgGit functionality (#2371, #2363, #2363, #2317) +### Removed + - Removed unused BitTorrent-related packages and logic + ## [0.9.0] - 2025-06-25 ## Added