packaging: rename bareos-com-release.key

The name is misleading, because there is no separate key for bareos.com
releases. This patch renames the file to bareos-release.key.
This patch also remame some .in files that don't have any configurable
strings in them to their basename (so they won't be configured anymore).
The patch also removes some legacy code and comments from
plaforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in.

core/debian/univention-bareos.install.in → core/debian/univention-bareos.install

@@ -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

core/platforms/univention/CMakeLists.txt

@@ -57,7 +57,7 @@ install(
 )
 
 install(
-  FILES "bareos-com-release.key"
+  FILES "bareos-release.key"
   DESTINATION "${confdir}"
 )
 

core/platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in

@@ -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)