From 6a69ad2f6375f497e9a314f4c6a8e7708c510373 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: May 16 2020 02:32:20 +0000 Subject: Merge branch 'master' of pagure.io:fedora-websites --- diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py index 9c041e5..c5b63b4 100755 --- a/alt.fedoraproject.org/build/fedimg_vars.py +++ b/alt.fedoraproject.org/build/fedimg_vars.py @@ -90,14 +90,6 @@ def collect(release): region = upload['destination'] results[name][region] = ami - # 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' - shelf['timestamp'] = datetime.utcnow() shelf['collected'] = results shelf.close() diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 7700758..6112f9f 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -96,7 +96,7 @@

${_('Everything')}

-

${Markup(_('%sMB dvd iso')) % global_variables.iso_size['aarch64_ev']}

+

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_ev']}

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

@@ -476,7 +476,7 @@

${_('Everything')}

-

${Markup(_('%sMB dvd iso')) % global_variables.iso_size['ppc64le_ev']}

+

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_ev']}

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

@@ -790,7 +790,7 @@

${_('Everything')}

-

${Markup(_('%sMB dvd iso')) % global_variables.iso_size['s390x_ev']}

+

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['s390x_ev']}

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

diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css index a78b206..1faef18 100644 --- a/alt.fedoraproject.org/static/css/app.css +++ b/alt.fedoraproject.org/static/css/app.css @@ -410,6 +410,7 @@ a.btn-lg { /* ARM */ .white { + display: flex; background-color: #fff; color: #000; margin: 10px 0px 5px; @@ -429,8 +430,6 @@ a.btn-lg { margin-top: 8px; font-weight: 400; text-align: right; - padding-left: 0px; - padding-right: 0px; } .white p.download { @@ -458,6 +457,10 @@ a.btn-lg { left: 0; } +.white div:nth-child(3) { + padding-left: 0; +} + .sup { font-size: 60%; vertical-align: super; @@ -916,6 +919,11 @@ text-align:center; background-image: none; } +.using .white p { + padding-left: 0px; + padding-right: 0px; +} + /*Pre-release page */ .prerelease-header { width: 500px; diff --git a/build.d/globalvar.py b/build.d/globalvar.py index f4f38c0..6d44723 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -336,7 +336,8 @@ EC2_regions = [ region(u'EU West (Ireland)', u'Ireland', u'eu-west-1'), region(u'EU Central (Frankfurt)', u'Frankfurt', u'eu-central-1'), region(u'EU West (London)', u'London', u'eu-west-2'), - region(u'EU West (Paris)', u'Paris', u'eu-west-3'), +# fedimg fails to upload to eu-west-3 for now +# region(u'EU West (Paris)', u'Paris', u'eu-west-3'), region(u'Asia Pacific SE (Singapore)', u'Singapore', u'ap-southeast-1'), region(u'Asia Pacific NE (Tokyo)', u'Tokyo', u'ap-northeast-1'), region(u'Asia Pacific SE (Sydney)', u'Sydney', u'ap-southeast-2'), diff --git a/labs.fedoraproject.org/data/content/index.html b/labs.fedoraproject.org/data/content/index.html index dfb2c49..b49ef0e 100644 --- a/labs.fedoraproject.org/data/content/index.html +++ b/labs.fedoraproject.org/data/content/index.html @@ -86,25 +86,22 @@
--> - + + - -
Python Classroom banner
Python Classroom Screenshot @@ -120,7 +117,6 @@

${_('Thorough, safe and secure.')}

 ${_('A safe test environment to work on security auditing, forensics, system rescue and teaching security testing methodologies.')}
-
Robotics banner
Robotics Screenshot @@ -132,95 +128,6 @@
- -
-
-
-
Astronomy banner
- Astronomy Screenshot -

${_('Explore the Outer Space.')}

 - ${_('Powerful completely open-source and free tool for amateurs and professionals.')}
-
-
-
-
-
Comp Neuro banner
- Comp Neuro Screenshot -

${_('Explore the Brain.')}

 - ${_('A plethora of Free/Open source computational modelling tools for Neuroscience.')}
-
-
-
-
-
Design suite banner
- Design-suite Screenshot -

${_('Open Creativity.')}

 - ${_('Visual design, multimedia production, and publishing suite of free and open source creative tools.')}
-
-
- - - - -
-
-
Python Classroom banner
- Python Classroom Screenshot -

${_('Teach Python with ease')}

 - ${_('A classroom lab for teaching the Python programming language to students')}
-
-
- - - - -
-
-
Security Lab banner
- Security Lab Screenshot -

${_('Thorough, safe and secure.')}

 - ${_('A safe test environment to work on security auditing, forensics, system rescue and teaching security testing methodologies.')}
-
-
- -
- diff --git a/labs.fedoraproject.org/static/css/bootstrap.css b/labs.fedoraproject.org/static/css/bootstrap.css index 6f1717d..5ef2ab1 100644 --- a/labs.fedoraproject.org/static/css/bootstrap.css +++ b/labs.fedoraproject.org/static/css/bootstrap.css @@ -4403,86 +4403,6 @@ button.close { .visible-xs, tr.visible-xs, th.visible-xs, td.visible-xs { display: none!important; } -@media (max-width:767px) { - .visible-xs { - display: block!important; -} -table.visible-xs { - display: table; -} -tr.visible-xs { - display: table-row!important; -} -th.visible-xs, td.visible-xs { - display: table-cell!important; -} -}.visible-sm, tr.visible-sm, th.visible-sm, td.visible-sm { - display: none!important; -} -@media (min-width:768px) and (max-width:991px) { - .visible-sm { - display: block!important; -} -table.visible-sm { - display: table; -} -tr.visible-sm { - display: table-row!important; -} -th.visible-sm, td.visible-sm { - display: table-cell!important; -} -}.visible-md, tr.visible-md, th.visible-md, td.visible-md { - display: none!important; -} -@media (min-width:992px) and (max-width:1199px) { - .visible-md { - display: block!important; -} -table.visible-md { - display: table; -} -tr.visible-md { - display: table-row!important; -} -th.visible-md, td.visible-md { - display: table-cell!important; -} -}.visible-lg, tr.visible-lg, th.visible-lg, td.visible-lg { - display: none!important; -} -@media (min-width:1200px) { - .visible-lg { - display: block!important; -} -table.visible-lg { - display: table; -} -tr.visible-lg { - display: table-row!important; -} -th.visible-lg, td.visible-lg { - display: table-cell!important; -} -}@media (max-width:767px) { - .hidden-xs, tr.hidden-xs, th.hidden-xs, td.hidden-xs { - display: none!important; -} -}@media (min-width:768px) and (max-width:991px) { - .hidden-sm, tr.hidden-sm, th.hidden-sm, td.hidden-sm { - display: none!important; -} -}@media (min-width:992px) and (max-width:1199px) { - .hidden-md, tr.hidden-md, th.hidden-md, td.hidden-md { - display: none!important; -} -}@media (min-width:1200px) { - .hidden-lg, tr.hidden-lg, th.hidden-lg, td.hidden-lg { - display: none!important; -} -}.visible-print, tr.visible-print, th.visible-print, td.visible-print { - display: none!important; -} @media print { .visible-print { display: block!important; @@ -4500,4 +4420,4 @@ th.visible-print, td.visible-print { .hidden-print, tr.hidden-print, th.hidden-print, td.hidden-print { display: none!important; } -} \ No newline at end of file +} diff --git a/labs.fedoraproject.org/static/images/comp-neuro-banner.png b/labs.fedoraproject.org/static/images/comp-neuro-banner.png index b181f2c..d5049f5 100644 Binary files a/labs.fedoraproject.org/static/images/comp-neuro-banner.png and b/labs.fedoraproject.org/static/images/comp-neuro-banner.png differ diff --git a/spins.fedoraproject.org/static/images/kde/amarok.png b/spins.fedoraproject.org/static/images/kde/amarok.png index 996fc7a..4600ca7 100644 Binary files a/spins.fedoraproject.org/static/images/kde/amarok.png and b/spins.fedoraproject.org/static/images/kde/amarok.png differ diff --git a/spins.fedoraproject.org/static/images/kde/dragonplayer.png b/spins.fedoraproject.org/static/images/kde/dragonplayer.png index c622334..3831310 100644 Binary files a/spins.fedoraproject.org/static/images/kde/dragonplayer.png and b/spins.fedoraproject.org/static/images/kde/dragonplayer.png differ diff --git a/spins.fedoraproject.org/static/images/kde/k3b.png b/spins.fedoraproject.org/static/images/kde/k3b.png index 37e6ccd..bfde4eb 100644 Binary files a/spins.fedoraproject.org/static/images/kde/k3b.png and b/spins.fedoraproject.org/static/images/kde/k3b.png differ diff --git a/spins.fedoraproject.org/static/images/kde/kaffeine.png b/spins.fedoraproject.org/static/images/kde/kaffeine.png index bcd652e..d17a9c0 100644 Binary files a/spins.fedoraproject.org/static/images/kde/kaffeine.png and b/spins.fedoraproject.org/static/images/kde/kaffeine.png differ diff --git a/spins.fedoraproject.org/static/images/kde/kalzium.png b/spins.fedoraproject.org/static/images/kde/kalzium.png index 5d7a608..5ee36f2 100644 Binary files a/spins.fedoraproject.org/static/images/kde/kalzium.png and b/spins.fedoraproject.org/static/images/kde/kalzium.png differ diff --git a/spins.fedoraproject.org/static/images/kde/kiten.png b/spins.fedoraproject.org/static/images/kde/kiten.png index b1bb38a..f007642 100644 Binary files a/spins.fedoraproject.org/static/images/kde/kiten.png and b/spins.fedoraproject.org/static/images/kde/kiten.png differ diff --git a/spins.fedoraproject.org/static/images/kde/konqueror.png b/spins.fedoraproject.org/static/images/kde/konqueror.png index 1428603..92443a4 100644 Binary files a/spins.fedoraproject.org/static/images/kde/konqueror.png and b/spins.fedoraproject.org/static/images/kde/konqueror.png differ diff --git a/spins.fedoraproject.org/static/images/kde/konsole.png b/spins.fedoraproject.org/static/images/kde/konsole.png index f758061..a8fbc11 100644 Binary files a/spins.fedoraproject.org/static/images/kde/konsole.png and b/spins.fedoraproject.org/static/images/kde/konsole.png differ diff --git a/spins.fedoraproject.org/static/images/kde/kontact.png b/spins.fedoraproject.org/static/images/kde/kontact.png index 208b7e6..9e223db 100644 Binary files a/spins.fedoraproject.org/static/images/kde/kontact.png and b/spins.fedoraproject.org/static/images/kde/kontact.png differ diff --git a/spins.fedoraproject.org/static/images/kde/kopete.png b/spins.fedoraproject.org/static/images/kde/kopete.png index a4983da..786dd14 100644 Binary files a/spins.fedoraproject.org/static/images/kde/kopete.png and b/spins.fedoraproject.org/static/images/kde/kopete.png differ diff --git a/spins.fedoraproject.org/static/images/kde/ktorrent.png b/spins.fedoraproject.org/static/images/kde/ktorrent.png index 649ef90..30e96d3 100644 Binary files a/spins.fedoraproject.org/static/images/kde/ktorrent.png and b/spins.fedoraproject.org/static/images/kde/ktorrent.png differ diff --git a/spins.fedoraproject.org/static/images/kde/marble.png b/spins.fedoraproject.org/static/images/kde/marble.png index 808dbb5..ebd2113 100644 Binary files a/spins.fedoraproject.org/static/images/kde/marble.png and b/spins.fedoraproject.org/static/images/kde/marble.png differ diff --git a/spins.fedoraproject.org/static/images/kde/network.png b/spins.fedoraproject.org/static/images/kde/network.png index 14e2a30..b7da253 100644 Binary files a/spins.fedoraproject.org/static/images/kde/network.png and b/spins.fedoraproject.org/static/images/kde/network.png differ diff --git a/spins.fedoraproject.org/static/images/kde/parley.png b/spins.fedoraproject.org/static/images/kde/parley.png index 40c765a..71a0457 100644 Binary files a/spins.fedoraproject.org/static/images/kde/parley.png and b/spins.fedoraproject.org/static/images/kde/parley.png differ diff --git a/spins.fedoraproject.org/static/images/kde/settings.png b/spins.fedoraproject.org/static/images/kde/settings.png index a8edc1e..2598011 100644 Binary files a/spins.fedoraproject.org/static/images/kde/settings.png and b/spins.fedoraproject.org/static/images/kde/settings.png differ diff --git a/spins.fedoraproject.org/static/images/kde/telepathy.png b/spins.fedoraproject.org/static/images/kde/telepathy.png index 0065cca..55dc53e 100644 Binary files a/spins.fedoraproject.org/static/images/kde/telepathy.png and b/spins.fedoraproject.org/static/images/kde/telepathy.png differ diff --git a/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg b/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg index ce40dc9..20f8b00 100644 Binary files a/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg and b/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg differ diff --git a/tools/fedimg_vars_lib.py b/tools/fedimg_vars_lib.py index 0a56172..dc22a98 100755 --- a/tools/fedimg_vars_lib.py +++ b/tools/fedimg_vars_lib.py @@ -89,15 +89,15 @@ def check_permissions(fd=None, filename=None): def get_messages(target): """ Filter the messages on target. """ - check_permissions(filename=cache_file) - try: + if os.path.isfile(cache_file): + check_permissions(filename=cache_file) with open(cache_file, 'r') as cf: check_permissions(fd=cf.fileno()) cache = json.load(cf) cachetime = datetime.strptime(cache['timestamp'], dateformat) if cachetime > (datetime.utcnow() - timedelta(days=1)): return filter_messages(cache['messages'], target) - except FileNotFoundError: + else: log.info('No cache, loading from scratch') messages = list(retrieve_messages()) @@ -139,10 +139,11 @@ def sanity_check(globalvar, collected_fedimg_vars): def mocked_fedimg(templates): + # eu-west-3 is left out because fedimg fails to upload there for now regions = ['us-east-1', 'ap-northeast-1', 'sa-east-1', 'ap-southeast-1', 'ap-southeast-2', 'us-west-2', 'us-west-1', 'eu-central-1', 'eu-west-1', 'ap-northeast-2', 'ap-south-1', 'ca-central-1', - 'eu-west-2', 'us-east-2', 'eu-west-3'] + 'eu-west-2', 'us-east-2'] mockdata = {} for region in regions: mockdata[region] = 'ami-mocked'