Solved package-manager bugs

This commit is contained in:
Kevin Veen-Birkenbach 2025-04-01 17:33:19 +02:00
parent 7042f28a79
commit 213b74ff84
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
11 changed files with 22 additions and 15 deletions

View File

@ -9,7 +9,7 @@ def run_ansible_vault(action, filename, password_file):
cmd = ["ansible-vault", action, filename, "--vault-password-file", password_file]
subprocess.run(cmd, check=True)
def run_ansible_playbook(inventory:str, playbook:str, modes:[bool], limit:str=None, password_file:str=None, verbose:bool=False):
def run_ansible_playbook(inventory: str, playbook: str, modes: dict, limit: str = None, password_file: str = None, verbose: int = 0):
"""Execute an ansible-playbook command with optional parameters."""
cmd = ["ansible-playbook", "-i", inventory, playbook]
@ -28,7 +28,8 @@ def run_ansible_playbook(inventory:str, playbook:str, modes:[bool], limit:str=No
cmd.extend(["--ask-vault-pass"])
if verbose:
cmd.append("-v")
# Append a single flag with multiple "v"s (e.g. -vvv)
cmd.append("-" + "v" * verbose)
subprocess.run(cmd, check=True)
@ -59,7 +60,9 @@ def main():
playbook_parser.add_argument("--cleanup", action="store_true", help="Enable cleanup mode")
playbook_parser.add_argument("--debug", action="store_true", help="Enable debugging output")
playbook_parser.add_argument("--password-file", help="Path to the Vault password file")
playbook_parser.add_argument("-v", "--verbose", action="store_true", help="Enable verbose output")
playbook_parser.add_argument("-v", "--verbose", action="count", default=0,
help=("Increase verbosity. This option can be specified multiple times "
"to increase the verbosity level (e.g., -vvv for more detailed debug output)."))
args = parser.parse_args()

View File

@ -1,6 +1,6 @@
- name: install directory-validator
command:
cmd: "pkgmgr install directory-validator"
cmd: "pkgmgr install directory-validator --clone-mode https"
when: run_once_backup_directory_validator is not defined
- name: run the backup_directory_validator tasks once

View File

@ -1,6 +1,6 @@
- name: install backup-docker-to-local
command:
cmd: "pkgmgr install backup-docker-to-local"
cmd: "pkgmgr install backup-docker-to-local --clone-mode https"
when: run_once_backup_docker_to_local is not defined
- name: Retrieve backup-docker-to-local path from pkgmgr

View File

@ -1,6 +1,6 @@
- name: install cleanup-failed-docker-backups
command:
cmd: "pkgmgr install cleanup-failed-docker-backups"
cmd: "pkgmgr install cleanup-failed-docker-backups --clone-mode https"
when: run_once_cleanup_failed_docker_backups is not defined
- name: Retrieve backup-docker-to-local path from pkgmgr

View File

@ -1,4 +1,11 @@
---
- name: Ensure GitHub host key is in known_hosts
known_hosts:
path: "~/.ssh/known_hosts"
name: github.com
key: "{{ lookup('pipe', 'ssh-keyscan -t ed25519 github.com | grep -v \"^#\"') }}"
become: yes
- name: Create installation directory for Kevin's Package Manager
file:
path: "{{ pkgmgr_install_path }}"
@ -31,7 +38,7 @@
when: run_once_package_manager is not defined
- name: Run the Package Manager install command to create an alias for Kevins package manager
command: "{{ pkgmgr_install_command }}"
command: "make setup"
args:
chdir: "{{ pkgmgr_install_path }}"
become: yes

View File

@ -15,6 +15,3 @@ pkgmgr_config_path: "{{pkgmgr_install_path}}/config/config.yaml"
# The directory where executable aliases will be installed (ensure it's in your PATH)
binaries_directory: "/usr/local/bin"
# The command to run to install/update the Package Manager's aliases
pkgmgr_install_command: "./main.py install pkgmgr"

View File

@ -22,5 +22,5 @@ galaxy_info:
issue_tracker_url: "https://s.veen.world/cymaisissues"
documentation: "https://s.veen.world/cymais"
dependencies:
- git
- package-manager
- systemd-notifier

View File

@ -1,6 +1,6 @@
- name: install auto-btrfs-balancer
- name: install btrfs-auto-balancer
command:
cmd: "pkgmgr install auto-btrfs-balancer"
cmd: "pkgmgr install btrfs-auto-balancer --clone-mode https"
when: run_once_system_btrfs_auto_balancer is not defined
- name: configure system-btrfs-auto-balancer.cymais.service

View File

@ -4,4 +4,4 @@ OnFailure=systemd-notifier.cymais@%n.service
[Service]
Type=oneshot
ExecStart=/bin/sh -c 'auto-btrfs-balancer 90 10'
ExecStart=/bin/sh -c 'btrfs-auto-balancer 90 10'

View File

@ -1,6 +1,6 @@
- name: install swap-forge
command:
cmd: "pkgmgr install backup-docker-to-local"
cmd: "pkgmgr install backup-docker-to-local --clone-mode https"
become: true
- name: Execute create swapfile script