refs #2789 Updates changelog

.gitignore

@@ -7,5 +7,3 @@ debian/files
 debian/*.debhelper
 debian/*.debhelper.log
 debian/debhelper-build-stamp
-.venv/
-.vscode/

CHANGELOG.md

@@ -1,49 +1,15 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [0.10.7] - 2026-09-17
-
-### Fixed
-- **createTorrentSum**: Corregido error (`OSError: [Errno 22] Invalid argument`) al calcular la suma de verificación MD5 de los ficheros de imagen cuando estos ocupan menos de 1 MB, ajustando dinámicamente el `seek_offset` al tamaño real del fichero.
-
-## [0.10.6] - 2026-07-27
-
-### Added
-- API de Repositorios Git (`repo_api.py`): Implementado el endpoint `DELETE /ogrepository/v1/git/repositories/<repo>` que sustituye al antiguo código "Not implemented". Ahora se encarga de eliminar el repositorio correctamente de la base de datos de Forgejo y de purgar el directorio `.git` del disco duro.
-
-### Changed
-
-- **createTorrentSum**: Optimizada la creación de ficheros torrent (`mktorrent`) calculando el tamaño de pieza (`-l`) de forma dinámica según el tamaño de la imagen, evitando archivos `.torrent` con cientos de miles de piezas que saturaban el tracker en imágenes muy grandes. Se ha incrementado `target_pieces` a 200.000 para garantizar que las piezas no superen los 2 MB en imágenes de hasta 400 GB.
-
-## [0.10.5] - 2026-04-14
-
-### Fixed
-
-- Force 755 permissions on `/opt/opengnsys` in `preinst` to prevent `oggit` user from being locked out when `useradd` creates the directory with a restrictive umask (e.g. 027), which caused `opengnsys-forgejo` to fail to start during installation before `postinst` could apply the correct permissions
-- Ensure forgejo working directory (`var/lib/forgejo/work`) is created in `postinst` before setting ownership, and restart `opengnsys-forgejo` after fixing permissions so it recovers from a failed state caused by the ordering between dependency and package configuration
-
-## [0.10.4] - 2025-09-30
-
-### Fixed
-
-- Set safe.directory just once
-
-## [0.10.3] - 2025-09-18
-
-### Changed
-
-- Create tags via a query to the forgejo API
+## [0.10.3] - 2025-09-22 
+### Changed 
+- Actualiza sudoers para permitir ejecutar cpio sin contraseña
 
 ## [0.10.2] - 2025-09-01
 
-### Fixed
+## Fixed
 
-- Corregida la logica en el endpoint create torrent sum
-- Mejoras en los mensajes de logs
+- Corregida la logica en el endpoint create torrent sum 
+- Mejoras en los mensajes de logs 
 - Mejoras en la validación de los archivos info e info.checked
 
 ## [0.10.1] - 2025-08-25
@@ -59,13 +25,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - OgGit functionality (#2371, #2363, #2363, #2317)
 
-### Removed
+### Removed 
 
 - Removed unused BitTorrent-related packages and logic
 
 ## [0.9.0] - 2025-06-25
 
-### Added
+## Added
 
 - Changed old tools for tools non dependant of Pyhton2 in repo
 - mktorrent to handle creation of torrent files

Jenkins/Jenkinsfile-deb-pkg

@@ -62,19 +62,6 @@ pipeline {
             }
         }
 
-        stage('Generate Changelog (Devel)') {
-            when {
-                branch 'devel'
-            }
-            steps {
-                script {
-                    def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME
-                    def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL
-                    generateDebianChangelog(env.BUILD_DIR, devName, devEmail, "devel")
-                }
-            }
-        }
-
         stage('Build') {
             steps {
                 script {
@@ -110,19 +97,6 @@ pipeline {
                 }
             }
         }
-
-        stage ('Publish to Debian Repository (Devel)') {
-            when {
-                branch 'devel'
-            }
-            agent { label 'debian-repo' }
-            steps {
-               script {
-                    def versionPattern = "-${env.BUILD_NUMBER}~devel"
-                    publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogrepository', 'devel', versionPattern)
-                }
-            }
-        }
     }
     post {
         success {
@@ -135,13 +109,6 @@ pipeline {
                               string(name: 'TRIGGERED_BY', value: "${env.JOB_NAME}-${env.BUILD_NUMBER}")
                           ]
                 }
-                if (env.BRANCH_NAME == 'devel') {
-                    build job: 'Aptly publish develop repository',
-                          wait: false,
-                          parameters: [
-                              string(name: 'TRIGGERED_BY', value: "${env.JOB_NAME}-${env.BUILD_NUMBER}")
-                          ]
-                }
             }
 
         }

api/repo_api.py

@@ -14,13 +14,15 @@ Librerías Python requeridas: - flask (se puede instalar con "sudo apt install p
                              - flasgger (se puede instalar con "sudo apt install python3-flasgger")
 """
 
+# --------------------------------------------------------------------------------------------
+#                                        IMPORTS
+# --------------------------------------------------------------------------------------------
+
 from flask import Flask, jsonify, request
 import os
 import subprocess
 import json
-import time
-import sys
-import git
+from time import sleep
 import paramiko
 import logging
 import threading
@@ -32,8 +34,13 @@ from systemd import journal
 # Imports para Swagger:
 from flasgger import Swagger
 import yaml
+import time
 
 
+# --------------------------------------------------------------------------------------------
+#                                        VARIABLES
+# --------------------------------------------------------------------------------------------
+
 repo_path = '/opt/opengnsys/ogrepository/images/' # No borrar la barra final
 vm_path = '/opt/opengnsys/ogrepository/images_virtual/' # No borrar la barra final
 script_path = '/opt/opengnsys/ogrepository/bin'
@@ -41,10 +48,21 @@ repo_file = '/opt/opengnsys/ogrepository/etc/repoinfo.json'
 trash_file = '/opt/opengnsys/ogrepository/etc/trashinfo.json'
 config_file = '/opt/opengnsys/ogrepository/etc/ogAdmRepo.cfg'
 
+
+
+
+# --------------------------------------------------------------------------------------------
+#                                        GIT
+# --------------------------------------------------------------------------------------------
+
 REPOSITORIES_BASE_PATH = "/opt/opengnsys/ogrepository/oggit/git/"
 OGGIT_USER = "oggit"
 OGGIT_FORGEJO_PORT = 3100
 
+import sys
+import git
+import paramiko
+
 
 # --------------------------------------------------------------------------------------------
 #                                        FUNCTIONS
@@ -255,7 +273,7 @@ def check_lock_local(image_file_path, job_id):
     journal.send("Running function 'check_lock_local'...", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
     # Esperamos 30 segundos, para dar tiempo a que se cree el archivo ".lock":
-    time.sleep(30)
+    sleep(30)
 
     # Creamos un bucle infinito:
     while True:
@@ -292,7 +310,7 @@ def check_lock_local(image_file_path, job_id):
             journal.send("Task in process (.lock file exists)", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
         # Esperamos 1 minuto para volver a realizar la comprobación:
-        time.sleep(60)
+        sleep(60)
 
 
 # ---------------------------------------------------------
@@ -317,7 +335,7 @@ def check_remote_backup(image_name, remote_ip, remote_user, remote_path, job_id)
     sftp_client = ssh_client.open_sftp()
 
     # Esperamos 30 segundos antes de empezar a realizar la comprobación:
-    time.sleep(30)
+    sleep(30)
 
     # Creamos una lista con las extensiones de los archivos asociados a la imagen (incluyendo ninguna extensión, que corresponde a la propia imagen):
     extensions = ['', '.size', '.sum', '.full.sum', '.info']
@@ -406,7 +424,7 @@ def check_remote_backup(image_name, remote_ip, remote_user, remote_path, job_id)
             journal.send("Task in process (backup incomplete)", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
         # Esperamos 1 minuto para volver a realizar la comprobación:
-        time.sleep(60)
+        sleep(60)
 
     # Ya fuera del bucle, cerramos el cliente SSH y el cliente SFTP:
     ssh_client.close()
@@ -472,7 +490,7 @@ def check_aux_files(image_file_path, job_id):
             recall_ogcore(data)
             break
         # Esperamos 10 segundos para volver a realizar la comprobación:
-        time.sleep(10)
+        sleep(10)
 
 
 # ---------------------------------------------------------
@@ -488,7 +506,7 @@ def check_virtual_image_conversion(image_name, job_id):
     journal.send("Running function 'check_virtual_image_conversion'...", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
     # Esperamos 30 segundos, para dar tiempo a que se cree algún archivo:
-    time.sleep(30)
+    sleep(30)
 
     # Construimos la ruta de la imagen (una vez convertida):
     image_file_path = f"{repo_path}{image_name}.img"
@@ -529,7 +547,7 @@ def check_virtual_image_conversion(image_name, job_id):
             journal.send("Task in process (Conversion not finalized)", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
         # Esperamos 1 minuto para volver a realizar la comprobación:
-        time.sleep(60)
+        sleep(60)
 
 
 # ---------------------------------------------------------
@@ -544,7 +562,7 @@ def check_virtual_image_reconversion(image_name, vm_extension, job_id):
     journal.send("Running function 'check_virtual_image_reconversion'...", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
     # Esperamos 30 segundos, para dar tiempo a que se cree algún archivo:
-    time.sleep(30)
+    sleep(30)
 
     # Construimos la ruta de la imagen virtual (una vez exportada), y la ruta de exportación:
     virtual_image_file_path = f"{vm_path}export/{image_name}.{vm_extension}"
@@ -586,7 +604,7 @@ def check_virtual_image_reconversion(image_name, vm_extension, job_id):
             journal.send("Task in process (Conversion not finalized)", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
 
         # Esperamos 1 minuto para volver a realizar la comprobación:
-        time.sleep(60)
+        sleep(60)
 
 
 # ---------------------------------------------------------
@@ -1486,7 +1504,7 @@ def send_udpcast():
         result = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='UTF8')
 
         # Comprobamos si está corriendo el proceso correspondiente de "udp-sender" (esperando 5 segundos para darle tiempo a iniciarse):
-        time.sleep(5)
+        sleep(5)
         process_running = search_process('udp-sender', f"{param_dict['name']}.{param_dict['extension']}")
 
         # Evaluamos el resultado de la ejecución, y devolvemos una respuesta:
@@ -1559,7 +1577,7 @@ def send_uftp():
         result = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='UTF8')
 
         # Comprobamos si está corriendo el proceso correspondiente de "uftp" (esperando 5 segundos para darle tiempo a iniciarse):
-        time.sleep(5)
+        sleep(5)
         process_running = search_process('uftp', f"{param_dict['name']}.{param_dict['extension']}")
 
         # Evaluamos el resultado de la ejecución, y devolvemos una respuesta:
@@ -1641,7 +1659,7 @@ def send_p2p():
 
     # Comprobamos si el tracker y el seeder están corriendo, y si apuntan al directorio que le hemos pasado
     #   (esperamos 10 segundos antes de hacerlo, porque los procesos no se inician inmediatamente):
-    time.sleep(10)
+    sleep(10)
     seeder_running = search_process('aria2c', f"{param_dict['name']}.img.torrent")  # El seeder se ejecuta con "aria2c" y el nombre de la imagen como parámetro
 
 
@@ -2249,11 +2267,6 @@ def rename_image():
 #
 # -----------------------------------------------------------
 
-def repo_set_safe_directory (repo, path):
-    try:
-        repo.git.config ('--get', 'safe-directory')
-    except:
-        repo.git.config ('--global', '--add', 'safe.directory', path)
 
 def git_forgejo_post_command(url, json_data):
     token = ""
@@ -2288,37 +2301,6 @@ def git_forgejo_create_repo(repo):
                         "private" : False
                     })
 
-def git_forgejo_delete_command(url):
-    token = ""
-    with open("/opt/opengnsys/etc/ogGitApiToken.cfg", "r", encoding='utf-8') as token_file:
-        token = token_file.read().strip()
-
-    if url[0] == "/":
-        url = url[1:]
-
-    url = f"http://localhost:{OGGIT_FORGEJO_PORT}/{url}"
-
-    journal.send(f"Executing forgejo DELETE to {url}...", PRIORITY=journal.LOG_DEBUG, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-
-    r = requests.delete(
-        url,
-        headers = { 'Authorization' : f"token {token}" },
-        timeout = 60
-    )
-
-    journal.send(f"Request status was {r.status_code}, content {r.content}", PRIORITY=journal.LOG_DEBUG, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-
-    return r.status_code, r.content.decode('utf-8')
-
-def git_forgejo_delete_repo(repo):
-    return git_forgejo_delete_command(f"/api/v1/repos/oggit/{repo}")
-
-def git_forgejo_create_tag(repo,tag,msg,target):
-    return git_forgejo_post_command(f"/api/v1/repos/oggit/{repo}/tags", {
-        "message":  msg,
-        "tag_name": tag,
-        "target":   target
-    })
 
 def git_forgejo_add_sshkey(pubkey, description = ""):
     return git_forgejo_post_command("/api/v1/user/keys",
@@ -2333,7 +2315,7 @@ def git_compact_repository_task(repo, job_id):
 
     git_repo_path = os.path.join(REPOSITORIES_BASE_PATH, OGGIT_USER, repo + ".git")
     git_repo = git.Repo(git_repo_path)
-    repo_set_safe_directory (git_repo, git_repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', git_repo_path)
 
     git_repo.git.gc()
 
@@ -2350,7 +2332,7 @@ def git_sync_repository_task(repo, remote_repository, job_id):
 
     git_repo_path = os.path.join(REPOSITORIES_BASE_PATH, OGGIT_USER, repo + ".git")
     git_repo = git.Repo(git_repo_path)
-    repo_set_safe_directory (git_repo, git_repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', git_repo_path)
 
     # Recreate the remote every time, it might change
     if "backup" in git_repo.remotes:
@@ -2378,7 +2360,7 @@ def git_backup_repository_task(repo, params, job_id):
 
     git_repo_path = os.path.join(REPOSITORIES_BASE_PATH, OGGIT_USER, repo + ".git")
     git_repo = git.Repo(git_repo_path)
-    repo_set_safe_directory (git_repo, git_repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', git_repo_path)
 
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@@ -2478,23 +2460,9 @@ def git_create_repository():
 
     return jsonify({"status": "Repository created"}), 201
 
-@app.route("/ogrepository/v1/git/repositories/<string:repo>", methods=['DELETE'])
-def git_delete_repository(repo):
-    repo_path = os.path.join(REPOSITORIES_BASE_PATH, OGGIT_USER, repo + ".git")
-
-    status, content = git_forgejo_delete_repo(repo)
-    if status not in (204, 404):
-        journal.send(f"Can't delete repository {repo} from forgejo: {content}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-        return jsonify({"error" : f"Failed to delete from forgejo: {content}"}), 500
-
-    if os.path.isdir(repo_path):
-        import shutil
-        shutil.rmtree(repo_path, ignore_errors=True)
-        journal.send(f"Repository {repo} deleted", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-        return jsonify({"status": "Repository deleted"}), 200
-    else:
-        journal.send(f"Repository {repo} already deleted or not found at {repo_path}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-        return jsonify({"status": "Repository already deleted"}), 200
+@app.route("/ogrepository/v1/git/repositories", methods=['DELETE'])
+def git_delete_repository():
+    return jsonify({"error" : "Not implemented"}), 500
 
 @app.route("/ogrepository/v1/git/repositories/<string:repo>/sync", methods=['POST'])
 def git_sync_repository(repo):
@@ -2607,7 +2575,7 @@ def git_get_branches(repo):
         return jsonify({"error": "Repository not found"}), 404
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
     branches = []
     for branch in git_repo.branches:
@@ -2643,7 +2611,7 @@ def git_get_commits(repo, branch):
 
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
 
     if not branch in git_repo.branches:
@@ -2733,7 +2701,7 @@ def git_create_branch(repo):
         return jsonify({"error": "Repository not found"}), 404
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
     data = request.json
     if data is None:
@@ -2778,7 +2746,7 @@ def git_delete_branch(repo, branch):
         return {"error": "Repository not found"}, 404
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
 
     if not branch in git_repo.branches:
@@ -2810,7 +2778,7 @@ def git_list_tags(repo):
         return jsonify({"error": "Repository not found"}), 404
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
 
     tags = []
@@ -2850,6 +2818,14 @@ def git_create_tag(repo):
         - 409: A JSON object with an "error" key containing the message "Tag already exists"
     """
 
+    repo_path = os.path.join(REPOSITORIES_BASE_PATH, OGGIT_USER, repo + ".git")
+    if not os.path.isdir(repo_path):
+        journal.send(f"Can't create tag. Repository storage at {REPOSITORIES_BASE_PATH} not found", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
+        return jsonify({"error": "Repository not found"}), 404
+
+    git_repo = git.Repo(repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
+
     data = request.json
     if data is None:
         journal.send(f"Can't create tag. JSON post data missing", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
@@ -2869,16 +2845,21 @@ def git_create_tag(repo):
     if "message" in data:
         commit_message = data["message"]
 
-    try:
-        res = git_forgejo_create_tag(repo,tag,commit_message,data["commit"])
-    except Exception as e:
-        journal.send (str(e), PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-        return jsonify({"error" : f"git_forgejo_create_tag failed: {e}"}), 500
+    if tag in git_repo.tags:
+        journal.send(f"Can't create tag. Already found in repository {repo}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
+        return jsonify({"error": "Tag already exists"}), 409
+
+    try:
+        git_repo.create_tag(tag, ref = data["commit"], message = commit_message)
+    except git.exc.GitCommandError as ge:
+        if "not a valid tag name" in ge.stderr:
+            journal.send(f"Tag name {tag} is invalid", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
+            return jsonify({"error" : "Invalid tag name"}), 400
+        else:
+            journal.send(f"Git error {ge}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
+            return jsonify({"error" : "Error when performing git command"}), 500
+
 
-    if 200 != res[0]:
-        j = json.loads(res[1])
-        journal.send (j["message"], PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
-        return jsonify({"error" : j["message"]}), 409
 
     journal.send(f"Tag {tag} created in repo {repo}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG")
     return jsonify({"status": "created"}), 200
@@ -2902,7 +2883,7 @@ def git_delete_tag(repo, tag):
         return {"error": "Repository not found"}, 404
 
     git_repo = git.Repo(repo_path)
-    repo_set_safe_directory (git_repo, repo_path)
+    git_repo.git.config('--global', '--add', 'safe.directory', repo_path)
 
 
     if not tag in git_repo.tags:

bin/createTorrentSum.py

@@ -96,13 +96,8 @@ def get_md5_sum(file_path, megabytes=1):
         Se utiliza para crear el archivo ".sum" (para transferencias Unicast y Multicast).
     """
     hash_md5 = hashlib.md5()
-    file_size = os.path.getsize(file_path)
-    seek_offset = -megabytes * 1024 * 1024
-    if file_size < (-seek_offset):
-        seek_offset = -file_size
-        
     with open(file_path, "rb") as f:
-        f.seek(seek_offset, os.SEEK_END)
+        f.seek(-megabytes * 1024 * 1024, os.SEEK_END)
         data = f.read(megabytes * 1024 * 1024)
         hash_md5.update(data)
     return hash_md5.hexdigest()
@@ -139,18 +134,8 @@ def create_torrent(file_path, torrent_file, datafullsum):
     repo_ip = get_IPlocal()
     tracker_url = f"http://{repo_ip}:6969/announce"
 
-    import math
-    file_size = os.path.getsize(file_path)
-    target_pieces = 200000
-    piece_size_target = file_size / target_pieces
-    if piece_size_target <= 262144:
-        l_val = 18
-    else:
-        l_val = math.ceil(math.log(piece_size_target, 2))
-        l_val = max(18, min(26, l_val))
-
     # Creamos una litas para ejecutar el comando mktorrent para crear el archivo torrent
-    splitted_cmd = f"nice -n 0 mktorrent -l {l_val} -a {tracker_url} -c {datafullsum} -o {torrent_file} {file_path}".split()
+    splitted_cmd = f"nice -n 0 mktorrent -a {tracker_url} -c {datafullsum} -o {torrent_file} {file_path}".split()
     print(f"Sending command: {' '.join(splitted_cmd)}")
 
     # Ejecutamos el comando en el sistema, e imprimimos el resultado:

debian/ogrepository.postinst

@@ -110,13 +110,9 @@ chmod 755 /opt/opengnsys/ogrepository/bin/*
 # oggit -- these are from opengnsys-forgejo, and we're overwriting their
 # permissions above.
 #
-# Ensure the forgejo working directory exists and has the right ownership
-# before the service tries to start. This is needed because opengnsys-forgejo
-# is configured (and starts its service) before ogrepository's postinst runs,
-# so without this the service fails with CHDIR/Permission denied.
-if getent passwd oggit > /dev/null 2>&1; then
-    mkdir -p /opt/opengnsys/ogrepository/var/lib/forgejo/work
-    mkdir -p /opt/opengnsys/ogrepository/var/lib/forgejo/data
+# Check if the paths exist just in case the opengnsys-forgejo package
+# stops being a dependency.
+if [ -d "/opt/opengnsys/ogrepository/var/lib/forgejo/" ] ; then
     chown -R oggit:oggit /opt/opengnsys/ogrepository/var/lib/forgejo/
 fi
 
@@ -124,13 +120,6 @@ if [ -d "/opt/opengnsys/ogrepository/oggit/" ] ; then
     chown -R oggit:oggit /opt/opengnsys/ogrepository/oggit/
 fi
 
-# Restart forgejo now that permissions are correct (it may have failed during
-# opengnsys-forgejo's own postinst due to the chown above overwriting its dirs)
-if getent passwd oggit > /dev/null 2>&1; then
-    systemctl reset-failed opengnsys-forgejo 2>/dev/null || true
-    systemctl restart opengnsys-forgejo 2>/dev/null || true
-fi
-
 # Install http server stuff
 # Reiniciar servicios si es necesario
 # systemctl restart nombre_del_servicio

debian/ogrepository.preinst

@@ -24,13 +24,6 @@ else
     echo "Creando el usuario $USER con home en $HOME_DIR."
     useradd -m -d "$HOME_DIR" -s /bin/bash "$USER"
 fi
-
-# Forzar 755 en /opt/opengnsys independientemente del umask del sistema.
-# useradd -m puede crear el directorio con 750 si el umask es 027, lo que
-# impide que el usuario oggit (de opengnsys-forgejo) atraviese el árbol
-# antes de que el postinst de ogrepository aplique su propio chmod.
-mkdir -p "$HOME_DIR"
-chmod 755 "$HOME_DIR"
 echo "Añadiendo el repositorio de Debian Buster en $REPO_FILE..."
 
 # Crear el directorio si no existe