From 2eb423c13fc0103f3f38cfacfad5be06460f33ec Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Mar 28 2016 13:37:18 +0000 Subject: Merge branch 'f24-alpha' --- diff --git a/README b/README new file mode 100644 index 0000000..b991c72 --- /dev/null +++ b/README @@ -0,0 +1,45 @@ +This is the Fedora Websites GIT repo used to build the websites starting +from the F24 release cycle. + +History of previous commits is still available at: +https://git.fedorahosted.org/cgit/fedora-web.git/ + +######################################################################### +# # +# For all information please read the wiki pages or alternatively: # +# https://docs.pagure.org/fedora-websites/ # +# # +######################################################################### + +If you like to help the websites team but are not actually a member, you +can easily file Pull Requests. Fork this repository, make your changes and +submit them here. + +How to get started easily: +========================== + +DO NOT execute the following steps as root, just use your normal user: + +1) Setup your system + +sudo dnf install git gettext python-genshi python-setuptools python-dateutil \ +python-dogpile-cache babel python-feedparser + +sudo dnf groups install 'Web Server' + +2) Clone the repo + +git clone https://pagure.io/fedora-websites.git +cd fedora-websites/${website_dir} + +3) Launch a test instance + +make en test + +4) Stop the test instance + +make stoptest + +* if you have caching problems you can clean the instance even more: + +make veryclean \ No newline at end of file diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html index be6a10e..f933015 100644 --- a/arm.fedoraproject.org/data/content/index.html +++ b/arm.fedoraproject.org/data/content/index.html @@ -88,7 +88,7 @@

${_('Fedora Minimal')}

${_('Download')} | ${_('Verify')}

- + @@ -128,7 +128,7 @@

${_('Download')} | ${_('Verify')}

- + @@ -435,7 +435,6 @@ - + diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html index 4f15804..fa72195 100644 --- a/arm.fedoraproject.org/data/content/prerelease.html +++ b/arm.fedoraproject.org/data/content/prerelease.html @@ -49,11 +49,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Server']}

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -67,11 +67,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Minimal']}

${_('Fedora Minimal')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -82,14 +82,14 @@

${_('Fedora Workstation')}

${_('Fedora Workstation')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -100,14 +100,14 @@

${_('KDE Plasma Desktop')}

${_('KDE Plasma Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -118,14 +118,14 @@

${_('Xfce Desktop')}

${_('Xfce Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -139,11 +139,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_LXDE']}

${_('LXDE Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -154,14 +154,14 @@

${_('MATE-Compiz Desktop')}

${_('MATE-Compiz Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -194,11 +194,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_SoaS']}

${_('Sugar on a Stick')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Server-24_Alpha-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Server-24_Alpha-CHECKSUM new file mode 100644 index 0000000..f243593 --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Server-24_Alpha-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Server-armhfp-24_Alpha-7-sda.raw.xz) = 9ca439b56681b808b7876915465c12abb889ccc3a5f01b2d1d7574c3eaf7a666 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSSAAoJEHO96YOBtGUhoIIP/i50QtNC9Bmb1/RGAalwtBJV +pPvxSk03syyrkHo9Q7dEqkxRVOo/mQtH/4KePibE167t6AJDUnCAvqB2nI4FeZba +0xb+TMEIaNwWiJ8BMCgLGdjzlBjo3+aBw9rrJTWkitD6dtoo/KzO/8xNpNfdwzsW +/wJ0t5afIO5ic5wFlrx1982F+9JCMMF8PdGE3IyNX9Ih90UaqtG+Jbm9chvoCbV1 +nJ8jO3lY9HvetWVe33H3ub5DXINqptuqvTsqDJlQgFqxmQS86qmhenvciv3Et64G +hSFe5XJ+ynlSpjHDl3Vx50KVOKJTTZpNrft7CJxIuPON29LOigRpWfkQ7x1oM2yd +nfapPKNGfJnSNSJKcpvraFJpyWQCulVewxB8OPX2shboV8Gf7Ec02DyN9GhQcg0U +EMRIgSfgB1c3928xOMnWwQGryxXkNG54Z/ZNllZS2GegAiDwYZh4rFT3VFYSMgQG +aeLb+mrfxhjkSp5gjeqMcYIMTIKW9pb+CtIY0Pj+V6XDYf14j9yWds3q6jWv3//G +w00mMg0aU3FxFNbfsCWS5D/7jKPOLpz8eDe6dIcRDAH5X2tgwPRwLuyL52dUv0IT +FiHtWGKXquqZ6DbKzm9sq3RGmQ+iXfElDEDWlPBbcdbayFjLK87mmOTd97RuF5Z4 +iIyEac/s3zAFSkzgPtES +=2BVf +-----END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Spins-24_Alpha-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Spins-24_Alpha-CHECKSUM new file mode 100644 index 0000000..4354529 --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Spins-24_Alpha-CHECKSUM @@ -0,0 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Minimal-armhfp-24_Alpha-7-sda.raw.xz) = d24b546e10d9a5871bf5ab7e7001ca969920eba68a1cb4a619fec1b1452048b1 +SHA256 (Fedora-KDE-armhfp-24_Alpha-7-sda.raw.xz) = abfaa8513d978ce6a0fa671befa54950cede5956d70d4f504e29ae20428d3027 +SHA256 (Fedora-SoaS-armhfp-24_Alpha-7-sda.raw.xz) = 4ffbf3b396cac8c64606b7f15527542058fbeb98098b82fdb7e4899e83dfc8ad +SHA256 (Fedora-Xfce-armhfp-24_Alpha-7-sda.raw.xz) = ac29948101a0e987249bade1b69b02057ece06a3e43a10046a43909a8d998e23 +SHA256 (Fedora-Mate-armhfp-24_Alpha-7-sda.raw.xz) = bab4503b8613dad3254e07480259261880a971bc6e404f18efba89e86bf40b09 +SHA256 (Fedora-LXDE-armhfp-24_Alpha-7-sda.raw.xz) = b99a4a53a1695a5c9b61142953524b7bdb7f490693ac0c39452ca156e41074fe +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSZAAoJEHO96YOBtGUh78UP/AsAqgb/Mu/jf4LHhH5DovsC +4SX6RKNp9QhA5EU2INjpY+un/vOJ7N7s2dbqAolqusBLtANu7ZP6NFU019GKC1fB +wSZgcDxLkIYbdbgE9c/VHulJMA1KQQfZMFkuTxv9VSH0z61Wa0IgiVjLCTF4dCgb +5ZYZgvoZdYl6OY174FJR7bG6TkoIRNhcPlBblAFZUDBCKEJfGrl5X7CdEc1ghV6y +JYJ+IF9vu6Z/nWpJnisj3bDgj3zwpeufypuOAHjWppIFGh/jJhwCpyJnL7uT9si2 +Vt86cCr8z5Xh4psPPecQY8hcYprEKiy5VnPLOh/LTWF/EvDW4zebyWmJZdHaQTrw +5fUHyewwJ9BFZgHacCBAbJuMMg7q3eLqB0ktBiAWB+CRNXvHFo+OI2fqo8fvoC+F +lnbsLiIyuKq239wwinLDPEswKUqBZGTWdTxxmKsgV6mUkoBxgANlR0BX5hdmmreZ +hvZA0lwe64supPjXkhv4HhTyDTjyxKAlwNdjlUr/XQQ7EKj4lx5PJBFPWYyN2txb +leZzKI7D7SVaowdBwzcFJKoXkU6Rz0Vnj4sW5hZtQW662qOKR040VBU2c9Wy2GCU +Wk5V6xUeCDzKHmg5mniC0xn7rz7+ZDKEM1y3bSSoVymQv+zbPwsycvaf6FoRvfT9 +eGOXOeV4QTALS/Ylu0I4 +=5pnG +-----END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Workstation-24_Alpha-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Workstation-24_Alpha-CHECKSUM new file mode 100644 index 0000000..7553e81 --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Workstation-24_Alpha-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Workstation-armhfp-24_Alpha-7-sda.raw.xz) = 91b36ac33d674948c2be540774d78725ed1ad0baaf04be4e48b935fdada62831 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSeAAoJEHO96YOBtGUh4pMQAIyU9n3Wb4klWZgW3QrYQkpg +f6ox2BwJnna4t6YJBfE/VvHwNrmge9eI4HSxWH6sdXdGVMiN8xaDusXO1Qz9uIp5 +BPye8zvxlYDdntE/Lyjxqx1pYO6k2EEEWxkwmAZn58vKlA/vUQD8y7FeQCuJl7UT +AOxGqyTJmRXhwuJX2T44+velDLIwrRUQ7eximW+RNlxTHurKm1P856QO7ZqjkMWA +6SXi1LvrPC/GEbL16UZTKAHrwquX1o1Rdpre4HfZdJLP7Wo1xtoJMzWbo8w8IXef +rMmCoq/CAUPipZ+FH5WiSTcJdRXIQ3Le3GvPCYtQ+g9P0gklvQ+DkdBYTIkWavtH +pYTCUgC1r4rnuLCKb0IeSNSACv2Cicr8NXfL7YVOZV8Dyf6MiOlQEMOg+WVvJQKu +VQwveDscxoSQlRuqb9HH0Np+izQuoA2PI5bSxFdN7mlbFcrqliwo1J7pKt8a8ZdD +PGawiu+MNmBNuuVrEC7Glcjo7zYsLByEINEERRAgSl7XYooNp3NY3XMzcw9Mi8bI +DGli7T5TpN98Sf1wF3avgqVXJ56esMWp9mLznHqL0sMs3HHqA7Mj6Dmhxk0YJ03X +7PCRYR2ZFeB3tc19TXr2ILOc7yAJOkpqazZdzXZcJcDDccWCrsPNcWk29EHl79dT +rOuDdLtrVbrXpQmqzPoo +=cMqJ +-----END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/images/banners/f24alpha.png b/arm.fedoraproject.org/static/images/banners/f24alpha.png new file mode 100644 index 0000000..701a11b Binary files /dev/null and b/arm.fedoraproject.org/static/images/banners/f24alpha.png differ diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 584aa34..75639f7 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -7,12 +7,12 @@ release={ 'next_id': '24', 'curr_name': '', 'next_name': '', - 'curr_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_arm_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_ppc64_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_s390_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_AMI_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_arm_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_ppc64_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_s390_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_AMI_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'prev_arm_id': '22', 'prev_ppc64_id': '22', 'prev_s390_id': '22', @@ -26,17 +26,21 @@ release={ 'next_ppc64_id': '24', 'next_s390_id': '24', 'next_cloud_id': '24', - 'next_cloud_AMI_id': '23', + 'next_cloud_AMI_id': '24', 'composedate': '20151030', # Note that atomic values here get overwritten by the twoweek script. 'atomic_composedate': '20151030', 'pre_cloud_composedate': '20150915', 'pre_cloud_AMI_composedate': '20150915', + 'manual_pre_cloud_composedate': '20160101', + 'manual_pre_cloud_atomic_composedate': '20160101', + 'manual_pre_cloud_AMI_atomic_composedate': '20160101', # Note that atomic values here get overwritten by the twoweek script. 'pre_cloud_atomic_composedate': '20150915', 'pre_cloud_AMI_atomic_composedate': '20150915', 'RC_gold': '10', # insert the number of the RC version declared GOLD - 'RC_pre_gold': '1', # insert the number of the prerelease RC version declared GOLD + 'RC_pre_gold': '7', # insert the number of the prerelease RC version declared GOLD + 'RC_pre_build': '1.7', # sometimes releng use the RC build 'atomic_freshness': False, 'atomic_age': '???', @@ -88,17 +92,17 @@ iso_size={ 'x86_64_Live_Cinnamon': '1.2', # In GB # Lives prerelease 'pre_i686_Live_KDE': '1.2', # In GB - 'pre_x86_64_Live_KDE': '1.2', # In GB + 'pre_x86_64_Live_KDE': '1.3', # In GB 'pre_i686_Live_LXDE': '947', # In MB - 'pre_x86_64_Live_LXDE': '941', # In MB + 'pre_x86_64_Live_LXDE': '925', # In MB 'pre_i686_Live_Xfce': '1.0', # In GB - 'pre_x86_64_Live_Xfce': '918', # In MB + 'pre_x86_64_Live_Xfce': '1.0', # In GB 'pre_i686_Live_Mate': '1.3', # In GB - 'pre_x86_64_Live_Mate': '1.3', # In GB + 'pre_x86_64_Live_Mate': '1.4', # In GB 'pre_i686_Live_Soas': '662', # In MB 'pre_x86_64_Live_Soas': '686', # In MB 'pre_i686_Live_Cinnamon': '1.2', # In GB - 'pre_x86_64_Live_Cinnamon': '1.2', # In GB + 'pre_x86_64_Live_Cinnamon': '1.3', # In GB # Spins 'i686_Live_Security': '916', # In MB 'x86_64_Live_Security':'940', # In MB @@ -124,20 +128,22 @@ iso_size={ 'pre_i686_Live_Design': '1.7', # In GB 'pre_x86_64_Live_Design': '1.7', # In GB 'pre_i686_Live_Sci-kde': '2.7', # In GB - 'pre_x86_64_Live_Sci-kde': '2.7', # In GB + 'pre_x86_64_Live_Sci-kde': '2.8', # In GB 'pre_i686_Live_Robotics': '2.5', # In GB - 'pre_x86_64_Live_Robotics':'2.5', # In GB + 'pre_x86_64_Live_Robotics':'2.3', # In GB 'pre_i686_Live_Jam': '1.7', # In GB - 'pre_x86_64_Live_Jam': '1.7', # In GB + 'pre_x86_64_Live_Jam': '1.9', # In GB + 'pre_i686_Live_Astronomy': '1.7', # In GB + 'pre_x86_64_Live_Astronomy':'2.4', # In GB # Server 'x86_64_server_DVD': '2.0', # In GB 'i386_server_DVD': '2.1', # In GB 'x86_64_server_net': '415', # In MB 'i386_server_net': '458', # In MB # Server prerelease - 'pre_x86_64_server_DVD': '2.1', # In GB + 'pre_x86_64_server_DVD': '1.8', # In GB 'pre_i386_server_DVD': '2.2', # In GB - 'pre_x86_64_server_net': '469', # In MB + 'pre_x86_64_server_net': '457', # In MB 'pre_i386_server_net': '552', # In MB # Workstation 'x86_64_workstation': '1.4', # In GB @@ -147,8 +153,8 @@ iso_size={ # Workstation prerelease 'pre_x86_64_workstation': '1.4', # In GB 'pre_i386_workstation': '1.4', # In GB - 'pre_x86_64_workstation_net': '467',# In MB - 'pre_i386_workstation_net': '550', # In MB + 'pre_x86_64_workstation_net': '454',# In MB + 'pre_i386_workstation_net': '513', # In MB # ARM 'ARM_Workstation': '1.1', # In GB 'ARM_Server': '438', # In MB @@ -160,14 +166,14 @@ iso_size={ 'ARM_SoaS': '644', # In MB # ARM prerelease 'pre_ARM_Workstation': '1.2', # In GB - 'pre_ARM_Server': '429', # In MB - 'pre_ARM_Minimal': '342', # In MB - 'pre_ARM_KDE': '1.2', # In GB - 'pre_ARM_Xfce': '843', # In MB - 'pre_ARM_LXDE': '788', # In MB - 'pre_ARM_Mate': '1.1', # In GB + 'pre_ARM_Server': '538', # In MB + 'pre_ARM_Minimal': '422', # In MB + 'pre_ARM_KDE': '1.3', # In GB + 'pre_ARM_Xfce': '1.0', # In GB + 'pre_ARM_LXDE': '905', # In MB + 'pre_ARM_Mate': '1.3', # In GB 'pre_ARM_Cinnamon': '780', # In MB - 'pre_ARM_SoaS': '634', # In MB + 'pre_ARM_SoaS': '700', # In MB # Cloud 'raw_x86_64_cloud': '146', # In MB 'raw_i386_cloud': '143', # In MB @@ -188,9 +194,9 @@ iso_size={ 'libvag_cloud': '245', # In MB 'x86_64_docker': '45', # In MB # Cloud prerelease - 'pre_raw_x86_64_cloud': '176', # In MB + 'pre_raw_x86_64_cloud': '135', # In MB 'pre_raw_i386_cloud': '172', # In MB - 'pre_qcow2_x86_64_cloud': '275', # In MB + 'pre_qcow2_x86_64_cloud': '207', # In MB 'pre_qcow2_i386_cloud': '268', # In MB # Note that atomic values here get overwritten by the twoweek script. 'pre_atomic_raw_cloud': '???', # In MB @@ -199,7 +205,12 @@ iso_size={ 'pre_atomic_libvag_cloud': '???', # In MB 'pre_x86_64_docker': '49', # In MB 'pre_VBvag_cloud': '257', # In MB - 'pre_libvag_cloud': '248' # In MB + 'pre_libvag_cloud': '248', # In MB + # Manual atomic prerelease image sizes go here. + 'manual_pre_atomic_raw_cloud': '100', # In MB + 'manual_pre_atomic_qcow2_cloud': '200', # In MB + 'manual_pre_atomic_VBvag_cloud': '300', # In MB + 'manual_pre_atomic_libvag_cloud': '400' # In MB } # Redirect EC2 images @@ -308,51 +319,51 @@ GP2_HVM_atomic_AMI={ # TODO - replace the hand-typed IDs below with results harvested from fedimg pre_HVM_base_AMI={ - 'us-east-1': 'ami-e96d1b8c', # Virginia - 'us-west-2': 'ami-45e1fe75', # Oregon - 'us-west-1': 'ami-094c894d', # California - 'eu-west-1': 'ami-ab85a8dc', # Ireland - 'eu-central-1': 'ami-a88eb0b5', # Frankfurt - 'ap-southeast-1': 'ami-5e85900c', # Singapore - 'ap-northeast-1': 'ami-06970106', # Tokyo - 'ap-southeast-2': 'ami-bf135d85', # Sydney - 'sa-east-1': 'ami-8f089d92' # Sao Paolo + 'us-east-1': 'ami-a5303ccf', # Virginia + 'us-west-2': 'ami-364ca456', # Oregon + 'us-west-1': 'ami-78e59718', # California + 'eu-west-1': 'ami-b743c7c4', # Ireland + 'eu-central-1': 'ami-748b6d1b', # Frankfurt + 'ap-southeast-1': 'ami-43824820', # Singapore + 'ap-northeast-1': 'ami-132c397d', # Tokyo + 'ap-southeast-2': 'ami-e9dfff8a', # Sydney + 'sa-east-1': 'ami-1a901c76' # Sao Paolo } pre_GP2_HVM_base_AMI={ - 'us-east-1': 'ami-6b6d1b0e', # Virginia - 'us-west-2': 'ami-79e1fe49', # Oregon - 'us-west-1': 'ami-434c8907', # California - 'eu-west-1': 'ami-d785a8a0', # Ireland - 'eu-central-1': 'ami-ae8eb0b3', # Frankfurt - 'ap-southeast-1': 'ami-b49a8fe6', # Singapore - 'ap-northeast-1': 'ami-c29600c2', # Tokyo - 'ap-southeast-2': 'ami-49135d73', # Sydney - 'sa-east-1': 'ami-9f089d82' # Sao Paolo + 'us-east-1': 'ami-9c3438f6', # Virginia + 'us-west-2': 'ami-fb4aa29b', # Oregon + 'us-west-1': 'ami-0ee7956e', # California + 'eu-west-1': 'ami-7c43c70f', # Ireland + 'eu-central-1': 'ami-1f8a6c70', # Frankfurt + 'ap-southeast-1': 'ami-0d82486e', # Singapore + 'ap-northeast-1': 'ami-19223777', # Tokyo + 'ap-southeast-2': 'ami-c5a383a6', # Sydney + 'sa-east-1': 'ami-52911d3e' # Sao Paolo } pre_PV_base_AMI={ - 'us-east-1': 'ami-536d1b36', # Virginia - 'us-west-2': 'ami-6be1fe5b', # Oregon - 'us-west-1': 'ami-694c892d', # California - 'eu-west-1': 'ami-cf85a8b8', # Ireland - 'eu-central-1': 'ami-a48eb0b9', # Frankfurt - 'ap-southeast-1': 'ami-a49a8ff6', # Singapore - 'ap-northeast-1': 'ami-fa9600fa', # Tokyo - 'ap-southeast-2': 'ami-47135d7d', # Sydney - 'sa-east-1': 'ami-95089d88' # Sao Paolo + 'us-east-1': 'ami-40373b2a', # Virginia + 'us-west-2': 'ami-6740a807', # Oregon + 'us-west-1': 'ami-70e59710', # California + 'eu-west-1': 'ami-444dc937', # Ireland + 'eu-central-1': 'ami-b98a6cd6', # Frankfurt + 'ap-southeast-1': 'ami-f18e4492', # Singapore + 'ap-northeast-1': 'ami-352f3a5b', # Tokyo + 'ap-southeast-2': 'ami-ada585ce', # Sydney + 'sa-east-1': 'ami-41971b2d' # Sao Paolo } pre_GP2_PV_base_AMI={ - 'us-east-1': 'ami-8d6c1ae8', # Virginia - 'us-west-2': 'ami-09e1fe39', # Oregon - 'us-west-1': 'ami-b74d88f3', # California - 'eu-west-1': 'ami-e185a896', # Ireland - 'eu-central-1': 'ami-aa8eb0b7', # Frankfurt - 'ap-southeast-1': 'ami-8e9a8fdc', # Singapore - 'ap-northeast-1': 'ami-ba9600ba', # Tokyo - 'ap-southeast-2': 'ami-4b135d71', # Sydney - 'sa-east-1': 'ami-61089d7c' # Sao Paolo + 'us-east-1': 'ami-4a343820', # Virginia + 'us-west-2': 'ami-c44ca4a4', # Oregon + 'us-west-1': 'ami-08e69468', # California + 'eu-west-1': 'ami-5e4dc92d', # Ireland + 'eu-central-1': 'ami-008b6d6f', # Frankfurt + 'ap-southeast-1': 'ami-1e83497d', # Singapore + 'ap-northeast-1': 'ami-ce2f3aa0', # Tokyo + 'ap-southeast-2': 'ami-73ddfd10', # Sydney + 'sa-east-1': 'ami-a89915c4' # Sao Paolo } pre_HVM_atomic_AMI={ diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index da9e762..b7beab3 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -85,13 +85,13 @@ def collect(release): 'HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', 'GP2_HVM_atomic_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}-{pre_cloud_AMI_composedate}.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', - # 'pre_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard', - # 'pre_GP2_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2', - #}), - #("Fedora-Cloud-Atomic-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{pre_cloud_AMI_atomic_composedate}.x86_64", { + ("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', + 'pre_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard', + 'pre_GP2_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2', + }), + #("Fedora-Cloud-Atomic-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{manual_pre_cloud_AMI_atomic_composedate}.x86_64", { # 'pre_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', # 'pre_GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', #}), diff --git a/getfedora.org/build/release_schedule.py b/getfedora.org/build/release_schedule.py index 0c2e159..2ffbfa6 100755 --- a/getfedora.org/build/release_schedule.py +++ b/getfedora.org/build/release_schedule.py @@ -50,13 +50,13 @@ def schedule(release): # We need to generate the cache! # Download the schedule try: - u = urllib2.urlopen('http://fedorapeople.org/groups/schedule/f-' + release + '/f-' + release + '-key-milestones.tjx') + u = urllib2.urlopen('http://fedorapeople.org/groups/schedules/f-' + release + '/f-' + release + '-key-milestones.tjx') except HTTPError: - date[release] = {'alpha':'2014-jan-01', 'beta':'2014-jan-01', 'final':'2014-jan-01'} + date[release] = {'alpha':'2016-mar-29', 'beta':'2016-may-03', 'final':'2016-jun-07'} return date except URLError: - date[release] = {'alpha':'2014-jan-01', 'beta':'2014-jan-01', 'final':'2014-jan-01'} + date[release] = {'aalpha':'2016-mar-29', 'beta':'2016-may-03', 'final':'2016-jun-07'} return date # Release is already present in date if we got HTTPError diff --git a/getfedora.org/data/content/cloud/download/atomic.html b/getfedora.org/data/content/cloud/download/atomic.html index 941526f..7dabd0d 100644 --- a/getfedora.org/data/content/cloud/download/atomic.html +++ b/getfedora.org/data/content/cloud/download/atomic.html @@ -254,11 +254,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/getfedora.org/data/content/cloud/download/docker.html b/getfedora.org/data/content/cloud/download/docker.html index 1365828..e4a2a1b 100644 --- a/getfedora.org/data/content/cloud/download/docker.html +++ b/getfedora.org/data/content/cloud/download/docker.html @@ -93,11 +93,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/getfedora.org/data/content/cloud/download/index.html b/getfedora.org/data/content/cloud/download/index.html index 2a05612..8063fc2 100644 --- a/getfedora.org/data/content/cloud/download/index.html +++ b/getfedora.org/data/content/cloud/download/index.html @@ -448,11 +448,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/getfedora.org/data/content/cloud/prerelease/atomic.html b/getfedora.org/data/content/cloud/prerelease/atomic.html deleted file mode 100644 index f8dcacf..0000000 --- a/getfedora.org/data/content/cloud/prerelease/atomic.html +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - ${Markup(_('Download Fedora Cloud %s')) % global_variables.release['curr_state']} - - - - - - -
-
-
-
-

${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

-

${_('There are two main versions of Fedora Cloud available:')} -

    -
  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • -
  • ${Markup(_('<a href="atomic.html">Atomic images</a> for creating hosts for container deployment.'))}
    • -
-

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

${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})} - ${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} - - -

-

${Markup(_('Atomic %(state)s Images')) % {'state': global_variables.release['curr_state']}}

-

${_('Fedora Atomic represents the leading edge of Project Atomic development. The images published here showcase that work. Note that the images have passed several levels of automated testing, but are not always subjected to manual testing by the QA team.')}

-

${Markup(_('Please test before using new versions in production. If you do discover a problem, the Atomic tools make it easy to flip back to an earlier release — and if that happens, please also help us by <a href="%s">filing bugs</a> or <a href="%s">submitting fixes</a>.' % ('http://www.projectatomic.io/community/', 'https://github.com/projectatomic/')))}

-

${_('Fedora Atomic Host images are updated roughly every two weeks, rather than on the main six-month Fedora cadence. Because development is moving quickly, only the latest major Fedora release is supported.')}

-

${Markup(_('Note that different Fedora Atomic Host media are subject to different levels of automatic testing. We are making continuous improvements to these tests; <a href="%s">click here</a> to see the current test status.' % 'https://apps.fedoraproject.org/autocloud/jobs/'))}

-

${Markup(_('You can learn more about the Atomic project at <a href="%s">projectatomic.io</a>.') % ('http://projectatomic.io/'))}

-

${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(pre_cloud_atomic_age)s. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}

-

${Markup(_('These are the latest official Fedora Atomic Host images, produced %(pre_cloud_atomic_age)s.') % global_variables.release)}

-

${_('Atomic Image')}

-
-
- -
-
-
${_('qcow2 Image')}
-

${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} -

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}

-
-
-
${_('Raw Image')}
-

${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} -

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}

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

${_('Atomic Images for Vagrant')}

-

${_('These images are Vagrant Boxes images for deployment using Vagrant.')}

-
-
- -
-
-
${_('VirtualBox Image')}
-

${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

- ${_('VirtualBox Image')} -

${_('64-bit %sMB VirtualBox Atomic Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}

-
-
-
${_('libvirt/KVM Image')}
-

${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

- ${_('libvirt/KVM Image')} -

${_('64-bit %sMB libvirt/KVM Atomic Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}

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

${_('Atomic Cloud Images for Amazon Public Cloud EC2')}

-

${_('The links below 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.')}

-

${_('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.')}

-
-
-
-
-
${_('Hardware Virtual Machine (HVM)')}
- - - - - -

- - - -
-
- - -
-
-

${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}

- - - - - - - - - - - - - - - - - - - - - -
${_('Release State')}${_('Release Date')}
${_('Alpha Release Public Availability')}${schedule['alpha']}
${_('Beta Release Public Availability')}${schedule['beta']}
${_('Final Release Public Availability (GA)')}${schedule['final']}
- ${_('Read all the key milestones of the release schedule...')} -
-
- -
-
- -

${_('Verify your Image')}

-

${Markup(_('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 and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

-
-
- ${_('Atomic 64bit!')} -
-
- ${_('Atomic ISO!')} -
-
-
-
- -
- -
-

${_('Other Downloads')}

-

- ${_('Atomic Image:')} -

-

- -
-
-
- - - - - - - - diff --git a/getfedora.org/data/content/cloud/prerelease/docker.html b/getfedora.org/data/content/cloud/prerelease/docker.html index 2b342ec..fa0e9b7 100644 --- a/getfedora.org/data/content/cloud/prerelease/docker.html +++ b/getfedora.org/data/content/cloud/prerelease/docker.html @@ -31,12 +31,13 @@

${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

-

${_('There are two main versions of Fedora Cloud available:')} +

@@ -55,7 +56,7 @@
@@ -84,10 +85,10 @@

${_('You can easily load this Docker image into your running Docker daemon using command:')}

- 
docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['pre_cloud_composedate']}.x86_64.tar.xz
+ 
docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64.tar.xz

${_('Following command can be used to spawn a container running bash inside:')}

- 
docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['pre_cloud_composedate']}.x86_64 bash
- ${_('Download')} + 
docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64 bash
+ ${_('Download')}

${_('64-bit %sMB raw.xz Image') % global_variables.iso_size['pre_x86_64_docker']}

diff --git a/getfedora.org/data/content/cloud/prerelease/index.html b/getfedora.org/data/content/cloud/prerelease/index.html index f50b951..65c9f76 100644 --- a/getfedora.org/data/content/cloud/prerelease/index.html +++ b/getfedora.org/data/content/cloud/prerelease/index.html @@ -31,12 +31,13 @@

${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

-

${_('There are two main versions of Fedora Cloud available:')} +

@@ -55,7 +56,7 @@
@@ -86,13 +87,13 @@
${_('qcow2 Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_qcow2_x86_64_cloud']}

${_('Raw Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_raw_x86_64_cloud']}

@@ -110,40 +111,38 @@ - +
${_('VirtualBox Image')}

${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

- ${_('VirtualBox Image')} + ${_('VirtualBox Image')}

${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_VBvag_cloud']}

${_('libvirt/KVM Image')}

${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

- ${_('libvirt/KVM Image')} + ${_('libvirt/KVM Image')}

${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_libvag_cloud']}

- @@ -75,16 +72,9 @@

${_('Other Downloads')}

- ${_('Installation DVD:')} -

-

-

- ${_('Netinstall Images:')} + ${_('Netinstall Image:')}

diff --git a/getfedora.org/data/content/workstation/download/index.html b/getfedora.org/data/content/workstation/download/index.html index eb2582b..58d33e4 100644 --- a/getfedora.org/data/content/workstation/download/index.html +++ b/getfedora.org/data/content/workstation/download/index.html @@ -67,11 +67,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/getfedora.org/data/content/workstation/prerelease/index.html b/getfedora.org/data/content/workstation/prerelease/index.html index 3c0e87c..3523a3c 100644 --- a/getfedora.org/data/content/workstation/prerelease/index.html +++ b/getfedora.org/data/content/workstation/prerelease/index.html @@ -15,7 +15,7 @@

${Markup(_('Download Fedora %(rel)s %(state)s Workstation')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

-

${_('Download')}

+

${_('Download')}

${Markup(_('64-bit %sGB Live Image')) % global_variables.iso_size['pre_x86_64_workstation']}
@@ -73,12 +73,13 @@

${_('Other Downloads')}

-

${Markup(_('32-bit %sGB Live image')) % global_variables.iso_size['pre_i386_workstation']}

+

${_('Netinstall Images:')}

diff --git a/getfedora.org/po/getfedora.pot b/getfedora.org/po/getfedora.pot index 546539f..a199fbf 100644 --- a/getfedora.org/po/getfedora.pot +++ b/getfedora.org/po/getfedora.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-02-23 22:00+0100\n" +"POT-Creation-Date: 2016-03-13 23:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -938,7 +938,7 @@ msgstr "" #: data/content/cloud/download/index.html:439 #: data/content/cloud/prerelease/atomic.html:298 #: data/content/server/download/index.html:50 -#: data/content/server/prerelease/index.html:76 +#: data/content/server/prerelease/index.html:73 #: data/content/workstation/download/index.html:57 #: data/content/workstation/prerelease/index.html:75 msgid "Other Downloads" @@ -1041,7 +1041,6 @@ msgstr "" #: data/content/cloud/prerelease/docker.html:128 #: data/content/cloud/prerelease/index.html:476 #: data/content/server/download/server-download-splash.html:44 -#: data/content/server/prerelease/index.html:64 #: data/content/workstation/download/ws-download-splash.html:49 #: data/content/workstation/prerelease/index.html:64 #, python-format @@ -1054,6 +1053,7 @@ msgstr "" #: data/content/cloud/download/download-cloud-splash.html:52 #: data/content/server/download/server-download-splash.html:47 +#: data/content/server/prerelease/index.html:67 #: data/content/workstation/download/ws-download-splash.html:52 msgid "Validate!" msgstr "" @@ -1931,25 +1931,22 @@ msgid "" msgstr "" #: data/content/server/download/index.html:52 -#: data/content/server/prerelease/index.html:78 msgid "Installation DVD:" msgstr "" #: data/content/server/download/index.html:54 -#: data/content/server/prerelease/index.html:80 #, python-format msgid "32-bit %sGB image" msgstr "" #: data/content/server/download/index.html:58 -#: data/content/server/prerelease/index.html:84 #: data/content/workstation/download/index.html:60 #: data/content/workstation/prerelease/index.html:78 msgid "Netinstall Images:" msgstr "" #: data/content/server/download/index.html:60 -#: data/content/server/prerelease/index.html:86 +#: data/content/server/prerelease/index.html:77 #: data/content/workstation/download/index.html:62 #: data/content/workstation/prerelease/index.html:80 #, python-format @@ -1957,7 +1954,6 @@ msgid "64-bit %sMB image" msgstr "" #: data/content/server/download/index.html:61 -#: data/content/server/prerelease/index.html:87 #: data/content/workstation/download/index.html:63 #: data/content/workstation/prerelease/index.html:81 #, python-format @@ -2027,14 +2023,17 @@ msgid "" "freenode." msgstr "" -#: data/content/server/prerelease/index.html:67 -#: data/content/workstation/prerelease/index.html:67 -msgid "Validate 64-bit!" +#: data/content/server/prerelease/index.html:64 +#, python-format +msgid "" +"Once you have downloaded an image, verify it for security and integrity. " +"To verify your image, start by downloading the CHECKSUM file below into " +"the same directory as the image you downloaded and follow these instructions." msgstr "" -#: data/content/server/prerelease/index.html:70 -#: data/content/workstation/prerelease/index.html:70 -msgid "Validate 32-bit!" +#: data/content/server/prerelease/index.html:75 +msgid "Netinstall Image:" msgstr "" #: data/content/workstation/index.html:8 @@ -2178,6 +2177,14 @@ msgid "" "%(team_irc)s on freenode." msgstr "" +#: data/content/workstation/prerelease/index.html:67 +msgid "Validate 64-bit!" +msgstr "" + +#: data/content/workstation/prerelease/index.html:70 +msgid "Validate 32-bit!" +msgstr "" + #: data/templates/cloud-tab.html:9 #, python-format msgid "Fedora %s " diff --git a/getfedora.org/static/checksums/Fedora-CloudImages-x86_64-24_Alpha-CHECKSUM b/getfedora.org/static/checksums/Fedora-CloudImages-x86_64-24_Alpha-CHECKSUM new file mode 100644 index 0000000..77da213 --- /dev/null +++ b/getfedora.org/static/checksums/Fedora-CloudImages-x86_64-24_Alpha-CHECKSUM @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2) = f0ac6033c2217e21079fa59f5f9322997780c0842514cd31395cb9dfaeb63095 +SHA256 (Fedora-Cloud-Base-24_Alpha-7.x86_64.raw.xz) = da04ff14b285e0de88247e597ee816c74a5aa885438bce1874573311aa00fe7b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSlAAoJEHO96YOBtGUhbNUP/3Gi56LnxlFMf/aa4nZWe9By +rVmcC9ZkoUaEebmRh4cx2Oeky0o8HnZcOb+d7N67/2DwuGDhk5+weSFp+C48MfJ2 +gJMj4N7AlEql4WLBF57R+z+AcAmhOrrEkG1JwzAA12Q92RkhGLBEirstEWyUI3dQ +3EWNpP+WtGL056gqTesI9xVy1J6AxL3e8X2GiOYiMi/AunbwfPg9GSnuOJPDqqIr +Z3gSPoY1CuzBxdAH4gf9ZG7zrA/cF1dqgLjiY2bBJLWBn14/F1jmOp/hQoZ5imPu +K8FhW+0HnYpovp1n3ekVvMZygZg3IxxeFQVxQcuX/snaM81xSkKfQISkZ2t9lrL1 +eFvG1sTLiDPNY5cTbrFrdGIuT2maCA9pfOfKzP78ffGMOFVLrV0RbJKrjWAKJJfE +GYR5NsKYcCeKn85uQSXcvmnGGAv+gUJIVcP4y5EN7P7H7MBa7Yu50IdXrAGBJ+kk +GLTVtmhCdXVRfCwlcuZ8JAYrB/tEcmf3vCZAnJ6P4jriuGLgyIsgcugrsepF4Joe +6G9Imd3iIYZDJbo9jZAnc5HZhOLVYSXu2xvKf3Z5YqTMqSYjoSI4SbLK02Tw4+I0 +ezsUXhgz5+/iQq46Xt6LuA+CC7WE5kUtY8hLL43kYgZ8DJvUFMQI3hA+6WsJ/726 +BlNOz6dlX7JkJKrMiJzL +=E9vy +-----END PGP SIGNATURE----- diff --git a/getfedora.org/static/checksums/Fedora-Docker-x86_64-24_Alpha-CHECKSUM b/getfedora.org/static/checksums/Fedora-Docker-x86_64-24_Alpha-CHECKSUM new file mode 100644 index 0000000..ee3d66e --- /dev/null +++ b/getfedora.org/static/checksums/Fedora-Docker-x86_64-24_Alpha-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Docker-Base-24_Alpha-7.x86_64.tar.xz) = ad7a7971ccf75267dafeb78a50f54f5cc82fc09cd556a8e8c148319fc87010da +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSqAAoJEHO96YOBtGUhDWsQAJTw0ZwbDzrs/Y0laTwh60fI +H9wq26JaIH7oGoqzcRg60yGXpnr4kqCgv8r33wigjBkQEiJd95VKlSEDMF177Syc +OK2WUsDECTbV/c6wTvYFmiGBLw/zXxqRR4i2TVs/sA3VDDJgqdku8yjOPYikRtOg +EigB7vTTdaEg38Ef22x2ucS7pKg6QsFyIi3Xd75LaPrPekWVZP21ZqHc8BwwPeFd +7I9uiT97xnYKFGf7+wJbJFXL/pmthKoLjDKtSzZD2X1m0p3frvPdF7z7JCl2qR/R +wm3T5xr+U4iBxTj+8UcwTe7UN8F0gHOOFCH8uS00UCwvqecawbT6fPFNUTv8Umq7 +kbkV2NeO5nQeZVh84bbm8nGR3yXnqPrUxgYTDj1NSC69R1QDvVDrexTpPp2xcur4 +aYTXSwzwkWLHXhyueqLKtIkGEKTEjpDZ0kfXSKljn3cU8LxvHiAsRYLO/na868hR +6CtCa7igegKM7nzPbzAARFcD3CVxt2FxUguiwZqpSREXpR251xokQhTrY0EJNN3i +5xZur1OySbTRa3CI56EWWLhGUMfxNnZ3j5wEl1+awaveh8WXuMe1UOVQZqQ5bdEe +7bOlPNXZf4/VgJBTGT1i0zUJZviWNRatCgJ8UmL2khUDIt0kEtr+/ZjPr0Ov1b28 +NPOTTKhL5AmgfyIPuxpI +=a9lJ +-----END PGP SIGNATURE----- diff --git a/getfedora.org/static/checksums/Fedora-Server-24_Alpha-x86_64-CHECKSUM b/getfedora.org/static/checksums/Fedora-Server-24_Alpha-x86_64-CHECKSUM new file mode 100644 index 0000000..e8d0dfb --- /dev/null +++ b/getfedora.org/static/checksums/Fedora-Server-24_Alpha-x86_64-CHECKSUM @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Server-dvd-x86_64-24_Alpha-1.7.iso) = 69d58c38b0097b8cbad4e7b3c39a4697d67778b9d08d2318ce11366bf726913c +SHA256 (Fedora-Server-netinst-x86_64-24_Alpha-1.7.iso) = 4bbc8750f4f62b99153ad45380d8eb27b02f8df68165f4bf7b48ca05e66ba0ee +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSWAAoJEHO96YOBtGUh6Z8QALU/6Nu0haTs07heVXRY/m4z +e2nFcyKohzOq775kSzoCD2FeXl7aZQLle6eEZiWNLN4/sfovvSxMR1ws8FZGrDoi +XH0s34HNDUx/WeL9gVUnCgcyLvZKteDAL47QNmx4eoNLEMBSDWn005bbh9+T3cyx +nQDRITPDjOdAXHITRZDHDRMSfXmRD6kZ/ODRfaw1ml3tGzUC1OOo5RpPKOneD6MK +yy1/438OuyJxdN87zh/fOy8Otrlp0ytXoseRrAALqQtdC9stwJUq/kOQ/YQCKNeq +zb/ZzlGwhR8GCIL7ax8zgks4iN9EskNHKI/7WRs4ymTrk6YvIbLJy2RD95QF5ZYX +/c4RotxlP3wLk23Lh1Pbe1/GY2SOFv91XRb13yWj4dA8YT87812S7PnF6OFZY/T0 +l9AzghjuT3KNxfLihd0BGDYR8WXG0K7g5pvPpoU5bUYKIHliD/9q15K0ZwHvx+5a +FKiZIVzdAmWqWO6IRGbhfFhGY1j6IQ45Bk74HlTTe9905XlRc2kHD6KVlWLnBfmX +9UWkGN2BLNpRLa+X5n5mwmQRgAI6ws+QrcQ6I7tJcpiKruJsY39zX2aT6vD/dqkT +G6gbgC0x6fz0G9iqtueJu7G2tZqQIxplmBZFLJGb21Hjjss6f0GRknrO97SvOXRw +sMWg7oOCLKZcb/ZCcmwC +=rbM7 +-----END PGP SIGNATURE----- diff --git a/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-i386-CHECKSUM b/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-i386-CHECKSUM new file mode 100644 index 0000000..5155afc --- /dev/null +++ b/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-i386-CHECKSUM @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Workstation-netinst-i386-24_Alpha-1.7.iso) = 48b6d7bf4dc28ab5c451f49b4fd88ab80d134c173a0e9261f266e91b7570f857 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSgAAoJEHO96YOBtGUhoNwQAJx/TGyPVCjhZfCkjxz8aFAO +fHTOwJA3gZphf7bSiYTFQy/33xZobU0Med9hoYoHGcWGJ/0V48wzEdqVy4o8OMfe +dRaK1Wy/nApPSoouAa+oIApNutOWOUx5UssyN20IqJ2NhxQzrUB3zHZpVbkFpPK8 +JufWhR89myIhrb9TQ5W3OIfuImDvDCJNsGIcSLNwqZT2iQrOEc+Hr9CYWk/mZFBS +NRRW0lqgqGnEf/7gk13+Bsh/hutxY3PRI16f1Gyh70gsdlD4eHmVICp9QhkJIXcw +TTG8Q+s3ahsHIsSzUUGlUqGUR5ozanXbaz1vht55RGvoSMLXbdtRRox90fCYvGsG +q/+qDL6MbVyH6t+2QPAxZ+25efex0L05xktTzZpvu2+4bc7KSNg2uZII4zwXZR38 +IUJsG8X9ji5HC2/2VEI+D0PSTyGF56oF+IJJvZosRbHlJaZYg6vm19NmxFE8zl9I +0H+w4GQ3L5HhKJ6zyzh6h1fxLNXI48cNa5T1X6DbSKMiwTwewEUQeMIB+zZjwoOB +4rEnonvhlDyf9rJ74phAB4QmDM5rfhVyAfyIQMRApIxMbH/C8vX//dHdO2az/qpF ++mceSU1US/0eNK0T3/DDfRsGEWyWwoMsqcCBCu1m4JkgqhikmjEK4HIf4VejNrMA +8XUAlNHhEzfk1I/8SfHr +=f/pY +-----END PGP SIGNATURE----- diff --git a/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-x86_64-CHECKSUM b/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-x86_64-CHECKSUM new file mode 100644 index 0000000..57da7fe --- /dev/null +++ b/getfedora.org/static/checksums/Fedora-Workstation-24_Alpha-x86_64-CHECKSUM @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Workstation-netinst-x86_64-24_Alpha-1.7.iso) = 671588503a22830f4fd7b76b8758644361ee323f3251dea5e878b9c464011c16 +SHA256 (Fedora-Workstation-Live-x86_64-24_Alpha-7.iso) = c8e3c7af81dd18549b339eb38633d406214d03e9f9656a891ff46e6b73eccdbf +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBCAAGBQJW9GSiAAoJEHO96YOBtGUhYP0QAIMl4hMIMwWDEl+U6ZedufMX +tqZzXIaVyCxVxy0FLCRGhxlZFfmEyLb9dhqxFVUTcmy6rr698BDrqfPlCPZGV80Y +vWTj3l6XwpQClmQ2JiSQcU/mNdfa5t5k1nttMoFGFV+gQmNP+dUWnhd/mxWRHThS +jNs8TWe3nRiO/Hh2vZwisPEriLJAghn1nizQi0pB+AjymZaD9IwSV9T5A4maYLxJ +k2FGjqjGaTTC4M1Uz57AExz3xRcOnAGjLz9YDGB5NDmTNHnf1My4SOwqCbOHTdGl +Aw2CKsyQeXUgQ9Or348szkTtiyoJFMhLctr2QE2irXOitLP+ZGtfFNbw+Z35xRqI +6PChNUBz/S4/71EfmtISbuOYxq0ELL7wpnowp3XZKd2ROOFNsFfK1ivfc7ylqQkL +JZPd0jT7zqbuWtpBbJsgFUdt45aiOCJWfLImgkxpjYOioaXaG5nGCEOPy8u/g7xO +x8RugNehQLVSTrT8On8KrMrngkr9LBDxE4DruTH6IqYlhNE7BpvxWknCICs/ajoR +c/xnflh8kjqCIdYsIyyjkTqEeMa1Xh1vQJDKnT94hqBLyN9SFyPQaopitcEOFG+M +zUWUqooRujxweaAlw4ufIHwyW6JBdLgeySWSak9+1WwnAA+EtYrMxmWR2n2YNZho +fbsWdAMkd9filBhOy8KT +=KuLF +-----END PGP SIGNATURE----- diff --git a/getfedora.org/static/images/banners/f24alpha.png b/getfedora.org/static/images/banners/f24alpha.png new file mode 100644 index 0000000..701a11b Binary files /dev/null and b/getfedora.org/static/images/banners/f24alpha.png differ diff --git a/getfedora.org/static/images/workstation/workstation-features-user.jpg b/getfedora.org/static/images/workstation/workstation-features-user.jpg index d70a548..fd64a47 100644 Binary files a/getfedora.org/static/images/workstation/workstation-features-user.jpg and b/getfedora.org/static/images/workstation/workstation-features-user.jpg differ diff --git a/getfedora.org/static/images/workstation/workstation-splash.jpg b/getfedora.org/static/images/workstation/workstation-splash.jpg index c0d1975..984ff3b 100644 Binary files a/getfedora.org/static/images/workstation/workstation-splash.jpg and b/getfedora.org/static/images/workstation/workstation-splash.jpg differ diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html index 2366abb..5e8e47a 100644 --- a/labs.fedoraproject.org/data/content/design-suite/download/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html @@ -45,18 +45,18 @@

archive.fedoraproject.org

-
+
---> +
@@ -110,12 +136,13 @@

Robotics Suite banner
${_('Dive into Robotics.')}

- 64-bit image + 64-bit image
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Robotics']}
- 32-bit image +
@@ -123,7 +150,7 @@
-
+
Scientific Screenshot @@ -132,19 +159,20 @@

Scientific banner
${_('Open source scientific computing.')}

- 64-bit image + 64-bit image
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Sci-kde']}
- 32-bit image +
-
+
@@ -177,10 +206,11 @@

${Markup(_('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 and follow <a href="../../%s/verify">these instructions</a>.') % (lang))}

- ${_('Validate 64bit!')} + ${_('Validate 64bit!')}
- ${_('Validate 32bit!')} +
diff --git a/labs.fedoraproject.org/data/content/robotics/download/index.html b/labs.fedoraproject.org/data/content/robotics/download/index.html index d614558..8f3bcf4 100644 --- a/labs.fedoraproject.org/data/content/robotics/download/index.html +++ b/labs.fedoraproject.org/data/content/robotics/download/index.html @@ -48,11 +48,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/labs.fedoraproject.org/data/content/scientific/download/index.html b/labs.fedoraproject.org/data/content/scientific/download/index.html index 8c1393b..9024742 100644 --- a/labs.fedoraproject.org/data/content/scientific/download/index.html +++ b/labs.fedoraproject.org/data/content/scientific/download/index.html @@ -48,11 +48,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/labs.fedoraproject.org/data/content/security/download/index.html b/labs.fedoraproject.org/data/content/security/download/index.html index 49cc219..a11f8eb 100644 --- a/labs.fedoraproject.org/data/content/security/download/index.html +++ b/labs.fedoraproject.org/data/content/security/download/index.html @@ -44,18 +44,18 @@

archive.fedoraproject.org

-
+
-
@@ -209,6 +209,6 @@
---> + diff --git a/spins.fedoraproject.org/data/content/kde/download/index.html b/spins.fedoraproject.org/data/content/kde/download/index.html index b212876..5136fd9 100644 --- a/spins.fedoraproject.org/data/content/kde/download/index.html +++ b/spins.fedoraproject.org/data/content/kde/download/index.html @@ -52,11 +52,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/spins.fedoraproject.org/data/content/lxde/download/index.html b/spins.fedoraproject.org/data/content/lxde/download/index.html index 88735a1..2ac2a99 100644 --- a/spins.fedoraproject.org/data/content/lxde/download/index.html +++ b/spins.fedoraproject.org/data/content/lxde/download/index.html @@ -52,11 +52,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html index 5e568a4..9408c40 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html @@ -52,11 +52,11 @@

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! + Fedora ${global_variables.release['next_id']} Alpha is here!

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! + Fedora ${global_variables.release['next_id']} Beta is here! diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html index 16b8880..325aeb6 100644 --- a/spins.fedoraproject.org/data/content/prerelease.html +++ b/spins.fedoraproject.org/data/content/prerelease.html @@ -46,12 +46,13 @@

KDE banner
${_('A complete, modern desktop built using the KDE Plasma Desktop.')}

- 64-bit image + 64-bit image
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_KDE']}
- 32-bit image +
@@ -68,12 +69,13 @@

Xfce banner
${_('A complete, well-integrated Xfce Desktop.')}

- 64-bit image -
${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}
+ 64-bit image +
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}
- 32-bit image +
@@ -90,12 +92,13 @@

LXDE banner
${_('A light, fast, less-resource hungry desktop environment.')}

- 64-bit image + 64-bit image
${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_LXDE']}
- 32-bit image +
@@ -112,12 +115,13 @@

MATE-Compiz banner
${_('A classic Fedora Desktop. With wobbly Windows.')}

- 64-bit image + 64-bit image
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Mate']}
- 32-bit image +
@@ -125,7 +129,7 @@
-
+
Cinnamon Screenshot @@ -134,19 +138,20 @@

Cinnamon banner
${_('Traditional layout, advanced features, easy to use.')}

- 64-bit image + 64-bit image
${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Cinnamon']}
- 32-bit image +
-
+
@@ -179,10 +185,11 @@

${Markup(_('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 and follow <a href="../../%s/verify">these instructions</a>.') % (lang))}

- ${_('Validate 64bit!')} + ${_('Validate 64bit!')}
- ${_('Validate 32bit!')} +
diff --git a/spins.fedoraproject.org/data/content/soas/download/index.html b/spins.fedoraproject.org/data/content/soas/download/index.html index ac1a3fe..520f8ea 100644 --- a/spins.fedoraproject.org/data/content/soas/download/index.html +++ b/spins.fedoraproject.org/data/content/soas/download/index.html @@ -48,18 +48,18 @@

archive.fedoraproject.org

-
+