From b7c49486121ee91adb30b7bd6bed4dce6cc975a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Tue, 11 Apr 2017 13:24:25 +0200 Subject: [PATCH] Drop OIDC settings, we will use NO_AUTH --- roles/copr/mbs/tasks/main.yml | 3 --- roles/copr/mbs/templates/client_secrets.json | 12 ------------ roles/copr/mbs/templates/config.py | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 roles/copr/mbs/templates/client_secrets.json diff --git a/roles/copr/mbs/tasks/main.yml b/roles/copr/mbs/tasks/main.yml index e18c8e5916..0585785507 100644 --- a/roles/copr/mbs/tasks/main.yml +++ b/roles/copr/mbs/tasks/main.yml @@ -118,9 +118,6 @@ - name: Copy config for copr-cli template: src=copr.conf dest=/etc/module-build-service/copr.conf -- name: Install client_secrets.json - template: src=client_secrets.json dest=/etc/module-build-service/ - - name: Upgrade database command: mbs-upgradedb diff --git a/roles/copr/mbs/templates/client_secrets.json b/roles/copr/mbs/templates/client_secrets.json deleted file mode 100644 index ff490935ca..0000000000 --- a/roles/copr/mbs/templates/client_secrets.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "web": { - "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization", - "client_id": "mbs-authorizer", - "client_secret": "{{ copr_mbs_client_secret }}", - "redirect_uris": [ - "http://localhost:13747/" - ], - "token_uri": "https://id.stg.fedoraproject.org/openidc/Token", - "token_introspection_uri": "https://id.stg.fedoraproject.org/openidc/TokenInfo" - } -} diff --git a/roles/copr/mbs/templates/config.py b/roles/copr/mbs/templates/config.py index e5c06e998b..409fef36e6 100644 --- a/roles/copr/mbs/templates/config.py +++ b/roles/copr/mbs/templates/config.py @@ -8,8 +8,8 @@ from base_config import confdir, dbdir class ProdConfiguration(base.ProdConfiguration): SYSTEM = 'copr' REQUIRE_PACKAGER = False - OIDC_CLIENT_SECRETS = '/etc/module-build-service/client_secrets.json' SECRET_KEY = '{{ copr_mbs_secret_key }}' + NO_AUTH = True class DevConfiguration(base.DevConfiguration):