From 0d23297448876312105a6118a7ab8e2149e7cf76 Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Mar 29 2020 11:31:57 +0000 Subject: [PATCH 1/4] updated download links, and release.yaml, code formatting changes, modified fedimg script. --- diff --git a/sites/getfedora.org/fedimg_vars.py b/sites/getfedora.org/fedimg_vars.py old mode 100755 new mode 100644 index 415cd5c..39cfc4f --- a/sites/getfedora.org/fedimg_vars.py +++ b/sites/getfedora.org/fedimg_vars.py @@ -1,109 +1,131 @@ #!/usr/bin/python + """ Return the AMIs uploaded by fedimg for a given set of release vars. - -Search datagrepper to find the results. - + +Search datagrepper to find the results. + Deps: $ sudo dnf install python-requests - + Author: Ralph Bean -License: LGPLv2+ + +License: LGPLv2+ """ - + from __future__ import print_function - + import collections + import functools + from datetime import datetime, timedelta + from hashlib import sha1 + import logging + import shelve + import os - -from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg, check_permissions + + + +from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg logging.basicConfig(level=logging.INFO) - + log = logging.getLogger('fedimg_vars') - + cachefile = '/tmp/fedora_websites_fedimg_alt_%s.cache' - + # We cache this guy on disk for 500s + def collect(release): - - filename = cachefile % (sha1(str(release)).hexdigest()) + + filename = cachefile % (sha1(str(release).encode()).hexdigest()) + shelf = shelve.open(filename) + check_permissions(filename=filename) - + if shelf.get('timestamp') and shelf.get('timestamp') > (datetime.utcnow() - timedelta(hours=1)): + log.info('Retrieving release data from shelf') + toreturn = shelf['collected'] + shelf.close() + return toreturn - + + + results = collections.defaultdict(dict) - + # 1 - transform release vars into an image name we want to query for templates = [ + # The F22 released AMIs uploads didn't appear to go through fedimg, so + # we can't use this scheme for them. Stuff for F23 should all go that + # route though, so we can hopefully switch over soon. + ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.x86_64", { + 'HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', + 'GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', + }), - #("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", { - # 'pre_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', - # 'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', - #}), + + ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", { + + 'pre_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', + + 'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', + + }), + ] - + + + if not os.path.exists('/var/fedora_websites_live_fedimg'): + return mocked_fedimg(templates) + + + results = collections.defaultdict(dict) for template, buckets in templates: - # 2 - Build an intermediary dict - intermediary = collections.OrderedDict() + target = template.format(**release) - log.info("Looking for AMIs for %s" % target) + log.info("Looking for AMIs for %s" % target) + messages = get_messages(target) - for message in messages: - key = message['msg']['image_name'] - if not key in intermediary: - intermediary[key] = [] - intermediary[key].append(message['msg']) - if not intermediary: - log.warn("No AMIs found for %s" % target) - continue + for message in messages: - # What would this even mean? - assert len(intermediary) < 2, "Impossible. Got more than one target." + for name, matches in buckets.items(): - uploads = intermediary[target] + if matches(message['msg']['extra']): - # 3- transform intermediary representation into results - for name, matches in buckets.items(): - for upload in uploads: - if matches(upload['extra']): - ami = upload['extra']['id'] - # The region looks like "EC2 (REGION)", so we strip stuff. - region = upload['destination'] - results[name][region] = ami + ami = message['msg']['extra']['id'] + region = message['msg']['destination'] - # Hardcode AMIs for regions eu-west-3 and us-east-2 for F28 cloud-base - # This is because fedmsg topic 'org.fedoraproject.prod.fedimg.image.upload' - # doesn't have AMI information for these two regions. - results['HVM_base_AMI']['us-east-2'] = 'ami-00b43acad6bfbc73a' - results['HVM_base_AMI']['eu-west-3'] = 'ami-04abc80987c29d6fb' - results['GP2_HVM_base_AMI']['us-east-2'] = 'ami-08d6e766d9302926c' - results['GP2_HVM_base_AMI']['eu-west-3'] = 'ami-0e37bf70f74c79410' - + results[name][region] = ami + + shelf['timestamp'] = datetime.utcnow() + shelf['collected'] = results + shelf.close() - - return results + + + + return results \ No newline at end of file diff --git a/sites/getfedora.org/fedimg_vars_lib.py b/sites/getfedora.org/fedimg_vars_lib.py old mode 100755 new mode 100644 index 0a56172..4188337 --- a/sites/getfedora.org/fedimg_vars_lib.py +++ b/sites/getfedora.org/fedimg_vars_lib.py @@ -48,17 +48,19 @@ def retrieve_messages(): """ Generator that yields messages from datagrepper """ # Get the first page data = get_page(1, 'unknown') + print(data['pages']) for message in data['raw_messages']: + print(message['msg']) yield message - more = functools.partial(get_page, pages=data['pages']) + more = functools.partial(get_page, pages=data['pages']) - # Get all subsequent pages (if there are any...) - for page in range(1, data['pages']): - data = more(page + 1) + # Get all subsequent pages (if there are any...) + for page in range(1, data['pages']): + data = more(page + 1) - for message in data['raw_messages']: - yield message + for message in data['raw_messages']: + yield message def filter_messages(messages, target): diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index 9bb38cd..101ec9e 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -8,11 +8,17 @@ from flask_htmlmin import HTMLMIN import jinja2 import os import yaml -import globalvar -from fedimg_vars import collect as collect_fedimg_vars import re import cloud_ami +""" For the cloud part, this function + will return the results of the ami-ids from the datagrepper, + which will directly be passed to the templates """ + +# from fedimg_vars import collect as collect_results +# release = {'curr_cloud_AMI_id': '31', 'next_cloud_AMI_id': '32', 'curr_cloud_AMI_state': 'Beta', 'RC_gold': '1.9', 'RC_pre_gold': '1.2',} +# results=collect_results(release) + #FEDORA_LANGUAGES = { 'en' : 'English' , 'de': 'Deutsch'} # List of langs from old getfedora.org @@ -137,16 +143,6 @@ def inject_globalvars(): r = {} with open('release.yaml') as data: r = yaml.safe_load(data) - if collect_fedimg_vars is not None: - # Go get AMI ids from datagrepper (or our local cache) - collected_fedimg_vars = collect_fedimg_vars(globalvar.release) - - print(collected_fedimg_vars.items()) - # Overwrite the handwritten vars with ones from datagrepper - # for key, value in collected_fedimg_vars.items(): - # setattr(globalvar, key, value) - - def download_link(override, link): global dl_links if override != 'default': @@ -158,7 +154,6 @@ def inject_globalvars(): checksum_links.add(link) return url_for('checksums.static', filename=link) return dict( - global_variables=globalvar, cloud_ami = cloud_ami, dl=download_link, checksum=checksum_link, @@ -196,6 +191,7 @@ freeze_indexes = set() def export_route(name, path, template=None): global freeze_indexes freeze_indexes.add(name) + def r(): # If requested routing under '/coreos/download/', render with '/coreos/download/index.html' @@ -203,6 +199,13 @@ def export_route(name, path, template=None): # using the request url. if (re.search("^coreos_download_.*$", name)): return render_template(template or '/coreos/download/index.html') + + """ Passing collected results + from fedimg_vars collect() + directly to templates.""" + + #return render_template(template or path.strip('/') + '/index.html', results=results) + return render_template(template or path.strip('/') + '/index.html') r.__name__ = name if freezing: @@ -284,6 +287,6 @@ if __name__ == '__main__': print(link) print("") - print("Checksum links-------------------------------------------------------------------------------------------------------------------------:") + print("Checksum links:") for link in checksum_links: print(link) diff --git a/sites/getfedora.org/release.yaml b/sites/getfedora.org/release.yaml index eac011f..7ca5eaa 100644 --- a/sites/getfedora.org/release.yaml +++ b/sites/getfedora.org/release.yaml @@ -2,21 +2,38 @@ ga: announcement_url: https://fedoramagazine.org/announcing-fedora-31 announcement_release_number: 31 - alt: - checksum_path: ../../../static/checksums + editions: + workstation: + pretty_name: Fedora Workstation + release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Workstation + checksum_arches: [x86_64] + # set to default for default false if the media doesnt exist or + # a link to override the default. + # For F31+ set the i386 ones to false (or delete them and the blocks in + # the download page templates) + download_override: + live_x86_64: default + live_i386: false + netinst_x86_64: false + netinst_i386: false - prev_id: 30 - curr_id: 31 # this is the overall release id not just for alt. - next_id: 32 - curr_name: - next_name: + server: + pretty_name: Fedora Server + release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Server + checksum_arches: [x86_64 aarch64] + # Same as above goes here. + download_override: + standard_x86_64: default + standard_aarch64: default + netinst_x86_64: default + netinst_aarch64: default + raw_aarch64: default + alt: - - altarch: - prev_id: 30 - curr_id: 31 - next_id: 32 - RC: gold: 1.9 # insert the number of the RC version declared GOLD server_gold: 1.9 # insert the number of the RC version declared GOLD @@ -26,9 +43,10 @@ ga: gold_ppc64le: 1.9 # RC Gold for ppc64le gold_s390x: 1.9 # RC Gold for s390x - download_override: - - Server: + Server: + pretty_name: Fedora Server + release_number: 31 + download_override: netinst_x86_64: default #aarch64 dvd_aarch64 : default @@ -40,30 +58,43 @@ ga: dvd_s390x : default netinst_s390x : default - Everything: - + Everything: + pretty_name: Fedora Everything + release_number: 31 + download_override: netinst_x86_64 : default netinst_aarch64 : default netinst_ppc64le : default netinst_s390x : default - Workstation: + Workstation: + pretty_name: Fedora Workstation + release_number: 31 + download_override: raw_aarch64 : default - Spin_minimal: + Spin_minimal: + pretty_name: Fedora Minimal + release_number: 31 + download_override: raw_aarch64 : default - Container: - + Container: + pretty_name: Fedora Container + release_number: 31 + download_override: aarch64 : default ppc64le : default s390x : default - Cloud: + Cloud: + pretty_name: Fedora Cloud + release_number: 31 + download_override: #x86_64 raw_x86_64 : default - qcow2_X86_64 : default + qcow2_x86_64 : default vagrant_x86_64 : default vagrant_vb_x86_64 : default vagrant_libvirt_x86_64 : default @@ -79,43 +110,6 @@ ga: #s390x raw_s390x : default qcow2_s390x : default - - live_i386: false - netinst_x86_64: false - netinst_i386: false - - - - editions: - workstation: - pretty_name: Fedora Workstation - release_number: 31 - rc_version: 1.9 - checksum_prefix: Fedora-Workstation - checksum_arches: [x86_64] - # set to default for default false if the media doesnt exist or - # a link to override the default. - # For F31+ set the i386 ones to false (or delete them and the blocks in - # the download page templates) - download_override: - live_x86_64: default - live_i386: false - netinst_x86_64: false - netinst_i386: false - - server: - pretty_name: Fedora Server - release_number: 31 - rc_version: 1.9 - checksum_prefix: Fedora-Server - checksum_arches: [x86_64 aarch64] - # Same as above goes here. - download_override: - standard_x86_64: default - standard_aarch64: default - netinst_x86_64: default - netinst_aarch64: default - raw_aarch64: default beta: @@ -151,7 +145,6 @@ beta: netinst_aarch64: default raw_aarch64: default alt: - checksum_path: ../../../static/checksums RC: pre_gold: 1.2 # insert the number of the prerelease RC version declared GOLD @@ -159,12 +152,12 @@ beta: pre_gold_aarch64: 1.2 # Pre RC Gold for aarch64 pre_gold_ppc64: 1.2 # Pre RC Gold for ppc64 pre_gold_ppc64le: 1.2 # Pre RC Gold for ppc64le - pre_gold_s390x: 1.2 # Pre RC Gold for s390x - - - download_override: + pre_gold_s390x: 1.2 # Pre RC Gold for s390x - Server: + Server: + pretty_name: Fedora Server + release_number: 32 + download_override: netinst_x86_64: default #aarch64 dvd_aarch64 : default @@ -176,30 +169,43 @@ beta: dvd_s390x : default netinst_s390x : default - Everything: - + Everything: + pretty_name: Fedora Everything + release_number: 32 + download_override: netinst_x86_64 : default netinst_aarch64 : default netinst_ppc64le : default netinst_s390x : default - Workstation: + Workstation: + pretty_name: Fedora Workstation + release_number: 32 + download_override: raw_aarch64 : default - Spin_minimal: + Spin_minimal: + pretty_name: Fedora Minimal + release_number: 32 + download_override: raw_aarch64 : default - Container: - + Container: + pretty_name: Fedora Container + release_number: 31 + download_override: aarch64 : default ppc64le : default s390x : default - Cloud: + Cloud: + pretty_name: Fedora Cloud + release_number: 32 + download_override: #x86_64 raw_x86_64 : default - qcow2_X86_64 : default + qcow2_x86_64 : default vagrant_x86_64 : default vagrant_vb_x86_64 : default vagrant_libvirt_x86_64 : default @@ -215,10 +221,6 @@ beta: #s390x raw_s390x : default qcow2_s390x : default - - live_i386: false - netinst_x86_64: false - netinst_i386: false fmw: osx: @@ -386,220 +388,4 @@ gpg_keys: id: 1024D/731002FA 2004-01-19 fingerprint: D66D 121F 9784 5E7B 2757 8C46 108C 4512 7310 02FA -iso_size: - - #Media - macosx: 23.4 # In MB - windows: 22.7 # In MB - - # Legacy - x86_64_DVD: 1.9 # In GB - i386_DVD: 4.4 # In GB - source_DVD: 9.2 # In GB - i686_Live_Desktop: 922 # In MB - x86_64_Live_Desktop: 953 # In MB - i386_Netinstall: 357 # In MB - x86_64_Netinstall: 321 # In MB - PPC64_DVD: 4.3 # In GB - PPC64_Netinstall: 340 # In MB - aarch64_Server_DVD: 2.8 # In GB - aarch64_Server_net: 552 # In MB - aarch64_Server_raw: 571 # In MB - aarch64_Cloud_net: 459 # In MB - aarch64_qcow2: 313 # In MB - aarch64_raw: 190 # In MB - aarch64_Container: 43 # In MB - aarch64_WS: 2.8 # In GB - aarch64_min: 412 # In MB - ppc64_Server_DVD: 3.0 # In GB - ppc64_Server_net: 597 # In MB - ppc64_Cloud_net: 520 # In MB - ppc64_qcow2: 282 # In MB - ppc64_raw: 158 # In MB - ppc64_Container: 43 # In MB - ppc64le_Server_DVD: 1.9 # In GB - ppc64le_Server_net: 619 # In MB - ppc64le_Cloud_net: 488 # In MB - ppc64le_qcow2: 366 # In MB - ppc64le_raw: 232 # In MB - ppc64le_Container: 42 # In MB - s390x_Server_DVD: 1.7 # In GB - s390x_Server_net: 484 # In MB - s390x_qcow2: 360 # In MB - s390x_raw: 222 # In MB - s390x_Container: 37 # In MB - i686_sda.qcow2: 212 # In MB - x86_64_sda.qcow2: 207 # In MB - i686_raw: 122 # In MB - x86_64_raw: 117 # In MB - # These variables are only necessary to keep fedoraproject.org working - s390_DVD: 1.5 - # Spins - i686_Live_KDE: 1.3 # In GB - x86_64_Live_KDE: 1.8 # In GB - i686_Live_LXDE: 1.3 # In GB - x86_64_Live_LXDE: 1.3 # In GB - i686_Live_LXQt: 1.4 # In GB - x86_64_Live_LXQt: 1.4 # In GB - i686_Live_Xfce: 1.5 # In GB - x86_64_Live_Xfce: 1.5 # In GB - i686_Live_Mate: 2.0 # In GB - x86_64_Live_Mate: 2.0 # In GB - i686_Live_Soas: 895 # In MB - x86_64_Live_Soas: 946 # In MB - i686_Live_Cinnamon: 2.0 # In GB - x86_64_Live_Cinnamon: 2.1 # In GB - # Spins prerelease - pre_i686_Live_KDE: 1.5 # In GB - pre_x86_64_Live_KDE: 1.9 # In GB - pre_i686_Live_LXDE: 1.3 # In GB - pre_x86_64_Live_LXDE: 1.3 # In GB - pre_i686_Live_Xfce: 1.5 # In GB - pre_x86_64_Live_Xfce: 1.5 # In GB - pre_i686_Live_Mate: 1.9 # In GB - pre_x86_64_Live_Mate: 2.0 # In GB - pre_i686_Live_Soas: 802 # In MB - pre_x86_64_Live_Soas: 856 # In MB - pre_i686_Live_Cinnamon: 1.8 # In GB - pre_x86_64_Live_Cinnamon: 1.8 # In GB - pre_i686_Live_LXQt: 1.4 # In GB - pre_x86_64_Live_LXQt: 1.4 # In GB - # Labs - i686_Live_Security: 1.6 # In GB - x86_64_Live_Security: 1.7 # In GB - i686_Live_Games: 4.0 # In GB - x86_64_Live_Games: 4.1 # In GB - i686_Live_Elab: 2.5 # In GB - x86_64_Live_Elab: 2.5 # In GB - i686_Live_Design: 2.4 # In GB - x86_64_Live_Design: 2.4 # In GB - i686_Live_Sci-kde: 3.4 # In GB - x86_64_Live_Sci-kde: 3.7 # In GB - i686_Live_Robotics: 2.5 # In GB - x86_64_Live_Robotics: 2.5 # In GB - i686_Live_Jam: 2.4 # In GB - x86_64_Live_Jam: 2.5 # In GB - i686_Live_Astronomy: 3.5 # In GB - x86_64_Live_Astronomy: 3.6 # In GB - i686_Live_Py_Class: 1.7 # In GB - x86_64_Live_Py_Class: 1.8 # In GB - libvirt_Py_Class: 881 # In MB - virtualbox_Py_Class: 923 # In MB - ARM_Py_Class: 1.2 # In GB - libvirt_Scientific: 2.8 # In GB - virtualbox_Scientific: 2.9 # In GB - # Labs prerelease - pre_i686_Live_Security: 1.5 # In GB - pre_x86_64_Live_Security: 1.6 # In GB - pre_i686_Live_Games: 3.9 # In GB - pre_x86_64_Live_Games: 4.4 # In GB - pre_i686_Live_Elab: 2.5 # In GB - pre_x86_64_Live_Elab: 2.5 # In GB - pre_i686_Live_Design: 2.0 # In GB - pre_x86_64_Live_Design: 2.2 # In GB - pre_i686_Live_Sci-kde: 2.9 # In GB - pre_x86_64_Live_Sci-kde: 3.7 # In GB - pre_i686_Live_Robotics: 2.5 # In GB - pre_x86_64_Live_Robotics: 2.7 # In GB - pre_i686_Live_Jam: 2.0 # In GB - pre_x86_64_Live_Jam: 2.6 # In GB - pre_i686_Live_Astronomy: 2.6 # In GB - pre_x86_64_Live_Astronomy: 3.6 # In GB - pre_i686_Live_Python: 1.7 # In GB - pre_x86_64_Live_Python: 1.7 # In GB - # Server - x86_64_server_DVD: 3.0 # In GB - i386_server_DVD: 2.8 # In GB - x86_64_server_net: 600 # In MB - i386_server_net: 536 # In MB - # Server prerelease - pre_x86_64_server_DVD: 2.7 # In GB - pre_i386_server_DVD: 2.5 # In GB - pre_x86_64_server_net: 571 # In MB - pre_i386_server_net: 525 # In MB - # Workstation - x86_64_workstation: 1.9 # In GB - i386_workstation: 1.8 # In GB - x86_64_workstation_net: 600 # In MB - i386_workstation_net: 556 # In MB - # Workstation prerelease - pre_x86_64_workstation: 1.8 # In GB - pre_i386_workstation: 1.7 # In GB - pre_x86_64_workstation_net: 594 # In MB - pre_i386_workstation_net: 551 # In MB - # Silverblue - x64_silverblue: 2.1 # In GB - # ARM - ARM_Workstation: 1.3 # In GB - ARM_Server: 507 # In MB - ARM_Minimal: 362 # In MB - ARM_KDE: 1.4 # In GB - ARM_Xfce: 1.1 # In MB - ARM_LXDE: 1.1 # In MB - ARM_LXQt: 1.0 # In GB - ARM_Mate: 1.5 # In GB - ARM_SoaS: 730 # In MB - ARM_Python: 1.2 # In GB - # ARM prerelease - pre_ARM_Workstation: 1.4 # In GB - pre_ARM_Server: 479 # In MB - pre_ARM_Minimal: 352 # In MB - pre_ARM_KDE: 1.6 # In GB - pre_ARM_Xfce: 1.3 # In GB - pre_ARM_LXDE: 1.1 # In MB - pre_ARM_LXQt: 1.2 # In MB - pre_ARM_Mate: 1.6 # In GB - pre_ARM_Cinnamon: 780 # In MB - pre_ARM_SoaS: 682 # In MB - # Cloud - raw_x86_64_cloud: 195 # In MB - raw_i386_cloud: 143 # In MB - qcow2_x86_64_cloud: 319 # In MB - qcow2_i386_cloud: 216 # In MB - VBvag_cloud: 279 # In MB - libvag_cloud: 290 # In MB - x86_64_Container: 43 # In MB - x86_64_docker: 43 # In MB NOTE: this is just to make fedoraproject.org build happy - raw_i386_cloud: 144 # In MB - # Note that atomic values here get overwritten by the twoweek script. - atomic_raw_cloud: # In MB - atomic_qcow2_cloud: # In MB - atomic_VBvag_cloud: # In MB - atomic_libvag_cloud: # In MB - VBvag_cloud: 304 # In MB - libvag_cloud: 294 # In MB - x86_64_Container: 51 # In MB - atomic_iso: 918 # In MB - # Cloud prerelease - pre_raw_x86_64_cloud: 150 # In MB - pre_raw_i386_cloud: 172 # In MB - pre_qcow2_x86_64_cloud: 237 # In MB - pre_qcow2_i386_cloud: 268 # In MB - pre_VBvag_cloud: 231 # In MB - pre_libvag_cloud: 223 # In MB - # Note that atomic values here get overwritten by the twoweek script. - pre_atomic_raw_cloud: # In MB - pre_atomic_qcow2_cloud: # In MB - pre_atomic_VBvag_cloud: # In MB - pre_atomic_libvag_cloud: # In MB - pre_atomic_iso: 950 # In MB - pre_x86_64_Container: 43 # In MB - pre_VBvag_cloud: 231 # In MB - pre_libvag_cloud: 223 # In MB - # Manual atomic prerelease image sizes go here. - manual_pre_atomic_raw_cloud: 493 # In MB - manual_pre_atomic_qcow2_cloud: 680 # In MB - manual_pre_atomic_VBvag_cloud: 663 # In MB - manual_pre_atomic_libvag_cloud: 648 # In MB - manual_pre_atomic_iso: 1054 # In MB - # Everything release - x86_64_ev: 601 #In MB - i386_ev: 556 #In MB - s390x_ev: 445 #In MB - aarch64_ev: 552 #In MB - ppc64_ev: 597 #In MB - ppc64le_ev: 578 #In MB - # Everything prerelease - pre_x86_64_ev: 571 #In MB - pre_i386_ev: 525 #In MB diff --git a/sites/getfedora.org/site/alt/altarch/index.html b/sites/getfedora.org/site/alt/altarch/index.html index 1992565..754407e 100644 --- a/sites/getfedora.org/site/alt/altarch/index.html +++ b/sites/getfedora.org/site/alt/altarch/index.html @@ -1,1122 +1,1009 @@ {% extends "master_getfedora.html" %} - -{% from "submenu.html" import submenu with context %} - -{% block css %} - - -{% assets "css_all" %} - -{% endassets %} - -{% endblock %} +{% from "export_regulations.html" import export_regulations %} {% block title %}{% trans trimmed %}Fedora Alternate Architectures{% endtrans %}{% endblock %} - - - + {% block content %}
-
- -
- - {% if releaseinfo.beta.show %} - {% trans trimmed n=releaseinfo.beta.announcement_release_number %} - Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > - {% else %} - - {% trans trimmed n=releaseinfo.ga.announcement_release_number %} - Fedora {{n}} released! - {% endtrans %} - - {% endif %} - -
- -
+
+ +
+ + {% if releaseinfo.beta.show %} + {% trans trimmed n=releaseinfo.beta.announcement_release_number %} + Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > + {% else %} + + {% trans trimmed n=releaseinfo.ga.announcement_release_number %} + Fedora {{n}} released! + {% endtrans %} + + {% endif %} + +
+ +
-
+
-
+
-
+
-
+
-

Using the ARM® aarch64 Architecture?


+

Using the ARM® aarch64 Architecture?


-
+
-
+
-
+
-
+
-
+
-

{% trans trimmed %}These images are for use with AArch64 "Server Base System Architecture" (SBSA) compliant systems or Single Board Computers.{% endtrans %}

+

{% trans trimmed %}These images are for use with AArch64 "Server Base System Architecture" (SBSA) compliant systems or Single Board Computers.{% endtrans %}

-
+
-
    - -
  • +
      -
      - - - -
      + {% if releaseinfo.ga.alt.Server.download_override.dvd_aarch64 %} +
    • -
      +
      + + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server DVD +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Standard ISO Image - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server - {{'%sGB DVD ISO' %global_variables.iso_size['aarch64_Server_DVD']}} +
      -
      + +
      • + {% endif %} + {% if releaseinfo.ga.alt.Server.download_override.netinst_aarch64 %} +
    • +
      + +
      -
      • +
      -
    • + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Netinstall ISO Image -
      - -
      +
      • -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server Netinstall + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server -
      +
      -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server -
      + + {% trans trimmed %}Download{% endtrans %} + -
      +
      - {{'%sMB netinst ISO'% global_variables.iso_size['aarch64_Server_net']}} + + {% endif %} -
      + {% if releaseinfo.ga.alt.Workstation.download_override.raw_aarch64 %} +
    • -
      + +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Workstation.release_number}}: Workstation DVD ISO +
      +
      -
      • -
    • + Fedora {{'%s'%releaseinfo.ga.alt.Workstation.release_number}}: Workstation -
      - - - -
      +
-
+
- Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Workstation + + + {% trans trimmed %}Download{% endtrans %} + -
+
-
+ + {% endif %} + {% if releaseinfo.ga.alt.Spin_minimal.download_override.raw_aarch64 %} +
  • - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Workstation +
    + + -
    +
    • -
    +
    - {{'%sGB raw image'% global_variables.iso_size['aarch64_WS']}} + Fedora {{'%s'%releaseinfo.ga.alt.Spin_minimal.release_number}}: Minimal -
    +
    -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    + Fedora {{'%s'%releaseinfo.ga.alt.Spin_minimal.release_number}}: Minimal - +
    -
  • +
    -
    - - - -
    + + + {% trans trimmed %}Download{% endtrans %} + -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Minimal +
    • + {% endif %} -
    + {% if releaseinfo.ga.alt.Everything.download_override.netinst_aarch64 %} +
  • -
    +
    + + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Minimal +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything - {{'%sMB raw image'% global_variables.iso_size['aarch64_min']}} +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything - - - {% trans trimmed %}Download{% endtrans %} - - -
    +
    -
    • + -
    + + {% endif %} - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything + {% if releaseinfo.ga.alt.Cloud.download_override.qcow2_aarch64 %} +
  • -
    • +
    + + -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (For Openstack) -
    +
    - {{'%sMB dvd iso'% global_variables.iso_size['aarch64_ev']}} +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud qcow2 -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    + -
    - - - -
    + + {% endif %} -
    + {% if releaseinfo.ga.alt.Cloud.download_override.raw_aarch64 %} +
  • - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud qcow2 +
    + + -
    +
    • -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (Compressed Raw Image) -
    +
    -
    +
    - {{'%sMB qcow2 image'% global_variables.iso_size['aarch64_qcow2']}} + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud raw -
    +
    - -
  • +
    • + {% endif %} -
    - - - -
    + {% if releaseinfo.ga.alt.Container.download_override.aarch64 %} +
  • -
    +
    + + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud raw +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container - {{'%sMB raw image'% global_variables.iso_size['aarch64_raw']}} +
    -
    + -
    • + + {% endif %} -
  • + -
    - - - -
    +
    • +
    +
    +

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    -
    + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container +
    -
    +
    -
    + + +
    + +
    + +
    + +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container +

    Support Resources.

    -
    +
    -
    +
    - {{'%sMB Container image'% global_variables.iso_size['aarch64_Container']}} +

    -
    +
    -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    +
    - +

    {% trans trimmed %}  Documentation{% endtrans %}


    +

    {% trans trimmed %}A guide for Fedora on AArch64, including a list of supported hardware platforms and installation instructions is available at the {% endtrans %} Fedora Documentation Site


    +
    - - - +
    -
    -
    -

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - +
    -
    +
    +

    {% trans trimmed %}  Email{% endtrans %}


    +

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} arm@lists.fedoraproject.org

    +
    -
    +
    - - -
    - -
    - -
    - -
    - -

    Support Resources.

    - -
    - -
    - -

    - -
    - -
    - -
    - -

    {% trans trimmed %}  Documentation{% endtrans %}


    -

    {% trans trimmed %}A guide for Fedora on AArch64, including a list of supported hardware platforms and installation instructions is available at the {% endtrans %} Fedora Documentation Site


    -
    - -
    - -
    - -
    -

    {% trans trimmed %}  Email{% endtrans %}


    -

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} arm@lists.fedoraproject.org

    -
    - -
    - -
    - -
    - -

      Chat


    -

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-arm IRC channel on irc.freenode.org for real-time chat

    - -
    - -
    - -
    - -
    +
    -
    -
    - +
    +

      Chat


    +

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-arm IRC channel on irc.freenode.org for real-time chat

    -
    +
    -
    +
    -
    +
    -
    +
    -

    Using the Power (ppc64le) Architecture?


    +
    + + + + +
    + +
    -
    +
    -
    +
    -
    +

    Using the Power (ppc64le) Architecture?


    -
    +
    -
    +
    -

    {% trans trimmed %}PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.{% endtrans %}

    +
    -
    +
    -
      - -
    • +
      -
      - -
      +

      {% trans trimmed %}PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.{% endtrans %}

      -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server DVD +
        -
      + {% if releaseinfo.ga.alt.Server.download_override.dvd_ppc64le %} +
    • -
      +
      + +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Standard ISO Image -
      +
      - {{'%sGB DVD ISO' %global_variables.iso_size['ppc64le_Server_DVD']}} +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server DVD -
      +
      - - - {% trans trimmed %}Download{% endtrans %} - - +
      -
      + + {% trans trimmed %}Download{% endtrans %} + +
      +
      • + {% endif %} - + {% if releaseinfo.ga.alt.Server.download_override.netinst_ppc64le %} +
    • -
    • +
      + +
      -
      - -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Netinstall ISO Image - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server Netinstall +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server +
      -
      +
      -
      - {{'%sMB netinst ISO'% global_variables.iso_size['ppc64le_Server_net']}} + + {% trans trimmed %}Download{% endtrans %} + -
      - -
      +
      • + {% endif %} + {% if releaseinfo.ga.alt.Everything.download_override.netinst_ppc64le %} +
    • -
      • - +
      + -
    • +
      • -
      - - - -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything +
      -
      +
      -
      - {{'%sMB dvd iso'% global_variables.iso_size['ppc64le_ev']}} + + {% trans trimmed %}Download{% endtrans %} + -
      +
      - + {% if releaseinfo.ga.alt.Cloud.download_override.qcow2_ppc64le %} +
    • -
      • +
      -
    • + -
      - - - -
      +
      • -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud qcow2 + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (For Openstack) -
      +
      -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud qcow2 -
      +
      -
      +
      - {{'%sMB qcow2 image'% global_variables.iso_size['ppc64le_qcow2']}} -
      + + {% trans trimmed %}Download{% endtrans %} + -
      +
      - - - {% trans trimmed %}Download{% endtrans %} - - -
      + + {% endif %} - + {% if releaseinfo.ga.alt.Cloud.download_override.raw_ppc64le %} +
    • -
    • +
      -
      - - - -
      + -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud raw +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (Compressed Raw Image) -
      +
      - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud raw -
      +
      - {{'%sMB raw image'% global_variables.iso_size['ppc64le_raw']}} +
      -
      - +
      -
      • + + {% endif %} -
    • + {% if releaseinfo.ga.alt.Container.download_override.ppc64le %} +
    • -
      - - - -
      +
      -
      + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container +
      -
      +
      -
      + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container - {{'%sMB Container image'% global_variables.iso_size['ppc64le_Container']}} +
      -
      +
      • +
    - - - + + {% endif %} -
    -
    -

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    -
    - {% trans trimmed %}Verify your Download{% endtrans %} -
    + -
    +
    +
    +

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    +
    + {% trans trimmed %}Verify your Download{% endtrans %} +
    + + -
    +
    -
    - -
    - -
    - -

    Support Resources.

    - -
    - -
    - -

    - -
    - -
    - -
    - -

    {% trans trimmed %}  Documentation{% endtrans %}


    -

    {% trans trimmed %}A wiki page with information about Power Architecture on Fedora is available on the{% endtrans %} Fedora Project Wiki


    -
    - -
    - -
    - -
    -

    {% trans trimmed %}  Email{% endtrans %}


    -

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} ppc@lists.fedoraproject.org

    -
    - -
    - -
    - -
    - -

      Chat


    -

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-ppc IRC channel on irc.freenode.org for real-time chat

    - -
    - -
    - -
    - -
    +
    + +
    + +
    + +

    Support Resources.

    + +
    + +
    + +

    + +
    + +
    + +
    + +

    {% trans trimmed %}  Documentation{% endtrans %}


    +

    {% trans trimmed %}A wiki page with information about Power Architecture on Fedora is available on the{% endtrans %} Fedora Project Wiki


    +
    + +
    + +
    + +
    +

    {% trans trimmed %}  Email{% endtrans %}


    +

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} ppc@lists.fedoraproject.org

    +
    + +
    + +
    + +
    + +

      Chat


    +

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-ppc IRC channel on irc.freenode.org for real-time chat

    + +
    + +
    + +
    + +
    -
    - - -
    + + + +
    + +
    -
    +
    -
    +
    -
    +

    Using the s390x Architecture?


    -

    Using the s390x Architecture?


    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +

    {% trans trimmed %}If you want to install Fedora on IBM z Systems, then you are looking for this architecture.{% endtrans %}

    -

    {% trans trimmed %}If you want to install Fedora on IBM z Systems, then you are looking for this architecture.{% endtrans %}

    +
    -
    +
      -
        - -
      • + {% if releaseinfo.ga.alt.Server.download_override.dvd_s390x %} +
      • -
        - -
        +
        + +
        -
        +
        - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server DVD + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Standard ISO Image -
        +
        -
        +
        - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server -
        +
        -
        +
        - {{'%sGB DVD ISO' %global_variables.iso_size['s390x_Server_DVD']}} -
        + + {% trans trimmed %}Download{% endtrans %} + - -
        +
        • + {% endif %} - + {% if releaseinfo.ga.alt.Server.download_override.netinst_s390x %} +
      • -
      • +
        + +
        -
        - -
        +
        -
        + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server Netinstall ISO Image - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server Netinstall +
        -
        +
        -
        + Fedora {{'%s'%releaseinfo.ga.alt.Server.release_number}}: Server - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Server +
        -
        +
        -
        - {{'%sMB netinst ISO'% global_variables.iso_size['s390x_Server_net']}} + + {% trans trimmed %}Download{% endtrans %} + -
        - -
        +
        • + {% endif %} - - + {% if releaseinfo.ga.alt.Everything.download_override.netinst_s390x %} +
      • +
        -
      • + -
        - - - -
        +
    -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything -
    +
    -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Everything + Fedora {{'%s'%releaseinfo.ga.alt.Everything.release_number}}: Everything -
    +
    -
    +
    - {{'%sMB dvd iso'% global_variables.iso_size['s390x_ev']}} -
    + + {% trans trimmed %}Download{% endtrans %} + -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    + + {% endif %} - + {% if releaseinfo.ga.alt.Cloud.download_override.qcow2_s390x %} +
  • -
  • +
    -
    - - - -
    + -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud qcow2 +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (For Openstack) -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud qcow2 -
    +
    - {{'%sMB qcow2 image'% global_variables.iso_size['s390x_qcow2']}} +
    -
    - +
    -
    • + + {% endif %} -
  • + {% if releaseinfo.ga.alt.Cloud.download_override.raw_s390x %} +
  • -
    - - - -
    +
    -
    + - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud raw +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud (Compressed Raw Image) - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Cloud +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.ga.alt.Cloud.release_number}}: Cloud raw - {{'%sMB raw image'% global_variables.iso_size['s390x_raw']}} +
    -
    +
    • +
    -
  • +
    • + {% endif %} -
    - - - -
    + {% if releaseinfo.ga.alt.Container.download_override.s390x %} +
  • -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container + -
    +
    -
    +
    - Fedora {{'%s'%releaseinfo.ga.announcement_release_number}}: Container + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container -
    +
    -
    +
    - {{'%sMB Container image'% global_variables.iso_size['s390x_Container']}} + Fedora {{'%s'%releaseinfo.ga.alt.Container.release_number}}: Container -
    +
    -
    • + + {% trans trimmed %}Download{% endtrans %} + - - - +
    -
    -
    -

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - + + {% endif %} -
    + + + +
    +
    +

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    +
    + {% trans trimmed %}Verify your Download{% endtrans %} +
    + +
    -
    +
    -
    - -
    - -
    - -

    Support Resources.

    - -
    - -
    - -

    - -
    - -
    - -
    - -

    {% trans trimmed %}  Documentation{% endtrans %}


    -

    {% trans trimmed %}A wiki page with information about IBM z Systems on Fedora is available on the {% endtrans %}{% trans trimmed %} Fedora Project Wiki{% endtrans %}


    -
    - -
    - -
    - -
    -

    {% trans trimmed %}  Email{% endtrans %}


    -

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} s390x@lists.fedoraproject.org

    -
    - -
    - -
    - -
    - -

      Chat


    -

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-s390x IRC channel on irc.freenode.org {% trans trimmed %}for real-time chat{% endtrans %}.

    - -
    - -
    - -
    - -
    +
    -
    +
    -
    - +
    +

    Support Resources.

    - -{% endblock %} +
    + +
    + +

    + +
    -{% block js %} +
    -{% endblock %} \ No newline at end of file +
    + +

    {% trans trimmed %}  Documentation{% endtrans %}


    +

    {% trans trimmed %}A wiki page with information about IBM z Systems on Fedora is available on the {% endtrans %}{% trans trimmed %} Fedora Project Wiki{% endtrans %}


    +
    + +
    + +
    + +
    +

    {% trans trimmed %}  Email{% endtrans %}


    +

    {% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} s390x@lists.fedoraproject.org

    +
    + +
    + +
    + +
    + +

      Chat


    +

    {% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-s390x IRC channel on irc.freenode.org {% trans trimmed %}for real-time chat{% endtrans %}.

    + +
    + +
    + +
    + +
    + +
    + + + + +{{export_regulations()}} + +{% endblock %} diff --git a/sites/getfedora.org/site/alt/cloud/index.html b/sites/getfedora.org/site/alt/cloud/index.html index 8fd24b9..841969c 100644 --- a/sites/getfedora.org/site/alt/cloud/index.html +++ b/sites/getfedora.org/site/alt/cloud/index.html @@ -1,36 +1,33 @@ {% extends "master_getfedora.html" %} -{% from "submenu.html" import submenu with context %} +{% from "export_regulations.html" import export_regulations %} -{% block title %}{% trans trimmed %}Fedora Cloud{% endtrans %}{% endblock %} - - +{% block title %}{% trans trimmed %}Fedora Cloud{% endtrans %}{% endblock %} {% block content %}

    @@ -39,189 +36,167 @@
    -
    - -
    - -
    +
    -

    Cloud Base Images.


    +
    -
    +
    -
    +

    Cloud Base Images.


    -
    +
    -
    +
    -
    +
    -

    {% trans trimmed %}Fedora Cloud Base images are for creating general purpose virtual machines (VMs). You can use the Qcow 2 image for use with Openstack or the compressed raw image. If you are not sure what to use, try the raw image.{% endtrans %}

    +
    -
    +
    -
      - -
    • +

      {% trans trimmed %}Fedora Cloud Base images are for creating general purpose virtual machines (VMs). You can use the Qcow 2 image for use with Openstack or the compressed raw image. If you are not sure what to use, try the raw image.{% endtrans %}

      -
      - -
      +
    -
    +
      - {{'Fedora %s: Raw image'%releaseinfo.ga.announcement_release_number}} + {% if releaseinfo.ga.alt.Cloud.download_override.raw_x86_64 %} +
    • -
    +
    -
    + - {{'Fedora %s: Raw'%releaseinfo.ga.announcement_release_number}} +
    -
    +
    -
    + {{'Fedora %s: Compressed Raw Image'%releaseinfo.ga.alt.Cloud.release_number}} - {{'%sMB raw.xz'% global_variables.iso_size['raw_x86_64_cloud']}} +
    -
    +
    -
    + {{'Fedora %s: Raw'%releaseinfo.ga.alt.Cloud.release_number}} - - - {% trans trimmed %}Download{% endtrans %} - - +
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + +
    - + + {% endif %} - {% if releaseinfo.beta.show %} -
  • + {% if releaseinfo.beta.show and releaseinfo.beta.alt.Cloud.download_override.raw_x86_64 %} +
  • -
    +
    - + -
    +
    -
    +
    - {{'Fedora %s: Raw image'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} + {{'Fedora %s: Compressed Raw Image'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} -
    +
    -
    +
    - {{'Fedora %s: Raw'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} + {{'Fedora %s: Raw'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} -
    +
    -
    +
    - {{'%sMB raw.xz'% global_variables.iso_size['pre_raw_x86_64_cloud']}} + {% trans trimmed %}Download{% endtrans %} -
    +
    +
    • + {% endif %} -
    + {% if releaseinfo.ga.alt.Cloud.download_override.qcow2_x86_64 %} +
  • - {% trans trimmed %}Download{% endtrans %} +
    -
    -
    • - {% endif %} + -
  • +
    • -
    - - - -
    +
    -
    + {{'Fedora %s: Qcow2 Image for Openstack'%releaseinfo.ga.alt.Cloud.release_number}} - {{'Fedora %s: Qcow2 image'%releaseinfo.ga.announcement_release_number}} +
    -
    +
    -
    + {{'Fedora %s: Qcow2'%releaseinfo.ga.alt.Cloud.release_number}} - {{'Fedora %s: Qcow2'%releaseinfo.ga.announcement_release_number}} +
    -
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + - {{'%sMB qcow2'% global_variables.iso_size['qcow2_x86_64_cloud']}} +
    -
    + + {% endif %} - + {% if releaseinfo.beta.show and releaseinfo.beta.alt.Cloud.download_override.qcow2_x86_64 %} +
  • -
    • +
    - {% if releaseinfo.beta.show %} -
  • + -
    +
    - - -
    • +
    -
    + {{'Fedora %s: Qcow2 Image for Openstack'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} - {{'Fedora %s: Qcow2 image'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} +
    -
    +
    -
    + {{'Fedora %s: Qcow2'%releaseinfo.beta.alt.Cloud.release_number}}{% trans trimmed %}Beta!{% endtrans %} - {{'Fedora %s: Qcow2'%releaseinfo.beta.announcement_release_number}}{% trans trimmed %}Beta!{% endtrans %} +
    -
    +
    -
    + {% trans trimmed %}Download{% endtrans %} - {{'%sMB qcow2'% global_variables.iso_size['pre_qcow2_x86_64_cloud']}} +
    -
    + + {% endif %} - +
    +



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - - {% endif %} - - + -
    -



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - - - -
    +
    @@ -230,192 +205,173 @@
    -
    - -
    - -
    - -

    Cloud Base Images for Vagrant.


    - -
    - -
    - -
    - -
    - -
    - -

    {% trans trimmed %}These images are Vagrant Boxes images for deployment using Vagrant. If you're using Vagrant on Mac OS X or Windows, the VirtualBox image is likely the image you'll want to use. If you're using Vagrant on Fedora, use the libvirt/KVM image.{% endtrans %}

    - -
    - -
      - -
    • +
      -
      +
      - - -
      +
      -
      +

      Cloud Base Images for Vagrant.


      - {{'Fedora %s: Virtualbox image'%releaseinfo.ga.announcement_release_number}} +
      -
      +
      -
      +
      - {{'Fedora %s: Virtualbox'%releaseinfo.ga.announcement_release_number}} +
      -
      +
      -
      +

      {% trans trimmed %}These images are Vagrant Boxes images for deployment using Vagrant. If you're using Vagrant on Mac OS X or Windows, the VirtualBox image is likely the image you'll want to use. If you're using Vagrant on Fedora, use the libvirt/KVM image.{% endtrans %}

      - {{'%sMB vbox'% global_variables.iso_size['VBvag_cloud']}} +
      -
      +
        -
        + {% if releaseinfo.ga.alt.Cloud.download_override.vagrant_vb_x86_64 %} +
      • - - - {% trans trimmed %}Download{% endtrans %} - +
        -
        + + +
        • - +
        - {% if releaseinfo.beta.show %} -
      • + {{'Fedora %s: Virtualbox image'%releaseinfo.ga.alt.Cloud.release_number}} -
        +
        - - -
        • +
        -
        + {{'Fedora %s: Virtualbox'%releaseinfo.ga.alt.Cloud.release_number}} - {{'Fedora %s: Virtualbox image'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} +
        -
        +
        -
        + + + {% trans trimmed %}Download{% endtrans %} + - {{'Fedora %s: Virtualbox'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} +
        -
        + + {% endif %} -
        + {% if releaseinfo.beta.show and releaseinfo.beta.alt.Cloud.download_override.vagrant_vb_x86_64 %} +
      • - {{'%sMB vbox'% global_variables.iso_size['pre_VBvag_cloud']}} +
        -
        + + +
        • -
        - - {% trans trimmed %}Download{% endtrans %} +
        -
        + {{'Fedora %s: Virtualbox image'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} - - {% endif %} +
        - +
        -
      • + {{'Fedora %s: Virtualbox'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} -
        +
        - + +
        • -
        + + {% endif %} - {{'Fedora %s: Libvirt/KVM image'%releaseinfo.ga.announcement_release_number}} + + {% if releaseinfo.ga.alt.Cloud.download_override.vagrant_libvirt_x86_64 %} +
      • -
        • +
        -
        + - {{'Fedora %s: Libvirt/KVM '%releaseinfo.ga.announcement_release_number}} +
        -
        +
        -
        + {{'Fedora %s: Libvirt/KVM image'%releaseinfo.ga.alt.Cloud.release_number}} - {{'%sMB libvirt'% global_variables.iso_size['libvag_cloud']}} +
        -
        +
        -
        + {{'Fedora %s: Libvirt '%releaseinfo.ga.alt.Cloud.release_number}} - {% trans trimmed %}Download{% endtrans %} - -
        +
        - + - {% if releaseinfo.beta.show %} + + {% endif %} -
      • -
        + {% if releaseinfo.beta.show and releaseinfo.beta.alt.Cloud.download_override.vagrant_libvirt_x86_64 %} - +
      • -
      +
      -
      + - {{'Fedora %s: Libvirt/KVM image'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} +
      -
      +
      -
      + {{'Fedora %s: Libvirt/KVM image'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} - {{'Fedora %s: Libvirt/KVM '%releaseinfo.beta.announcement_release_number}}{% trans trimmed %}Beta!{% endtrans %} +
      -
      +
      -
      + {{'Fedora %s: Libvirt '%releaseinfo.beta.alt.Cloud.release_number}}{% trans trimmed %}Beta!{% endtrans %} - {{'%sMB libvirt'% global_variables.iso_size['pre_libvag_cloud']}} +
      -
      +
      - - {% trans trimmed %}Download{% endtrans %} - -
      +
      • + {% endif %} + +
    - - {% endif %} - - +
    -
    +



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    -



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    +
    -
    - {% trans trimmed %}Verify your Download{% endtrans %} -
    + {% trans trimmed %}Verify your Download{% endtrans %} + +
    -
    + @@ -428,467 +384,458 @@
    -
    - -
    - -
    - -


    Cloud Base Images for Amazon Public Cloud.


    - -
    - -
    - -
    - -
    - -

    {% trans trimmed %}The links here will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.{% endtrans %}

    -

    {% trans trimmed %}All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.{% endtrans %}

    - -

    - -
      - -
    • - -
      - - - -
      - -
      - - {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - -
      - - {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - - - -
      - - -

      - {% trans trimmed %}Click to Launch{% endtrans %} -

      - - -
      - -
      • - - {% if releaseinfo.beta.show %} -
    • - -
      - - - -
      - -
      - - {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} - -
      - -
      - - {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} - -
      - -
      - -

      - {% trans trimmed %}Click to Launch{% endtrans %} -

      - - -
      - -
      • - {% endif %} - - - -
    • - -
      - - - -
      - -
      - - {{'Fedora %s: Standard HVM AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - -
      - - {{'Fedora %s: HVM AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - - - -
      - - -

      - {% trans trimmed %}Click to Launch{% endtrans %} -

      - -
      -
      • - - {% if releaseinfo.beta.show %} -
    • - -
      - - - -
      - -
      - - {{'Fedora %s: Standard HVM AMIs'%releaseinfo.beta.announcement_release_number}} - - {% trans trimmed %}Beta!{% endtrans %} - -
      - -
      - - {{'Fedora %s: HVM AMIs'%releaseinfo.beta.announcement_release_number}} - {% trans trimmed %}Beta!{% endtrans %} - -
      - -
      - -

      - {% trans trimmed %}Click to Launch{% endtrans %} -

      - - -
      -
      • - - {% endif %} - -
    • - -
      - -
      - -
      - - {{'Fedora %s: ARM64 AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - -
      - - {{'Fedora %s: ARM64 AMIs'%releaseinfo.ga.announcement_release_number}} - -
      - - - -
      - - -

      - {% trans trimmed %}Click to Launch{% endtrans %} -

      - -
      -
      • - - -
    - -
    - +
    + +
    + +
    + +


    Cloud Base Images for Amazon Public Cloud.


    + +
    + +
    + +
    + +
    + +

    {% trans trimmed %}The links here will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.{% endtrans %}

    +

    {% trans trimmed %}All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.{% endtrans %}

    + +

    + +
      + +
    • + +
      + + + +
      + +
      + + {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + +
      + + {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + + + +
      + + +

      + {% trans trimmed %}Click to Launch{% endtrans %} +

      + + +
      + +
      • + + {% if releaseinfo.beta.show %} +
    • + +
      + + + +
      + +
      + + {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} + +
      + +
      + + {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} + +
      + +
      + +

      + {% trans trimmed %}Click to Launch{% endtrans %} +

      + + +
      +
      • + {% endif %} + + +
    • + +
      + + + +
      + +
      + + {{'Fedora %s: Standard HVM AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + +
      + + {{'Fedora %s: HVM AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + +
      + +

      + + {% trans trimmed %}Click to Launch{% endtrans %} +

      + +
      +
      • + + {% if releaseinfo.beta.show %} +
    • + +
      + + + +
      + +
      + + {{'Fedora %s: Standard HVM AMIs'%releaseinfo.beta.alt.Cloud.release_number}} + + {% trans trimmed %}Beta!{% endtrans %} + +
      + +
      + + {{'Fedora %s: HVM AMIs'%releaseinfo.beta.alt.Cloud.release_number}} + {% trans trimmed %}Beta!{% endtrans %} + +
      + +
      + +

      + {% trans trimmed %}Click to Launch{% endtrans %} +

      + + +
      +
      • + + {% endif %} + +
    • + +
      + +
      + +
      + + {{'Fedora %s: ARM64 AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + +
      + + {{'Fedora %s: ARM64 AMIs'%releaseinfo.ga.alt.Cloud.release_number}} + +
      + +
      + +

      + {% trans trimmed %}Click to Launch{% endtrans %} +

      + + +
      +
      • +
    +
    @@ -896,89 +843,89 @@
    -
    +
    -
    +
    -
    +
    -


    Want to try something new?


    +


    Want to try something new?


    -
    +
    -
    +
    -
    +
    - - Fedora CoreOS - + + Fedora CoreOS + -
    +
    -
    +
    - +
    - -
    - -
    - -
    - -

    Support Resources.

    - -
    - -
    - -


    - -
    - -
    - -
    - -

    {% trans trimmed %}  Documentation{% endtrans %}


    - {% trans trimmed %}A wiki page with information about Fedora Cloud and its images is available{% endtrans %} here
    -
    - -
    - -
    - -
    -

    {% trans trimmed %}  Email{% endtrans %}


    -

    {% trans trimmed %}Users and developers are also available on the mailing list at {% endtrans %} cloud@lists.fedoraproject.org

    -
    - -
    - -
    - -
    - -

      Chat


    -

    {% trans trimmed %}Users and developers are available in the {% endtrans %} #fedora-cloud IRC channel on irc.freenode.org {% trans trimmed %}for real-time chat{% endtrans %}

    - -
    - -
    - -
    - -
    + +
    + +
    + +
    + +

    Support Resources.

    + +
    + +
    + +


    + +
    + +
    + +
    + +

    {% trans trimmed %}  Documentation{% endtrans %}


    + {% trans trimmed %}A wiki page with information about Fedora Cloud and its images is available{% endtrans %} here
    +
    + +
    + +
    + +
    +

    {% trans trimmed %}  Email{% endtrans %}


    +

    {% trans trimmed %}Users and developers are also available on the mailing list at {% endtrans %} cloud@lists.fedoraproject.org

    +
    + +
    + +
    + +
    + +

      Chat


    +

    {% trans trimmed %}Users and developers are available in the {% endtrans %} #fedora-cloud IRC channel on irc.freenode.org {% trans trimmed %}for real-time chat{% endtrans %}

    + +
    + +
    + +
    + +

    -
    +{{export_regulations()}} {% endblock %} diff --git a/sites/getfedora.org/site/alt/index.html b/sites/getfedora.org/site/alt/index.html index 98d1c6f..1b7ce84 100644 --- a/sites/getfedora.org/site/alt/index.html +++ b/sites/getfedora.org/site/alt/index.html @@ -1,15 +1,7 @@ {% extends "master_getfedora.html" %} -{% from "submenu.html" import submenu with context %} - -{% block css %} - -{% assets "css_all" %} - -{% endassets %} - -{% endblock %} - +{% from "export_regulations.html" import export_regulations %} + {% block title %}Fedora {% trans trimmed %}Alternative Downloads{% endtrans %}{% endblock %} {% block content %} @@ -21,16 +13,16 @@
    - {% if releaseinfo.beta.show %} - {% trans trimmed n=releaseinfo.beta.announcement_release_number %} - Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > - {% else %} - - {% trans trimmed n=releaseinfo.ga.announcement_release_number %} - Fedora {{n}} released! - {% endtrans %} - - {% endif %} + {% if releaseinfo.beta.show %} + {% trans trimmed n=releaseinfo.beta.announcement_release_number %} + Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > + {% else %} + + {% trans trimmed n=releaseinfo.ga.announcement_release_number %} + Fedora {{n}} released! + {% endtrans %} + + {% endif %}
    @@ -94,7 +86,8 @@ - - +
    +



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    +
    + {% trans trimmed %}Verify your Download{% endtrans %} +
    +
    + + + + @@ -266,471 +247,454 @@
    -
    +
    + +
    + +
    + +

    Using the PowerPC Architecture (PPC64LE)?


    + +
    + +
    + +
    + +
    -
    +
      -
      + {% if releaseinfo.beta.alt.Server.download_override.dvd_ppc64le %} +
    • -

      Using the PowerPC Architecture (PPC64LE)?


      +
      + +
      -
      • +
      -
      + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Standard ISO Image -
      +
    -
    +
    -
      - -
    • + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server DVD -
      - -
      +
    -
    +
    - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server DVD + + {% trans trimmed %}Download{% endtrans %} + -
    +
    -
    + + {% endif %} - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server DVD + {% if releaseinfo.beta.alt.Server.download_override.netinst_ppc64le %} +
  • -
    • +
    + +
    - +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Netinstall ISO Image - - - {% trans trimmed %}Download{% endtrans %} - - +
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Netinstall +
    + -
    - -
    + + {% endif %} -
    - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server Netinstall + {% if releaseinfo.beta.alt.Cloud.download_override.qcow2_ppc64le %} +
  • -
    • +
    -
    + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server Netinstall +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud (for Openstack) - - - {% trans trimmed %}Download{% endtrans %} - - +
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud qcow2 +
    + -
    - - - -
    + + {% endif %} -
    + {% if releaseinfo.beta.alt.Cloud.download_override.raw_ppc64le %} +
  • - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud qcow2 +
    -
    + -
    +
    - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud qcow2 +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud (Compressed Raw Image) -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    • +
    - + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud raw -
  • +
    • -
    - - - -
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud raw +
    -
    + + {% endif %} -
    + {% if releaseinfo.beta.alt.Container.download_override.ppc64le %} +
  • - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud raw +
    -
    + -
    +
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    • +
    - + Fedora {{'%s'%releaseinfo.beta.alt.Container.release_number}}: Container -
  • +
    • -
    - - - -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Container.release_number}}: Container - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Container +
    -
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Container +
    -
    + + {% endif %} - - + - - - +
    +



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    + +
    -
    -



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - -
    +
    -
    - -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -

    Using the s390x Architecture?


    +

    Using the s390x Architecture?


    -
    +
    -
    +
    -
    +
    -
    +
    -
      - -
    • +
        -
        - -
        + {% if releaseinfo.beta.alt.Server.download_override.dvd_s390x %} +
      • -
        +
        + +
        - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server DVD +
        -
        + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Standard ISO Image -
        +
        - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server DVD +
        -
        + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server DVD - +
        -
        • + {% endif %} -
    + {% if releaseinfo.beta.alt.Server.download_override.netinst_s390x %} +
  • +
    + +
    +
    -
    • + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Netinstall ISO Image -
  • +
    • -
    - -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Server.release_number}}: Server Netinstall - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server Netinstall +
    -
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Server Netinstall +
    -
    + + {% endif %} -
    - - - {% trans trimmed %}Download{% endtrans %} - - + {% if releaseinfo.beta.alt.Cloud.download_override.qcow2_s390x %} +
  • +
    -
    + +
    • +
    - - + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud (for Openstack) -
  • +
    • -
    - - - -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud qcow2 - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud qcow2 +
    -
    +
    -
    + + {% trans trimmed %}Download{% endtrans %} + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud qcow2 +
    -
    + + {% endif %} -
    + {% if releaseinfo.beta.alt.Cloud.download_override.raw_s390x %} +
  • - - - {% trans trimmed %}Download{% endtrans %} - - -
    • +
    - + -
  • +
    • -
    - - - -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud (Compressed Raw Image) - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud raw +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Cloud.release_number}}: Cloud raw - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Cloud raw +
    -
    + - + + {% endif %} -
  • + {% if releaseinfo.beta.alt.Container.download_override.s390x %} +
  • -
    - - - -
    +
    -
    + - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Container +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Container.release_number}}: Container - Fedora {{'%s'%releaseinfo.beta.announcement_release_number}}: Container +
    -
    +
    -
    + Fedora {{'%s'%releaseinfo.beta.alt.Container.release_number}}: Container - - - {% trans trimmed %}Download{% endtrans %} - - -
    +
    -
    • +
    - - - + + {% trans trimmed %}Download{% endtrans %} + -
    -



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - -
    +
    -
    + + {% endif %} -
    -
    + -
    - +
    + +



    Once you have downloaded an image, be sure to verify it for both security and integrity.

    +
    + {% trans trimmed %}Verify your Download{% endtrans %} +
    + +
    + +
    + + + + + -
    - -
    - -
    - -
    - -

    Support Resources.

    - -
    - -
    - -

    - -
    - -
    - -
    - -

    {% trans trimmed %}  Documentation{% endtrans %}


    -

    {% trans trimmed %}

    Some basic information about getting involved in Fedora's testing efforts is available on{% endtrans %} the Fedora QA wiki.
    -

    - -
    - -
    - -
    -

      Email


    - -

    {% trans trimmed %}Email discussion of Fedora testing is available on the mailing list at{% endtrans %} test@lists.fedoraproject.org.

    -
    - -
    - -
    - -
    - -

      Chat


    -

    {% trans trimmed %}Discussion of Fedora testing takes place in the{% endtrans %} #fedora-qa IRC channel on irc.freenode.org.

    - -
    - -
    - -
    - -
    +
    -
    +
    +
    -{% endblock %} +
    + +

    Support Resources.

    + +
    + +
    + +

    + +
    -{% block js %} -{% assets "js_all" %} - -{% endassets %} +
    + +
    + +

    {% trans trimmed %}  Documentation{% endtrans %}


    +

    {% trans trimmed %}

    Some basic information about getting involved in Fedora's testing efforts is available on{% endtrans %} the Fedora QA wiki.
    +

    + +
    + +
    + +
    +

      Email


    + +

    {% trans trimmed %}Email discussion of Fedora testing is available on the mailing list at{% endtrans %} test@lists.fedoraproject.org.

    +
    + +
    + +
    + +
    + +

      Chat


    +

    {% trans trimmed %}Discussion of Fedora testing takes place in the{% endtrans %} #fedora-qa IRC channel on irc.freenode.org.

    + +
    + +
    + +
    + +
    + +
    + +{{export_regulations()}} {% endblock %} + diff --git a/sites/getfedora.org/site/alt/verify/index.html b/sites/getfedora.org/site/alt/verify/index.html deleted file mode 100644 index 8d0cd87..0000000 --- a/sites/getfedora.org/site/alt/verify/index.html +++ /dev/null @@ -1,288 +0,0 @@ -{% extends "master_getfedora.html" %} - -{% from "submenu.html" import submenu with context %} - -{% block css %} - - -{% assets "css_all" %} - -{% endassets %} - - -{% endblock %} - -{% block title %}{% trans trimmed %}Verify your Downloaded Image{% endtrans %}{% endblock %} - - - -{% block content %} - -{{submenu(edition="alt", active=None)}} - -
    - -
    - - - - - - -
    - -
    - -
    - -
    - -

    {% trans trimmed %}How do I verify my image?{% endtrans %}

    - -

    {% trans trimmed %}Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded.{% endtrans %}

    - -
    - -
    - -
    - -
    - - - -

    Workstation

    - -
    - - - For aarch64 - -
    - -
    - -
    - - - -

    Server

    - -
    - - - aarch64 Minimal - - - -
    - -
    - - - For aarch64 - - -
    - -
    - - - For ppc64le - - -
    - -
    - - - For s390x - -
    - -
    - -
    - - - -

    Cloud

    - -
    - - - - For aarch64 iso - - -
    - -
    - - - - For aarch64 images - -
    - -
    - - - - For ppc64le images - -
    - -
    - - - - For s390x images - - -
    - -
    - - - - For Cloud Base Images - - -
    - -
    - -
    - - - -

    Container

    - -
    - - - - For aarch64 - - -
    - -
    - - - - For ppc64le - - - - -
    - -
    - - - - For s390x - - -
    - -
    - -
    - - - -
    - -
    - -

    {% trans trimmed %}Next, import Fedora\'s GPG key(s):{% endtrans %}

    - - 
    $ curl https://getfedora.org/static/fedora.gpg | gpg --import
    - -

    {% trans trimmed %}You can verify the details of the GPG key(s) {% endtrans %}{% trans trimmed %}here{% endtrans %}

    - -

    {% trans trimmed %}Now, verify that the CHECKSUM file is valid:{% endtrans %}

    - - 
    $ gpg --verify-files *-CHECKSUM
    - -

    {% trans trimmed %}The CHECKSUM file should have a good signature from one of the following keys:{% endtrans %}

    - -
      - -
    • 12C944D0 - Fedora 32
      • - -
    • 3C3359C4 - Fedora 31
      • - -
    • CFC659B9 - Fedora 30
      • - -
    • DBBDCF7C - IOT 2019
      • - -
    - -

    {% trans trimmed %}Finally, now that the CHECKSUM file has been verified, check that the image's checksum matches:{% endtrans %}

    - - 
    $ sha256sum -c *-CHECKSUM
    - -

    {% trans trimmed %}If the output states that the file is valid, then it's ready to use!{% endtrans %}

    - -

    - -

    {% trans trimmed %}How do I verify my downloaded image on another operating system?{% endtrans %}

    - -

    {% trans trimmed %}Read these instructions to verify your image.{% endtrans %}

    -

    - -
    - -
    - -
    - - - - - -{% endblock %} From c81c797362c37c21d39e2fecac1b7b9b587278bc Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Mar 29 2020 11:46:26 +0000 Subject: [PATCH 2/4] Merge remote-tracking branch 'upstream/master' --- diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index 101ec9e..2894c5c 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -8,7 +8,6 @@ from flask_htmlmin import HTMLMIN import jinja2 import os import yaml -import re import cloud_ami """ For the cloud part, this function @@ -19,6 +18,7 @@ import cloud_ami # release = {'curr_cloud_AMI_id': '31', 'next_cloud_AMI_id': '32', 'curr_cloud_AMI_state': 'Beta', 'RC_gold': '1.9', 'RC_pre_gold': '1.2',} # results=collect_results(release) + #FEDORA_LANGUAGES = { 'en' : 'English' , 'de': 'Deutsch'} # List of langs from old getfedora.org @@ -194,18 +194,13 @@ def export_route(name, path, template=None): def r(): - # If requested routing under '/coreos/download/', render with '/coreos/download/index.html' - # and handle the requested tab view in frontend (sites/static/js/coreos-download.js) - # using the request url. - if (re.search("^coreos_download_.*$", name)): - return render_template(template or '/coreos/download/index.html') """ Passing collected results from fedimg_vars collect() directly to templates.""" #return render_template(template or path.strip('/') + '/index.html', results=results) - + return render_template(template or path.strip('/') + '/index.html') r.__name__ = name if freezing: @@ -235,9 +230,6 @@ export_route('server', '/server/') export_route('server_download', '/server/download/') export_route('coreos', '/coreos/') export_route('coreos_download', '/coreos/download/') -export_route('coreos_download_cloud_launchable', '/coreos/download/cloud_launchable/') -export_route('coreos_download_metal_virtualized', '/coreos/download/metal_virtualized/') -export_route('coreos_download_cloud_operators', '/coreos/download/cloud_operators/') export_route('silverblue', '/silverblue/') export_route('silverblue_download', '/silverblue/download/') export_route('iot', '/iot/') diff --git a/sites/static/js/coreos-download.js b/sites/static/js/coreos-download.js index ac61c1a..7eab9ad 100644 --- a/sites/static/js/coreos-download.js +++ b/sites/static/js/coreos-download.js @@ -33,14 +33,14 @@ const prettyPlatforms = { // innerText of tab button const tabInnerText = { "cloud_launchable": "Cloud Launchable", - "metal_virt": "Bare Metal & Virtualized", + "metal_virtualized": "Bare Metal & Virtualized", "cloud_operators": "For Cloud Operators" } // frequently used IDs const IdPool = { "cloud_launchable": "cloud-launchable", - "metal_virt": "metal-virt", - "cloud_operators": "cloud-operator" + "metal_virtualized": "metal-virtualized", + "cloud_operators": "cloud-operators" } function getMember(obj, member) { return (member in obj) ? obj[member] : null; @@ -142,6 +142,8 @@ var coreos_download_app = new Vue({ const key = pair[0]; const val = pair[1]; if (val === e.target.innerText) { + const downloadPageUrl = window.location.href.match(/^.*\/coreos\/download/)[0]; + history.pushState(null, null, `${downloadPageUrl}?tab=${key}&stream=${coreos_download_app.stream}`); const show_id = IdPool[key]; id_list.map(id => document.getElementById(id).hidden = (id !== show_id)); this.shownId = show_id; @@ -154,7 +156,7 @@ var coreos_download_app = new Vue({ nav_cloud_launchable = h('li', { class: "nav-item col-4" }, [ nav_cloud_launchable_btn ]); server_icon = h('i', { class: "fas fa-server mr-2" }) - nav_metal_virt_btn = h('button', { class: "nav-link col-12 h-100 overflow-hidden".concat(this.shownId === IdPool.metal_virt ? " active" : ""), attrs: { "data-toggle": "tab" }, on: { click: this.toggleHidden } }, [ server_icon, tabInnerText.metal_virt ]); + nav_metal_virt_btn = h('button', { class: "nav-link col-12 h-100 overflow-hidden".concat(this.shownId === IdPool.metal_virtualized ? " active" : ""), attrs: { "data-toggle": "tab" }, on: { click: this.toggleHidden } }, [ server_icon, tabInnerText.metal_virtualized ]); nav_metal_virt = h('li', { class: "nav-item col-4" }, [ nav_metal_virt_btn ]); cloud_upload_icon = h('i', { class: "fas fa-cloud-upload-alt mr-2" }) @@ -166,6 +168,7 @@ var coreos_download_app = new Vue({ }, // Add dropdown options of streams getStreamName: function(h) { + const self = this; if (this.streamData === null) return; option_stable = h('option', { attrs: { value: "stable", selected: this.stream === "stable" ? "selected" : null }}, "stable"); option_testing = h('option', { attrs: { value: "testing", selected: this.stream === "testing" ? "selected" : null }}, "testing"); @@ -173,7 +176,10 @@ var coreos_download_app = new Vue({ class: "mx-1", on: { change: function(e) { + const downloadPageUrl = window.location.href.match(/^.*\/coreos\/download/)[0]; + const currentShownKey = Object.keys(IdPool).find(key => IdPool[key] === self.shownId); coreos_download_app.stream = e.target.value; + history.pushState(null, null, `${downloadPageUrl}?tab=${currentShownKey}&stream=${coreos_download_app.stream}`); } } }, [ @@ -332,24 +338,44 @@ var coreos_download_app = new Vue({ } }, render: function(h) { - // Extracts the route under `/coreos/download/` - const route = window.location.pathname.replace(/\/.*\/coreos\/download\//, '').replace(/\/+$/, ''); - if (route !== '') { - switch(route) { + const downloadPageUrl = window.location.href.match(/^.*\/coreos\/download/)[0]; + searchParams = new URLSearchParams(window.location.search); + // switch to specified tab if `tab` parameter is set + if (searchParams.has('tab')) { + switch(searchParams.get('tab')) { case 'cloud_launchable': this.shownId = IdPool.cloud_launchable; break; case 'metal_virtualized': - this.shownId = IdPool.metal_virt; + this.shownId = IdPool.metal_virtualized; break; case 'cloud_operators': this.shownId = IdPool.cloud_operators; break; default: - // we shouldn't hit this since the routes are safe-guarded by `sites/getfedora.org/main.py` this.shownId = IdPool.cloud_launchable; } + } else { + searchParams.set('tab', 'cloud_launchable'); } + // switch to specified stream if `stream` parameter is set + if (searchParams.has('stream')) { + switch(searchParams.get('stream')) { + case 'stable': + this.stream = "stable"; + break; + case 'testing': + this.stream = "testing"; + break; + default: + this.stream = "stable"; + } + } else { + searchParams.set('stream', 'stable'); + } + // Update the url with the parameters + history.pushState(null, null, `${downloadPageUrl}?${searchParams.toString()}`); + var signature_sha256_verification_modal = this.getSignatureAndShaModal(h); var stream_select_container = h('div', { class: "pb-0 pt-3 mb-3" }, [ h('div', { class: "container" }, [ this.getStreamName(h), this.getNavbar(h) ]) ]); if (this.loading) { @@ -564,7 +590,7 @@ var coreos_download_app = new Vue({ let virtualized_container = h('div', { class: "col-6" }, [ virtualizedTitle, verifyBlurb, virtualized ]); let cloud_launchable_container = h('div', { class: "col-12 py-2 my-2", attrs: { id: IdPool.cloud_launchable, hidden: this.shownId !== IdPool.cloud_launchable } }, [ cloudLaunchableTitle, cloudLaunchable ]); - let metal_virt_container = h('div', { class: "row col-12 py-2 my-2", attrs: { id: IdPool.metal_virt, hidden: this.shownId !== IdPool.metal_virt } }, [ bare_metal_container, virtualized_container ]); + let metal_virt_container = h('div', { class: "row col-12 py-2 my-2", attrs: { id: IdPool.metal_virtualized, hidden: this.shownId !== IdPool.metal_virtualized } }, [ bare_metal_container, virtualized_container ]); let cloud_operators_container = h('div', { class: "col-12 py-2 my-2", attrs: { id: IdPool.cloud_operators, hidden: this.shownId !== IdPool.cloud_operators } }, [ cloudTitle, verifyBlurb, cloud ]); return h('div', {}, [ From 6452f4443b94e6a29b9c19f2002feed51cb677b1 Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Mar 31 2020 12:19:52 +0000 Subject: [PATCH 3/4] Modified the security page, and modified release.yaml, and the corresponding download links --- diff --git a/sites/getfedora.org/fedimg_vars.py b/sites/getfedora.org/fedimg_vars.py index 39cfc4f..4c239c2 100644 --- a/sites/getfedora.org/fedimg_vars.py +++ b/sites/getfedora.org/fedimg_vars.py @@ -29,7 +29,7 @@ import os -from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg +from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg, check_permissions logging.basicConfig(level=logging.INFO) diff --git a/sites/getfedora.org/fedimg_vars_lib.py b/sites/getfedora.org/fedimg_vars_lib.py index 4188337..0a56172 100644 --- a/sites/getfedora.org/fedimg_vars_lib.py +++ b/sites/getfedora.org/fedimg_vars_lib.py @@ -48,19 +48,17 @@ def retrieve_messages(): """ Generator that yields messages from datagrepper """ # Get the first page data = get_page(1, 'unknown') - print(data['pages']) for message in data['raw_messages']: - print(message['msg']) yield message - more = functools.partial(get_page, pages=data['pages']) + more = functools.partial(get_page, pages=data['pages']) - # Get all subsequent pages (if there are any...) - for page in range(1, data['pages']): - data = more(page + 1) + # Get all subsequent pages (if there are any...) + for page in range(1, data['pages']): + data = more(page + 1) - for message in data['raw_messages']: - yield message + for message in data['raw_messages']: + yield message def filter_messages(messages, target): diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index 2894c5c..8090281 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -238,7 +238,6 @@ export_route('security', '/security/') export_route('sponsors', '/sponsors/') export_route('alt', '/alt') export_route('alt_prerelease', '/alt/prerelease') -export_route('alt_verify', '/alt/verify/') export_route('alt_altarch', '/alt/altarch/') export_route('alt_cloud', '/alt/cloud/') diff --git a/sites/getfedora.org/release.yaml b/sites/getfedora.org/release.yaml index 7ca5eaa..8427018 100644 --- a/sites/getfedora.org/release.yaml +++ b/sites/getfedora.org/release.yaml @@ -24,7 +24,7 @@ ga: release_number: 31 rc_version: 1.9 checksum_prefix: Fedora-Server - checksum_arches: [x86_64 aarch64] + checksum_arches: [x86_64, aarch64] # Same as above goes here. download_override: standard_x86_64: default @@ -33,19 +33,13 @@ ga: netinst_aarch64: default raw_aarch64: default alt: - - RC: - gold: 1.9 # insert the number of the RC version declared GOLD - server_gold: 1.9 # insert the number of the RC version declared GOLD - build: 1.9 # sometimes releng use the RC build - gold_aarch64: 1.9 # RC Gold for aarch64 - gold_ppc64: 1.9 # RC Gold for ppc64 - gold_ppc64le: 1.9 # RC Gold for ppc64le - gold_s390x: 1.9 # RC Gold for s390x Server: pretty_name: Fedora Server release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Server + checksum_arches: [aarch64, ppc64le, s390x, armhfp] download_override: netinst_x86_64: default #aarch64 @@ -61,6 +55,9 @@ ga: Everything: pretty_name: Fedora Everything release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Everything + checksum_arches: [aarch64, ppc64le, s390x] download_override: netinst_x86_64 : default netinst_aarch64 : default @@ -71,18 +68,27 @@ ga: Workstation: pretty_name: Fedora Workstation release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Workstation + checksum_arches: [aarch64, armhfp] download_override: raw_aarch64 : default Spin_minimal: pretty_name: Fedora Minimal release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Spins + checksum_arches: [aarch64] download_override: raw_aarch64 : default Container: pretty_name: Fedora Container release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Container + checksum_arches: [aarch64, ppc64le, s390x] download_override: aarch64 : default ppc64le : default @@ -91,6 +97,9 @@ ga: Cloud: pretty_name: Fedora Cloud release_number: 31 + rc_version: 1.9 + checksum_prefix: Fedora-Cloud + checksum_arches: [x86_64, aarch64, ppc64le, s390x] download_override: #x86_64 raw_x86_64 : default @@ -136,7 +145,7 @@ beta: release_number: 32 rc_version: 1.2 checksum_prefix: Fedora-Server - checksum_arches: [x86_64 aarch64] + checksum_arches: [x86_64, aarch64] # Same as above goes here. download_override: standard_x86_64: default @@ -146,17 +155,12 @@ beta: raw_aarch64: default alt: - RC: - pre_gold: 1.2 # insert the number of the prerelease RC version declared GOLD - pre_build: 2 # sometimes releng use the RC build - pre_gold_aarch64: 1.2 # Pre RC Gold for aarch64 - pre_gold_ppc64: 1.2 # Pre RC Gold for ppc64 - pre_gold_ppc64le: 1.2 # Pre RC Gold for ppc64le - pre_gold_s390x: 1.2 # Pre RC Gold for s390x - Server: pretty_name: Fedora Server release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Server + checksum_arches: [aarch64] download_override: netinst_x86_64: default #aarch64 @@ -172,6 +176,9 @@ beta: Everything: pretty_name: Fedora Everything release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Everything + checksum_arches: [ppc64le, s390x] download_override: netinst_x86_64 : default netinst_aarch64 : default @@ -182,18 +189,27 @@ beta: Workstation: pretty_name: Fedora Workstation release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Workstation + checksum_arches: [aarch64, ppc64le] download_override: raw_aarch64 : default Spin_minimal: pretty_name: Fedora Minimal release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Spins + checksum_arches: [aarch64] download_override: raw_aarch64 : default Container: pretty_name: Fedora Container - release_number: 31 + release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Container + checksum_arches: [ppc64le, s390x] download_override: aarch64 : default ppc64le : default @@ -202,6 +218,9 @@ beta: Cloud: pretty_name: Fedora Cloud release_number: 32 + rc_version: 1.2 + checksum_prefix: Fedora-Cloud + checksum_arches: [x86_64, aarch64, ppc64le, s390x] download_override: #x86_64 raw_x86_64 : default diff --git a/sites/getfedora.org/site/alt/altarch/index.html b/sites/getfedora.org/site/alt/altarch/index.html index 754407e..5678be6 100644 --- a/sites/getfedora.org/site/alt/altarch/index.html +++ b/sites/getfedora.org/site/alt/altarch/index.html @@ -14,7 +14,7 @@ {% if releaseinfo.beta.show %} {% trans trimmed n=releaseinfo.beta.announcement_release_number %} - Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > + Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} » {% else %} {% trans trimmed n=releaseinfo.ga.announcement_release_number %} @@ -89,14 +89,10 @@ -
    - - - + @@ -122,12 +118,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -154,13 +147,10 @@ -
    - - - +
    + {% trans trimmed %}Download{% endtrans %} -
    @@ -187,12 +177,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -219,13 +206,10 @@ -
    - - - + @@ -253,9 +237,8 @@
    - - + {% trans trimmed %}Download{% endtrans %} @@ -286,9 +269,8 @@
    - - + {% trans trimmed %}Download{% endtrans %} @@ -319,9 +301,8 @@
    - - + {% trans trimmed %}Download{% endtrans %} @@ -451,8 +432,7 @@ - - {% endif %} @@ -518,12 +491,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -551,12 +521,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -584,12 +551,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -617,12 +581,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -748,18 +709,11 @@
    - - - + {% trans trimmed %}Download{% endtrans %} - - -
    - - {% endif %} @@ -783,18 +737,11 @@
    - - - + {% trans trimmed %}Download{% endtrans %} - - -
    - - {% endif %} @@ -821,12 +768,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -854,12 +798,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -887,12 +828,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -920,12 +858,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -999,9 +934,7 @@ - - - + {{export_regulations()}} diff --git a/sites/getfedora.org/site/alt/cloud/index.html b/sites/getfedora.org/site/alt/cloud/index.html index 841969c..c7e2466 100644 --- a/sites/getfedora.org/site/alt/cloud/index.html +++ b/sites/getfedora.org/site/alt/cloud/index.html @@ -82,12 +82,9 @@
    - - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -117,9 +114,7 @@
    - - {% trans trimmed %}Download{% endtrans %} - + {% trans trimmed %}Download{% endtrans %}
    {% endif %} @@ -146,11 +141,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -179,9 +172,7 @@
    - - {% trans trimmed %}Download{% endtrans %} - + {% trans trimmed %}Download{% endtrans %}
    @@ -250,13 +241,10 @@ -
    - - - + @@ -286,8 +274,8 @@
    - - {% trans trimmed %}Download{% endtrans %} + + {% trans trimmed %}Download{% endtrans %}
    @@ -318,8 +306,8 @@
    - {% trans trimmed %}Download{% endtrans %} - + {% trans trimmed %}Download{% endtrans %} +
    @@ -351,7 +339,7 @@
    - {% trans trimmed %}Download{% endtrans %} + {% trans trimmed %}Download{% endtrans %}
    @@ -425,12 +413,9 @@ {{'Fedora %s: GP2 HVM AMIs'%releaseinfo.ga.alt.Cloud.release_number}} - - - +
    -

    {% trans trimmed %}Click to Launch{% endtrans %} diff --git a/sites/getfedora.org/site/alt/index.html b/sites/getfedora.org/site/alt/index.html index 1b7ce84..6396ae4 100644 --- a/sites/getfedora.org/site/alt/index.html +++ b/sites/getfedora.org/site/alt/index.html @@ -15,7 +15,7 @@ {% if releaseinfo.beta.show %} {% trans trimmed n=releaseinfo.beta.announcement_release_number %} - Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} > + Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} » {% else %} {% trans trimmed n=releaseinfo.ga.announcement_release_number %} @@ -108,15 +108,11 @@

    - -
    - - - {% trans trimmed %}Download{% endtrans %} - - -
    - +
    + + {% trans trimmed %}Download{% endtrans %} + +
    {% endif %} @@ -140,15 +136,11 @@ -
    - - - {% trans trimmed %}Download{% endtrans %} - -
    - - - +
    + + {% trans trimmed %}Download{% endtrans %} + +
    {% endif %} @@ -337,15 +329,11 @@ -
    - - - {% trans trimmed %}Download{% endtrans %} - - - -
    - +
    + + {% trans trimmed %}Download{% endtrans %} + +
    {% endif %} @@ -369,15 +357,11 @@ -
    - - - {% trans trimmed %}Download{% endtrans %} - - - -
    - +
    + + {% trans trimmed %}Download{% endtrans %} + +
    {% endif %} @@ -388,9 +372,7 @@

    Once you have downloaded an image, be sure to verify it for both security and integrity.

    - {% trans trimmed %}Verify your Download{% endtrans %} -
    @@ -442,11 +424,9 @@
    - {% trans trimmed %}View Images >{% endtrans %} -
    @@ -470,14 +450,11 @@ -
    - - - {% trans trimmed %}View Images >{% endtrans %} - - - -
    +
    + + {% trans trimmed %}View Images >{% endtrans %} + +
    @@ -517,12 +494,10 @@
    -
    - +

    {% trans trimmed %}Find out more about {% endtrans %} {% trans trimmed %}Rawhide{% endtrans %}, {% trans trimmed %}our ever-moving development version. Rawhide is targeted at advanced users, testers, and package maintainers.{% endtrans %}



    -
    diff --git a/sites/getfedora.org/site/alt/prerelease/index.html b/sites/getfedora.org/site/alt/prerelease/index.html index 7589317..0bfc5c5 100644 --- a/sites/getfedora.org/site/alt/prerelease/index.html +++ b/sites/getfedora.org/site/alt/prerelease/index.html @@ -90,7 +90,7 @@
    - + {% trans trimmed %}Download{% endtrans %} @@ -119,8 +119,7 @@
    - - + {% trans trimmed %}Download{% endtrans %} @@ -152,11 +151,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -184,11 +181,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -216,11 +211,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -285,11 +278,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -315,11 +306,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -348,8 +337,7 @@
    - - + {% trans trimmed %}Download{% endtrans %} @@ -380,11 +368,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -412,11 +398,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -482,10 +466,9 @@
    - - - {% trans trimmed %}Download{% endtrans %} - + + {% trans trimmed %}Download{% endtrans %} +
    @@ -511,11 +494,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -544,11 +525,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -576,11 +555,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    @@ -608,11 +585,9 @@
    - - + {% trans trimmed %}Download{% endtrans %} -
    diff --git a/sites/getfedora.org/site/security/index.html b/sites/getfedora.org/site/security/index.html index a90c224..e477c65 100644 --- a/sites/getfedora.org/site/security/index.html +++ b/sites/getfedora.org/site/security/index.html @@ -85,7 +85,50 @@ -
    + + +
    +
    + +
    +
    + +
    +
    +
    + {% for altdl in releaseinfo.ga.alt %} +
    +
    +

    {{releaseinfo.ga.alt[altdl].pretty_name}}

    + +
    + {% endfor %} +
    +
    + {% for altdl in releaseinfo.beta.alt %} +
    +
    +

    {{releaseinfo.beta.alt[altdl].pretty_name}} Beta

    + +
    + {% endfor %} +
    +
    +
    + +
    diff --git a/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM new file mode 100644 index 0000000..e9577d7 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Cloud-Base-32_Beta-1.2.aarch64.qcow2: 338952192 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.qcow2) = c12716fdfca8bee62816582bcc39d85d0b778f7d5c5c4d516c2e964a57174418 +# Fedora-Cloud-Base-32_Beta-1.2.aarch64.raw.xz: 231357584 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.raw.xz) = 58a0970d80cc9f8c0d2778ade16757db490dba7138b15329563270c41dd6a378 +# Fedora-Cloud-Base-32_Beta-1.2.aarch64.vmdk: 956628992 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.vmdk) = 8de82e17d7b12eea47e9974c49e5e626a5c515290f0f1017d85210ae391d09ca +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZPAAoJEGwTAm0SyUTQerQP/1GpJf/tlG1U7qpJNneVkd2M +nuhgwVc8Lw2NmC6OVEsNrkWNPbEdhBLo/V3mtELWpe17jTJ9YnJo7aLQGAIKfkQH +vaUcniF9MPjzZ945Fsy+fOLxELXGX2WoIIL2aTdw8dKInE7mUxUPr8W9nCKY5UO0 +kQU18WaLSddONWAj/AcGvYiP14H88k/3Jm8DMBo6uTHT5WrmgP7uSSoBCQTj3TCe +7IDEVZefI7lzETYXzK3xIaNEHIcZTPVC8yMclhJlbNbo8R6wfE5rI6ZsNExMb2Ze +KgRFvloCLFeYnY+5e5l/65h24QJsnNnC92iLD0sYgde1TfMLezcQ3MQSXn0TUEMZ +0oCe/pqYMSMMsmYkBCmf3KHx/ZuBcvECni0UUAG6TTlsJcFg268j9w0IvA6tmtsQ +YF76/sp4Si0mVc9QJ/S1kQGn1+Ykm+iWCvFQ/14S1tInJKVZi3D/7QtiFlhfjqWd +Kp8Y9dwa0/ILeQZChwEHvniNUuPxM2FRoxikp51Dt8Zy4/TJoFd66vBSgeQmfsqY +pqM65aU1wTSVqfQ44mOB7PUKwV3bI7A3lDF2jb6rWN3uIXLMSUgQm89NYbd432dR +UztBGVJGOWa0O3vMXczQKjpgS2ZTymxs6dpmcZBf/puXZoS7qg58sW6Tn5f56gcO +yy8VO5O0US02VyUIkmOM +=RYym +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-ppc64le-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-ppc64le-CHECKSUM new file mode 100644 index 0000000..6c023d9 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-ppc64le-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Cloud-Base-32_Beta-1.2.ppc64le.qcow2: 371916800 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.ppc64le.qcow2) = 7eba2bdfc32838c3166e0d8a24d5f7244909ac97f7c7e2cce415bc9b1920da35 +# Fedora-Cloud-Base-32_Beta-1.2.ppc64le.raw.xz: 245046748 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.ppc64le.raw.xz) = a6bc8b40537b6e68ad408cfa87225870135539a2ba16c5a8fe94bb33145c6b5e +# Fedora-Cloud-Base-32_Beta-1.2.ppc64le.vmdk: 1085014016 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.ppc64le.vmdk) = dfa148649040efa7503182f7d6bae31745b9a72fed74ee8260bbb08d1b93c7d4 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZMAAoJEGwTAm0SyUTQdtQP/04PUqhXhFoIHIpgPPRMw8nX +ZQnNnCIMofgKdhZF7rnkCilCBZs/pT/8SkechoYSdS4UHGDXO/UTIKHQPf7mqCUj +QYw07/hrugTVbbo39xrJT6WqUMUussQzM2Ujrot8NVgTpVHCz6jvnFBoXstacyww +wwakyXseAF+aZfdpYpxC8NfPFxhL3KJkl59SbUw5EHWtCQb49CeYVGCubF/YSt6j +AaC5mboCi16HnxKG2w1nliaDioI8S6fNfk2JqntairaZEo8pjz8OC2xP/YvoQVmT +xPJCzO9Mtm5Y9Yp3hBYSSpYqcypi2q1BjYX+qwmRaGsgbsHJR3+a9YSG/GJcaeI0 +G8WnG1cO81NhEl6sRF/yO0W8CqjYa2Inj0hEvchcSjMfTdXprwAAF7Q8vEvDRfkK +L+7HCc/Ti7Pm2saDijwnY4E5xtmKODF68mbs9rl1SvlPuNgL3cvfSkdWfEdBtaFm +r8VAH7kM2pu73oAtgQ8EWKiQWS8hc59yXuam/mgr+h2+pluNJWhUFVSIkxiZ+xpJ +zbf8pUzeB5/Z31cHuAeYJ50PqPH2mgOWzfs7DpOXPf6A3sbVk9Wdn6HxAniHUnzH +gvhF2ToFYlkzSlqJAT+ToFAdWXbpvnLXJx/c8a7YKSmKgoJxks9Ir8hGm0aZ3DVL +KhCmSi4zGvE4CjeWQoPJ +=sa1e +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-s390x-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-s390x-CHECKSUM new file mode 100644 index 0000000..4db3122 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-s390x-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Cloud-Base-32_Beta-1.2.s390x.qcow2: 337772544 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.s390x.qcow2) = 003cc8ce1b3804e63065969ab56a139d44cf2777841ad183d9a36fd03136810a +# Fedora-Cloud-Base-32_Beta-1.2.s390x.raw.xz: 226565856 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.s390x.raw.xz) = b15d891112bd19b17fbc6f93cbd3e019e261b55054c4aa737500304a14973628 +# Fedora-Cloud-Base-32_Beta-1.2.s390x.vmdk: 890896384 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.s390x.vmdk) = d8fe2b474155179aa9834f55cc97fdfeb4244bd14bb4ce770c78fd17ef556f7d +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZRAAoJEGwTAm0SyUTQnYcQALxkerdnp7ISlGN9/3H2ePfk +A9yYHZ605Z8tEAT1Es0ETFSxmAfxm9+4htrm6Tgw8mUB5/XlEGalfdkQRz8EdGBg +2ixZ+JSHtMgCNyElY4VkbvAiCxMYrHdhx6QTns+q3l8x8hYRgP8OnhCErtwh+2Aq +PgdbrsWDzA5lbNaXzGIO0xWFtgaS+AfBFEDH4XNFEMO5cIlPmpwW3o1a06Znvhsh +UYDhjVLb0uTSBaKcY0NRBhFqPyIvxB1oOYss5kt+SXd4LwzUH/HAwYOWqy4algM1 +dmIaELn0f/y2hrq7fD0VJkQgY7/KN92uNfT7Qg2jyOlmD5dfYK7VySUxkU0TxkRc +gp2/PJvCoHTNVD5FRvxGbZ2ox0AjFMtXERS8PdaMlx+ulBCMr2YJmx/yL8B1AOMB +lvXi7qsVR5cgM5EMW9Nvuu4vBqKyepq1Dgctgzw8jMKM0F3677WBx5YLzmuT4K4h +1QM1io72wF+KOh1+oF0kqvmeOiPeduCYF16n8PGFtpz8FngvX7P+8kDW40aYXYR6 +OyfSppvusA9szcoZRMPC86CWU0c3c+GwxZFqOIqAmXRDQrcHI9Rt4YIMayvdYcOH +GCIjC+W7J8jlVagEwNVe/mNgmRKOiLbr6fTRyJGiz04AhVBq1G2ww9usIBw+zZba +MA5LgWGOWSycT6bC6FbX +=nkui +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM new file mode 100644 index 0000000..5794a8e --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Cloud-Base-32_Beta-1.2.x86_64.qcow2: 336592896 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.qcow2) = 3ff094bc37d6ddf21c617e479a84597b2c15e06003e8f5b4c3a0529979626ef9 +# Fedora-Cloud-Base-32_Beta-1.2.x86_64.raw.xz: 233506408 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.raw.xz) = ba3f4f8c41c295ecd35057844764a02fbee6be807ff5c8abba9f23b4e6b1f2e0 +# Fedora-Cloud-Base-32_Beta-1.2.x86_64.vmdk: 874512384 bytes +SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.vmdk) = 2b9de4df3e85db40ff469e8fa53587c15bc4018b6dd55c7f90180cf5914095b1 +# Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-libvirt.box: 316485889 bytes +SHA256 (Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-libvirt.box) = 40cc043c642a594946c67b05010dbe9ed2bbf825d618355fe192694efcd9610f +# Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-virtualbox.box: 331100160 bytes +SHA256 (Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-virtualbox.box) = ec931a64c5ca488ae7809f3a3cb6049acc6141438cbabbbe8156b8a0ca2d4e62 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZJAAoJEGwTAm0SyUTQjCUP/RtrO6BjfcMgoMCg2BCfc2wZ +nBu7QHssrik0+1hg+X04gYzyKk+rI0mUGTBpjjn2znbmWx76ZGV6hLbyWWVVlPbU +rgrh6iAfj2pUvK2gUKnujwiPx7VgHfXnhX7qcdnI+ATh0dxOtB1VX1ANLDllbHWW +F56MT5a44uOhjoUR/RtlDRF45jGL3VQ/svKv5X/fmfBFy+aj9Krwqu4ok8NoRHhd +TUqDg4fLd2OKRrN1MF6tMbUtPbz7q15D0Cii2A8WiTdTpu5j0b+18r5Of69Jmw5S +lfn7wpGEThemfJaZpQgWD6r+vWzWFYJajMBZkLiDGdWaNllPc1et5AQCtievP6ge +pDPwpa8dm2gMW4zArrjQomLETFQbS23ziEKbmEpCvj+S79uQGGETsS6V3/B1NG7e +zrLjtVtZD1zyAnmHewxIquMrY4ijm/ryDfAPz2g0amMGxWTplwDVocrKnFkIgq5y +hwS2aHMuO4WrMlY3JMfxD22NHW5MpH6O1wEcdlYVMhEXtqHn55n7CCEb4kH2mH5w +g//7ZHyH28s+3ygKjvo5EodWkjI+I8g3EF8Is5MFKhqp1If6q7y2PA5O1xlVQdJX +684V79GNv59uyLHb9HsfAmroYCr4n/0boB2kVpnKY6TxI5QDzdNMA+e0AtyrsJFK +Ivnr8oNx1bp4/15pmulm +=DMie +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-ppc64le-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-ppc64le-CHECKSUM new file mode 100644 index 0000000..592824e --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-ppc64le-CHECKSUM @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Container-Base-32_Beta-1.2.ppc64le.tar.xz: 45248020 bytes +SHA256 (Fedora-Container-Base-32_Beta-1.2.ppc64le.tar.xz) = 9b671f5435ec1abfd0356d707860e08bc3061210e1d0494808d0fc79a432c358 +# Fedora-Container-Minimal-Base-32_Beta-1.2.ppc64le.tar.xz: 31634728 bytes +SHA256 (Fedora-Container-Minimal-Base-32_Beta-1.2.ppc64le.tar.xz) = 8fcb4811af68c8dd10c0282d162dc4ae3d8a2d84b4809b110033630a113a5d64 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZWAAoJEGwTAm0SyUTQId4QAIoxN8LKbQvblfzcsi5TFs4u +/F69iqabJgoCDgjVCNbDtPold7BB7JHzibuCY0XfWRre/TZ2/R6+S7ZrTLHICrN5 +Qt4YWMpcRgVEuqTbX18qhsUQAtVrbEi5nBojZA9ZBPVlf9cYt8E3451tGdCFwyDR +R+tlxyHtMZehar/pwQoaVTD69e53jopk0ZxZBcb8Fy8sbDgh9FubpGn0pR7DFkLa +OuhMACcs0ugKBlGE2Ny9NtahKNHdXcc/RzhhNQhwKi6/loaFrx6WBd86Ak7PUHMF +4u56k+Z5CcGK/rjVLroWoHq7wKfzWEMmelyx3I6XkaVgzEqDVfuxZnCeXw2KHPcJ +kyR8jiX/v0K8PfioC4uhUkq9k19y4UJew6oIZybgxCvZ+jqVALI+1cwk2MarEDmb +uZXXnMPFjb1wZFAWLveENXgcQKnQvcSBN15XHum2mmrf5tqLV2zkOaRW1OjWXziw +DgZQNhZH3wNusGSq3aMIKXCjEUGCpqOAhkidFKs/z96VwwsKOwiHRyLus4GADmzB +Niqkgi7i0/bQkAGJezIE/VE2wGrQ4IJIk1byk7w30N5nARIFCpdNm1i+Xb7uIAf+ +MSNPvfql4POLFmpXezCfdE5RXg2Ey2mDy28gxcGbUIyCXkNZB1bXBRXsqgYzg+uB +911699idrOyw8tJ5FRYL +=0tv/ +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-s390x-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-s390x-CHECKSUM new file mode 100644 index 0000000..bed87cf --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Container-32_Beta-1.2-s390x-CHECKSUM @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Container-Base-32_Beta-1.2.s390x.tar.xz: 42651692 bytes +SHA256 (Fedora-Container-Base-32_Beta-1.2.s390x.tar.xz) = 3c86f4df52e9f3e6bf6bfed0c6b33e8fc941c51fb82750267834e04dab18cb2f +# Fedora-Container-Minimal-Base-32_Beta-1.2.s390x.tar.xz: 29839196 bytes +SHA256 (Fedora-Container-Minimal-Base-32_Beta-1.2.s390x.tar.xz) = 29183229a55ef1cf9d6563c4fc640091c71e855ba7958442be42f5eb4bc7a470 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+ZYAAoJEGwTAm0SyUTQxSYP+wUHutB/HwQpcFpoKyEYY6qn +9eL9L5XHSAYPUtMCexnIkbWv2ewpwzf+NJQAJz+DodfqxGN9gTR98dRhKIYjfc5v +j2QvaoXO645qib9qwxqPb5bOHPggLuOLoqzXf3Py4V/eKe+UXUbC3XUyP8XICM3R +2aH5XODrgxhrPYqDXV077bUoruZOrJ4rPWX7eqzT1dH4X/kHPirJ+dDO7fOkz0Qx +aU4lrHzG5onr6D1oEJFH+CM5p0kGf/BK1nJc1HlwADD9a8zqS3lCO9qwlvBsryJ7 +LJ58sxK2sHAFXUDA8ibaGui3APlUqrQXiR5j4zqRawea2fZTI/3apXV+a/Wv4e9b +lCUW8nbCnB9Hr7PZVcA6Q4lDsR/OZHAzZETw71MbbCL9xSxGQlFKkpsZZL/Ea6T1 +n5eOj3Q5gZHx8vV7y6ixS5hn4ndmKt5eqSSiOBJROTLBVM8io3faT28knMEe+k3y +AlbZjvOx7QmIxSxOCyekxNMrzTiaf+QQ2WRRRbO7KK2Ztyku8fN8sc28qw8pgKaK +KmYXoXx/A4rqbrfGCRORVvjRX+ABPuTDdi5YWHywTnBhKg8BNrmjozIRDMkZdLPq +LyxgH7do/CGGmOYCqozeR7AT073tdnenEk2blHLW0AOoXozE/ojAsuV+7Ak6I4gD +2r46TZ0erx/Ls9h7fkKZ +=8FZW +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-ppc64le-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-ppc64le-CHECKSUM new file mode 100644 index 0000000..f0e3716 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-ppc64le-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Everything-netinst-ppc64le-32_Beta-1.2.iso: 704690176 bytes +SHA256 (Fedora-Everything-netinst-ppc64le-32_Beta-1.2.iso) = 02b658662656ab75040abc4e26ea17e8074e5346582da3375ba59dac5b8c24b6 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+YeAAoJEGwTAm0SyUTQP7UP/jl7t0nLK1ghVXl7L8dcSqEa +HKqacSF32BFJjmxtpFuUXP8TdG86vR0iypcXiiJOdINspQ6U59RsY6OnO7gJbRKe +5KzpKmCnXNr+p7KOpY6PBPchXma/0oj8DGP0VIW1G2HFl5jf7lXVqocY6GSIWW/I +MjnqMuwq6XcJ199+R2srmeeEYrhxjx69QbvcbP4cIFAOpTJV8xEuc9aHCLdAVyv7 +/+yS94EgrinDMcV1pfW7oPvEI7jumFuBnpfNtCV7+fcDGegIg5uTgKkmt+os1Qnq +9xc938Zx7OdnaHluTESGMAw9zgpUsyQk7DRRPyvstbkGN4rMMYKC+4tn131tQLvL +ZOvFn4zHcxOxbGXfODa+Pfim11xkW2INz4lE7DL7FZOZ+pGkQIZB7KAivizIcwsT +BrmpsCVR7/Fvccgt7hIBJ/YsH25fTEpQROsNqE8SmVq413d+lhBSXDXFv5zsh3Iq +n9BUpxhXBGII/v8XR3RTirRvqc3RVxim+U9+gPd/VwhG6SwFl9NK9lr3z/bAR5RI +tXNuhSr5eJ1nyRxra5wUreqYl+i5QOqlThJlJxrQd0e/Jb1J6za8EQE3I0xWcle/ +T1EzPI/p9z9qFPPIeaDziDf36oHYiuxDYivro9xkSmc7IAxeOeJzbCObGzfgyIhp +A0bb3LzkBDH/j6IU5/QO +=lRL5 +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-s390x-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-s390x-CHECKSUM new file mode 100644 index 0000000..519c6b3 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Everything-32_Beta-1.2-s390x-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Everything-netinst-s390x-32_Beta-1.2.iso: 552448000 bytes +SHA256 (Fedora-Everything-netinst-s390x-32_Beta-1.2.iso) = c281e46d18c3b342f8e9618350f2ae3d7916bb29b463f7cc396496207efe2821 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+YiAAoJEGwTAm0SyUTQQBIP/jB6AMckkneMA1TqckWnxA3o +7cDNNY/Ypm4i7z8GniwjZ/GEQrT98PfvrLWAfyYz+K3kPIOidEonMZkXleqR8ZDm +hRBE+fn8POEYOFuTj30i6U/wKgkO7tJpjQPUYzCBrh7c/G9DNyfgBOwUu2TbW8bL +UdS3QTY4z0qMjcNhmJAzp/OAv8JvwBz0H/Uv+SD2DKEbpoSCs+631LiopSZEVD30 +VRaC2mXlLH8KcVtrIAJY/f8gANOKWCO70OwKcM2akBGwP4NVX1uRiETCKjn6RCF1 +9KPBIW7GtzWHgDcbwSzjRJWSM7J9Heu0Ygn7V6mJkgQYYfh1Tc3Z5RmKBSGI2vtY +b1PfAOjH/RWgwDEExYAq+iOfLvNAlEOVUJWa3gPRs1RQVlX6Qrx9acU0VPkaYALK +6/d3Cup0HEgujB1bk3Gt5AxFYbIQkq3GqCJy7GoxSt3dehYJjxoorV1eVTd3WuMR +G+dpyz2XMXKxKy/XJNlnf0+uBbPAvo0UmzplZh3LPSgq8NhWJL/ARUYrbqqiMMMs +FGLdkYQl5w0/8tlxV/wzZBRXxpqjsrtPHxwk7w6n7HQPaIlGtYL87u8kjGkNAKae +W8Qhv7SOYKUj1DvwxQcxV7UnhQEPQHTv8PXsnNI7a4LONOQKs+xbksnnDHwQ31ZD +P50j88ReRvWLpbyj0q6Z +=U6z7 +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Spins-32_Beta-1.2-aarch64-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Spins-32_Beta-1.2-aarch64-CHECKSUM new file mode 100644 index 0000000..8998f35 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Spins-32_Beta-1.2-aarch64-CHECKSUM @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Minimal-32_Beta-1.2.aarch64.raw.xz: 766438744 bytes +SHA256 (Fedora-Minimal-32_Beta-1.2.aarch64.raw.xz) = da13a477bbf9ba743a366c8ca7e2b6c2fb34ce76d38c42cc732fa43cb6fbd370 +# Fedora-Xfce-32_Beta-1.2.aarch64.raw.xz: 2310805868 bytes +SHA256 (Fedora-Xfce-32_Beta-1.2.aarch64.raw.xz) = 2caa080f4c06fad4f3e42c889cb345896e453ccacd71af39f7d4ef9b81322753 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+YyAAoJEGwTAm0SyUTQihgP/3Ccu/7QFYrG9h+a2MF8JEtZ +Xa9ZbFD+mB0Xxc9wUe2Bkt9iQWArWH06TVdFXqF0qC0BJgA0hN/k0rjQZ0xixLjn +Lr2yk/+qoz8IKnaowZ/gk43RVN6QXcWKO62+9FuPeovxY6xItmWb3G98Z3e4VDpw +9I9DvGAxIZ5gEoJfOaxNVZqPsCEe8a4R6OjqGaXz+PwQVDBTAcoV3TCXVttqABHl +yEBcXytw+FQaiqWM5jhG8u5BdHnG/zQpSlT00GI4F5804dJns250C9ZTfAzD6pyr +vIR2tU8oJwgeZQztjz8BCWjpFUUK9v3XJWmJap0Ge1ZgAEhKxF3a/PdfJIzTDQUP +lXXpvAYH7G2wx7YF6jYNR23I3RjmZ6L3DMlxtOrVBSSVS5ugIFFxQwNufMqqdmFS +3BPPZN7o4A0F7ZYlHihaMzjrX3geloGZNxJaLKa/EpwBNQuhBrmlbeApQTjJcDl6 +uiT3bPxVsMBOw9S2acahn9sO73QYaPgg/+kIMR+0oAXYBal4v1oMHsH1hWMgFjKh +wm2aBR/gjEN6hzNZloi4MvJZZoTuwPZ4YKgrC5V3gofugrsqkyDofIOTfiTWZCFR +6tZYLIdZEi5EQQRPzymF1s3f/sGSS/ZZgczucvRkUL4eJM9EQNmJ3G6PoE+XwZxW +8QkDRx8D5jZQsn67TSX0 +=/fsm +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-aarch64-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-aarch64-CHECKSUM new file mode 100644 index 0000000..a94b846 --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-aarch64-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Workstation-32_Beta-1.2.aarch64.raw.xz: 3060294636 bytes +SHA256 (Fedora-Workstation-32_Beta-1.2.aarch64.raw.xz) = cd71e0748ed3f889953023745f01e42b7a51823d0cf2b4f4a424084eb901a6b8 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+Y7AAoJEGwTAm0SyUTQllcP/i5jh4YiGnPWx5CB4SD8qCa8 +DcTEG2D3ZB2zso6JfHAg7QByySYWPhJ347E/DtLsWOt64qqpzcJulOYzoKDGdQ6d +1toPD4znp3pC/5EzVOqUnhfwD1CL+aI5QC/MgsVp7B4jNtvr+yiVZwe7q2ucEgqg +ixdbgjop458UNBcZ6LxdDw+g1eM9tb94oUbP3uYHiwdIoCutQyNvC8O9sEvOHwhh +aVQyePb0o9+GsmDBnnZH8gMQdXeaPp+nm4l6T7X3CBQ+yDDvc+J2bioMxOG3MShH +4h7yKotLbX5xaMBUbuOZmRAjR8u7TfY4t+hEY6rVevMBxVdhn+g/Sp69TF2/l+Zc +wGuCbv9DnK2yXSS0vey0FwAx5qrhWvygaFrZmEd6s7HpPDTNddBpxO0Vn6uYqm12 +SLNKRusgelto09hvXpE/P0uoKhUVzMrdSvmrdvPM0f/eUqvzam0+46lURQxRTvVS +tjYv9I5yeNmCw5WZIknrLCx8vI88Nu0rosIixjCF1AXXGJBCEWLOMu9uklW4RczD +4exCgaxOLGq0ZJlTZ8Gs1esbdmpedqyshosdUYpjto/O0y8kOPm8+myqyX3KzOoH +mgmDkRV1pAG7KEL01yZaA4EABDtzZA6ZAcOryP2bQDRw6QEyjdYy2D5wqDrmpuYA +I16nEotb8wjt1Zef6q0I +=iHIS +-----END PGP SIGNATURE----- diff --git a/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-ppc64le-CHECKSUM b/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-ppc64le-CHECKSUM new file mode 100644 index 0000000..f6ed9ac --- /dev/null +++ b/sites/getfedora.org/static/checksums/Fedora-Workstation-32_Beta-1.2-ppc64le-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# Fedora-Workstation-Live-ppc64le-32_Beta-1.2.iso: 1938034688 bytes +SHA256 (Fedora-Workstation-Live-ppc64le-32_Beta-1.2.iso) = 3a20f135505568be47df5b823c2b9aa5fd5f9da97384a116d4a248cfa6b87e6e +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJea+Y3AAoJEGwTAm0SyUTQsOQP/jQ4WtyHYHCFwpIh4EFtL3LG +hCr+fVNjzl6kCnynfAgm4Z3AkMVt9UVdPyrpuqd9bXUoTTAj0oWct6wQhvfcQOfl +E2IJoRp+rFo3ERU9v/0njzfKaKTG47vFS3gl7ziPnU9RtFPmoGzrHFZY493vS8de +m+CAOGSkRc4RMCnKzEGYeq00HYokI2E0q8XHQZJlMa5C6ZJ0MqejZqkHtgTYjwVM +vNRD8tpmSdyzT9qxciEKaXk5qVOK8WL+MAbaGtDlm6/THbJosGOK0c3G7tJRT0+O +FGFevF3x9bAlnbuFcBhR3/dEpAGTz1GPzeGSpzPv8GI1g7xfUCYLz7TAh3BfP+1W +rvHEwuMX2BJLjbb9OQ/hr0wB+cvEDU60NcMIHucvBHfz0lXEn1+W0d93oWaduQNz +eDL6Fk6tftaoq1UVN1aFJdcvW2Gt0i7r4sOmHSX9WY/3BACXPd2A6wYMOFIbOPpd +qMC9hFIerY5p55wYWoZcWwgJ4CtLLAVw8jpXGNy5Pgc1UPGAZFsAVSiyy9umUpvp +Aqwmh5RZLEVtnEmp/Kh22hxzw7rakmgXj5K4DIs79ZooHxJISim/fcr0zMa5Sx6U +H7EaZ1DRUiXA99SnDVuWFiQMnJlDad0+WnTv6bsxoVqcL+wa2cW3Y5ecnHic04ZO +jsKyG8AFDvcqNmzXrciF +=vjHp +-----END PGP SIGNATURE----- From 864ea832aa5c79a931da2a2a967413662c84a0dc Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Mar 31 2020 17:05:58 +0000 Subject: [PATCH 4/4] Code formatting --- diff --git a/sites/getfedora.org/site/alt/altarch/index.html b/sites/getfedora.org/site/alt/altarch/index.html index 5678be6..9218446 100644 --- a/sites/getfedora.org/site/alt/altarch/index.html +++ b/sites/getfedora.org/site/alt/altarch/index.html @@ -6,12 +6,9 @@ {% block content %} -
    - +
    - -
    - +
    {% if releaseinfo.beta.show %} {% trans trimmed n=releaseinfo.beta.announcement_release_number %} Fedora {{n}} Beta released!{% endtrans %} {% trans trimmed %}Test it now{% endtrans %} » @@ -22,641 +19,320 @@ {% endtrans %} {% endif %} -
    - -
    - +
    -