From c3706c33310b671e2c94b41b8d6eea48b8c48a2b Mon Sep 17 00:00:00 2001 From: Peter Law Date: Fri, 15 Mar 2024 13:32:59 +0000 Subject: [PATCH 1/2] Bump modules for latest puppet/Debian support --- modules/apt | 2 +- modules/nodejs | 2 +- modules/stdlib | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/apt b/modules/apt index a0c1931..22ed8ab 160000 --- a/modules/apt +++ b/modules/apt @@ -1 +1 @@ -Subproject commit a0c1931ccc835423a6673e81dce64cd0c61d9f57 +Subproject commit 22ed8ab5509d7f0f553f3dd4fab3c096c17214b0 diff --git a/modules/nodejs b/modules/nodejs index 81c59f8..82e41a7 160000 --- a/modules/nodejs +++ b/modules/nodejs @@ -1 +1 @@ -Subproject commit 81c59f8d1a3742ea63130487c96f8e2b9ec3876e +Subproject commit 82e41a7de4a5d978268fb3aaff049111f7811344 diff --git a/modules/stdlib b/modules/stdlib index 45454b8..76e9ddc 160000 --- a/modules/stdlib +++ b/modules/stdlib @@ -1 +1 @@ -Subproject commit 45454b8de4ff8f860f6f78438107133e510336ed +Subproject commit 76e9ddcccc390b1bce8530260931012a065a29ad From 31421d91cf7f32bb123b108eca9deb4ef6076562 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Fri, 15 Mar 2024 13:33:16 +0000 Subject: [PATCH 2/2] Tell pip3 we're ok with installing at the system level --- modules/compbox/manifests/init.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/compbox/manifests/init.pp b/modules/compbox/manifests/init.pp index c3b244a..331898e 100644 --- a/modules/compbox/manifests/init.pp +++ b/modules/compbox/manifests/init.pp @@ -170,16 +170,19 @@ package { 'sr.comp': ensure => $vcs_ensure, provider => 'pip3', + install_options => ['--break-system-packages'], source => "git+${comp_source}/srcomp.git" } -> package { 'sr.comp.http': ensure => $vcs_ensure, provider => 'pip3', + install_options => ['--break-system-packages'], source => "git+${comp_source}/srcomp-http.git" } package { 'sr.comp.cli': ensure => $vcs_ensure, provider => 'pip3', + install_options => ['--break-system-packages'], source => "git+${comp_source}/srcomp-cli.git", require => Package['sr.comp'] } @@ -351,6 +354,7 @@ package { 'srcomp_pystream': ensure => $vcs_ensure, provider => 'pip3', + install_options => ['--break-system-packages'], source => 'git+https://github.com/WillB97/srcomp-pystream.git' } file { '/var/www/pystream': @@ -381,6 +385,7 @@ package { 'gunicorn': ensure => present, provider => 'pip3', + install_options => ['--break-system-packages'], require => Package['python3-pip'] } $compapi_logging_ini = '/var/www/srcomp-http-logging.ini'