File 01-osc_devlab_config.patch of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 01-osc_devlab_config.patch of Package osc

diff --git a/osc/conf.py b/osc/conf.py
index a289083..f505171 100644
--- a/osc/conf.py
+++ b/osc/conf.py
@@ -21,11 +21,11 @@ After reading the config, urllib2 is initialized.
 
 The configuration dictionary could look like this:
 
-{'apisrv': 'https://api.opensuse.org/',
+{'apisrv': 'https://obs-api.home.drop.net/',
  'user': 'joe',
- 'api_host_options': {'api.opensuse.org': {'user': 'joe', 'pass': 'secret'},
-                      'apitest.opensuse.org': {'user': 'joe', 'pass': 'secret',
-                                               'http_headers':(('Host','api.suse.de'),
+ 'api_host_options': {'obs-api.home.drop.net': {'user': 'joe', 'pass': 'secret'},
+                      'obs-test.home.drop.net': {'user': 'joe', 'pass': 'secret',
+                                               'http_headers':(('Host','obs-devel.home.drop.net'),
                                                                ('User','faye'))},
                       'foo.opensuse.org': {'user': 'foo', 'pass': 'foo'}},
  'build-cmd': '/usr/bin/build',
@@ -94,17 +94,17 @@ def _get_processors():
     except ValueError as e:
         return 1
 
-DEFAULTS = {'apiurl': 'https://api.opensuse.org',
+DEFAULTS = {'apiurl': 'https://obs-api.home.drop.net',
             'user': None,
             'pass': None,
             'passx': None,
-            'packagecachedir': '/var/tmp/osbuild-packagecache',
+            'packagecachedir': os.path.expanduser('~/tmp/osbuild-packagecache'),
             'su-wrapper': 'sudo',
 
             # build type settings
             'build-cmd': '/usr/bin/build',
             'build-type': '',                   # may be empty for chroot, kvm or xen
-            'build-root': '/var/tmp/build-root/%(repo)s-%(arch)s',
+            'build-root': os.path.expanduser('~/tmp/build-root/%(project)s-%(package)s-%(repo)s-%(arch)s'),
             'build-uid': '',                    # use the default provided by build
             'build-device': '',                 # required for VM builds
             'build-memory': '',                 # required for VM builds
@@ -130,21 +130,21 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
             'no_preinstallimage': '0',
             'traceback': '0',
             'post_mortem': '0',
-            'use_keyring': '0',
+            'use_keyring': '1',
             'gnome_keyring': '0',
-            'cookiejar': '~/.osc_cookiejar',
+            'cookiejar': '~/.config/osc/cookiejar',
             # fallback for osc build option --no-verify
-            'no_verify': '0',
+            'no_verify': '1',
             # enable project tracking by default
             'do_package_tracking': '1',
             # default for osc build
             'extra-pkgs': '',
             # default repository
-            'build_repository': 'openSUSE_Factory',
+            'build_repository': 'CentOS_7',
             # default project for branch or bco
-            'getpac_default_project': 'openSUSE:Factory',
+            'getpac_default_project': 'distributions:CentOS:CentOS-7',
             # alternate filesystem layout: have multiple subdirs, where colons were.
-            'checkout_no_colon': '0',
+            'checkout_no_colon': '1',
             # change filesystem layout: avoid checkout from within a proj or package dir.
             'checkout_rooted': '0',
             # local files to ignore with status, addremove, ....
@@ -176,12 +176,15 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
             'maintained_attribute': 'OBS:Maintained',
             'maintenance_attribute': 'OBS:MaintenanceProject',
             'maintained_update_project_attribute': 'OBS:UpdateProject',
-            'show_download_progress': '0',
+            'show_download_progress': '1',
             # path to the vc script
             'vc-cmd': '/usr/lib/build/vc',
 
             # heuristic to speedup Package.status
-            'status_mtime_heuristic': '0'
+            'status_mtime_heuristic': '0',
+
+            # Force the use of SecretService keyring
+            'creds_mgr': 'SecretService Keyring'
 }
 
 # some distros like Debian rename and move build to obs-build
@@ -201,7 +204,7 @@ boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'tr
     'status_mtime_heuristic']
 integer_opts = ['build-jobs']
 
-api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realname', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj']
+api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realname', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj', 'credentials_mgr_class']
 
 new_conf_template = """
 [general]
@@ -314,7 +317,7 @@ apiurl = %(apiurl)s
 #http_retries = 3
 
 # Skip signature verification of packages used for build.
-#no_verify = 1
+no_verify = %(no_verify)s
 
 # jump into the debugger in case of errors
 #post_mortem = 1
@@ -322,6 +325,9 @@ apiurl = %(apiurl)s
 # print call traces in case of errors
 #traceback = 1
 
+# use KDE/Gnome/MacOS/Windows keyring for credentials if available
+#use_keyring = %(use_keyring)s
+
 # check for unversioned/removed files before commit
 #check_filelist = 1
 
@@ -349,9 +355,15 @@ apiurl = %(apiurl)s
 # was specified the review will be accepted for this group (default: off)
 #review_inherit_group = 1
 
+# Force credential_mgr to SecretService
+creds_mgr=%(creds_mgr)s
+
 [%(apiurl)s]
+user = %(user)s
+#pass =
+cafile = /etc/pki/tls/certs/ca-bundle.crt
 # set aliases for this apiurl
-# aliases = foo, bar
+aliases = private, dev
 # real name used in .changes, unless the one from osc meta prj <user> will be used
 # realname =
 # email used in .changes, unless the one from osc meta prj <user> will be used
@@ -361,6 +373,17 @@ apiurl = %(apiurl)s
 #       User: mumblegack
 # Plain text password
 #pass =
+# Skip signature verification of packages used for build for the API.
+no_verify = %(no_verify)s
+# Force using of keyring for this API
+keyring = %(use_keyring)s
+
+#[https://api.opensuse.org]
+#aliases = pub, public
+## Skip signature verification of packages used for build for the API.
+#no_verify = %(no_verify)s
+## Force using of keyring for this API
+#keyring = %(use_keyring)s
 """

Places

File 01-osc_devlab_config.patch of Package osc

Places