From ce099e55784057dafc72aa21af0f36b1311d155f Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Oct 29 2020 23:47:14 +0000
Subject: Merge branch 'hellcp/pagure-repo' into 'production'


Add the pagure repo and switch to proper db command

See merge request infra/salt!447
---

diff --git a/pillar/role/pagure.sls b/pillar/role/pagure.sls
index 1b83633..f5809b8 100644
--- a/pillar/role/pagure.sls
+++ b/pillar/role/pagure.sls
@@ -17,9 +17,6 @@ profile:
   pagure:
     database_user: pagure
     database_host: 192.168.47.4
-    server_list:
-      - code.opensuse.org
-      - pagure01.infra.opensuse.org
 
 nginx:
   ng:
@@ -84,3 +81,10 @@ nginx:
                 - location /:
                     - try_files: $uri @pagure_docs
           enabled: True
+
+zypper:
+  repositories:
+    openSUSE:infrastructure:pagure:
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/pagure/openSUSE_Leap_$releasever/
+      priority: 100
+      refresh: True
diff --git a/salt/profile/pagure/init.sls b/salt/profile/pagure/init.sls
index f62565e..90f2789 100644
--- a/salt/profile/pagure/init.sls
+++ b/salt/profile/pagure/init.sls
@@ -37,7 +37,7 @@ pagure_alembic_conf:
 
 pagure_database_setup:
   cmd.run:
-    - name: python3 /usr/share/pagure/pagure_createdb.py -c /etc/pagure/pagure.cfg -i /etc/pagure/alembic.ini
+    - name: python3 /usr/share/pagure/pagure_createdb.py -c /etc/pagure/pagure.cfg
 
 {% set services = ['pagure_web', 'pagure_docs_web', 'pagure_worker', 'pagure_authorized_keys_worker', 'pagure_api_key_expire_mail.timer', 'pagure_mirror_project_in.timer'] %}