From 6160dadd8ed7706b92cceaffc8a99831d92bab15 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Dec 20 2022 19:29:13 +0000
Subject: Merge branch 'hellcp/paste-corrections' into production


Correct the paste profile and role

https://gitlab.infra.opensuse.org/infra/salt/-/merge_requests/601

---

diff --git a/pillar/role/paste.sls b/pillar/role/paste.sls
index ad805b2..a113877 100644
--- a/pillar/role/paste.sls
+++ b/pillar/role/paste.sls
@@ -37,3 +37,10 @@ nginx:
                 - access_log: /var/log/nginx/paste.access.log combined
                 - error_log: /var/log/nginx/paste.error.log
           enabled: True
+
+zypper:
+  repositories:
+    devel:languages:ruby:
+      baseurl: http://download.infra.opensuse.org/repositories/devel:/languages:/ruby/$releasever/
+      priority: 100
+      refresh: True
diff --git a/salt/profile/paste/init.sls b/salt/profile/paste/init.sls
index d998f41..d1d3668 100644
--- a/salt/profile/paste/init.sls
+++ b/salt/profile/paste/init.sls
@@ -11,7 +11,6 @@ paste_dependencies:
       - postgresql-devel
       - postgresql-server-devel
       - {{ ruby }}-devel
-      - {{ ruby }}-rubygem-bundler
       - system-user-wwwrun
 
 paste_user:
@@ -26,7 +25,7 @@ https://github.com/openSUSE/paste-o-o.git:
   git.latest:
     - branch: main
     - target: /srv/www/paste-o-o
-    - rev: master
+    - rev: main
     - user: paste
 
 paste_ruby_dependencies: