Skip to content
Permalink
Browse files

Merge pull request #356 from dev/arogge/master/univention-packaging

Remove public-key for Univention from Repository
  • Loading branch information
arogge committed Dec 2, 2019
2 parents 4eb5c96 + f8b60d3 commit 3b4d190809ddc4657369a4da5563c1fb6ec5878d
@@ -1,4 +1,4 @@
/etc/bareos/bareos-com-release.key
/etc/bareos/bareos-release.key
/etc/bareos/autogenerated/clients/generic.template
/etc/bareos/autogenerated/clients/windows.template
/etc/cron.d/univention-bareos
@@ -57,7 +57,11 @@ install(
)

install(
FILES "bareos-com-release.key"
# This file contains the Bareos repository signature public.
# During the automatic build process, It will be added.
# For manual builds, download the file from
# http://download.bareos.org/bareos/release/<RELEASE>/<DISTRIBUTION>/Release.key
FILES "bareos-release.key"
DESTINATION "${confdir}"
)

This file was deleted.

@@ -11,25 +11,15 @@ password = configRegistry.get('bareos/subscription/password', '')
if username and password:

bareos_major_version = @BAREOS_VERSION_MAJOR@.@BAREOS_VERSION_MINOR@
#bareos_sign_key_id = 'F93C028C093BFBA2'

ucs_version = configRegistry.get('version/version')
bareos_univention_dist = '@OBS_DISTRIBUTION@'

#
# example:
# http://download.bareos.com/bareos/release/15.2/Univention_4.0/
# https does not work on UCS 4.0, even if apt-transport-https is installed.
# With UCS 4.2, https can and will be used.
#
bareos_com_url = "https://{username}:{password}@download.bareos.com/bareos/release/{version}/{dist}".format(username=quote(username), password=password, version=bareos_major_version, dist=bareos_univention_dist)

# import the bareos signing key from a keyserver (does work, if internet connection is available)
#cmd = subprocess.Popen(['apt-key', 'adv', '--keyserver', 'pool.sks-keyservers.net', '--recv-key', bareos_sign_key_id], stdout=sys.stderr, stderr=sys.stderr)
sys.stderr.write("importing bareos.com release key: ")
cmd = subprocess.Popen(['apt-key', 'add', '/etc/bareos/bareos-com-release.key'], stdout=sys.stderr, stderr=sys.stderr)
cmd = subprocess.Popen(['apt-key', 'add', '/etc/bareos/bareos-release.key'], stdout=sys.stderr, stderr=sys.stderr)
rc = cmd.wait()
#sys.stderr.write("rc=" + str(rc) + "\n")

print "deb {url} /".format(url=bareos_com_url)

This file was deleted.

0 comments on commit 3b4d190

Please sign in to comment.
You can’t perform that action at this time.