From e8c843b66174158100e452faf4c9e2a28e80730d Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Dec 29 2022 18:50:01 +0000
Subject: Merge branch 'paste-login' into 'production'


paste-test -> paste

See merge request infra/salt!605
---

diff --git a/pillar/role/paste.sls b/pillar/role/paste.sls
index a113877..da833ce 100644
--- a/pillar/role/paste.sls
+++ b/pillar/role/paste.sls
@@ -23,7 +23,7 @@ nginx:
                 - listen:
                     - 80
                     - default_server
-                - server_name: paste-test.opensuse.org
+                - server_name: paste.opensuse.org
                 - root: /srv/www/paste-o-o/public
                 - keepalive_timeout: 5
                 - try_files $uri/index.html $uri @paste
diff --git a/pillar/secrets/role/paste.sls b/pillar/secrets/role/paste.sls
index 3d4cb61..e50e598 100644
--- a/pillar/secrets/role/paste.sls
+++ b/pillar/secrets/role/paste.sls
@@ -149,70 +149,70 @@ profile:
       secret: |
         -----BEGIN PGP MESSAGE-----
 
-        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
-        WnoDdQj/AJ4Knf4n8UA=
-        =nUCu
+        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
+        +jaJiXwb0VJYT6E7t+Y=
+        =/hhD
         -----END PGP MESSAGE-----
     s3:
       access_key_id: |
diff --git a/salt/profile/paste/files/site.yml b/salt/profile/paste/files/site.yml
index e7bae12..9045aa6 100644
--- a/salt/profile/paste/files/site.yml
+++ b/salt/profile/paste/files/site.yml
@@ -16,5 +16,5 @@ production:
         host: id.opensuse.org
         identifier: "{{ pillar['profile']['paste']['openidc']['client_id'] }}"
         secret: "{{ pillar['profile']['paste']['openidc']['secret'] }}"
-        redirect_uri: https://paste-test.opensuse.org/auth/oidc/callback
+        redirect_uri: https://paste.opensuse.org/auth/oidc/callback
   sign_up_link: "https://idp-portal.suse.com/univention/self-service/#page=createaccount"