From 0e401cdab9c8439640593ea3c3e8b728e87bfe59 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Mon, 13 Nov 2017 14:03:46 -0500
Subject: [PATCH] Default dev configuration to build modules locally

---
 Vagrantfile    |  2 +-
 conf/config.py | 51 ++++++--------------------------------------------
 2 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 5c06c3ee..f9167247 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,10 +31,10 @@ $script = <<SCRIPT
         rpm-build \
         swig \
         systemd-devel
-    mkdir /etc/module-build-service/
     cd /tmp/module_build_service
     python setup.py develop
     python setup.py egg_info
+    ln -s /tmp/module_build_service/conf /etc/module-build-service
     pip install -r test-requirements.txt
 SCRIPT
 
diff --git a/conf/config.py b/conf/config.py
index db528b99..c34d01a2 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -95,51 +95,6 @@ class BaseConfiguration(object):
     CACHE_DIR = '~/modulebuild/cache'
 
 
-class DevConfiguration(BaseConfiguration):
-    DEBUG = True
-    LOG_BACKEND = 'console'
-    LOG_LEVEL = 'debug'
-
-    MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.dev', 'org.fedoraproject.stg']
-
-    ALLOWED_GROUPS = set([
-        'packager',
-        # Make this convenient for f2.0 developers
-        'factory2',
-        'modularity-wg',
-    ])
-
-    # Global network-related values, in seconds
-    NET_TIMEOUT = 5
-    NET_RETRY_INTERVAL = 1
-
-    # Uncomment next line for local builds
-    # SYSTEM = 'mock'
-
-    if path.exists('/home/fedora/modularity.keytab'):
-        KRB_PRINCIPAL = 'modularity@STG.FEDORAPROJECT.ORG'
-        KRB_KEYTAB = '/home/fedora/modularity.keytab'
-        KRB_CCACHE = '/var/tmp/krb5cc'
-    else:
-        # This requires that your principal be listed server side in
-        # ProxyPrincipals, and that is only true for our modularity system
-        # user.
-        # See:
-        # https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=a28a93dad75248c30c1792ec35f588c8e317c067
-        # noqa
-        KOJI_PROXYUSER = False
-
-    KOJI_CONFIG = path.join(confdir, 'koji.conf')
-    KOJI_PROFILE = 'staging'
-    KOJI_ARCHES = ['x86_64']
-    KOJI_REPOSITORY_URL = 'http://kojipkgs.stg.fedoraproject.org/repos'
-
-    OIDC_CLIENT_SECRETS = path.join(confdir, 'client_secrets.json')
-    OIDC_REQUIRED_SCOPE = 'https://mbs.fedoraproject.org/oidc/submit-build'
-
-    COPR_CONFIG = path.join(confdir, 'copr.conf')
-
-
 class TestConfiguration(BaseConfiguration):
     BUILD_LOGS_DIR = '/tmp'
     BUILD_LOGS_NAME_FORMAT = 'build-{id}.log'
@@ -176,3 +131,9 @@ class LocalBuildConfiguration(BaseConfiguration):
     ARCH_FALLBACK = 'x86_64'
 
     ALLOW_CUSTOM_SCMURLS = True
+
+
+class DevConfiguration(LocalBuildConfiguration):
+    DEBUG = True
+    LOG_BACKEND = 'console'
+    COPR_CONFIG = path.join(confdir, 'copr.conf')