restore HPC content, remove Carpentries content

Makefile

@@ -9,11 +9,11 @@ commands :
 	@grep -E '^##' Makefile | sed -e 's/## //g'
 
 ## serve      : run a local server.
-serve : 
+serve :
 	${JEKYLL} serve --config _config.yml,_config_dev.yml --future
 
 ## site       : build files but do not run a server.
-site : 
+site :
 	${JEKYLL} build
 
 ## install    : install missing Ruby gems using bundle.

_config.yml

@@ -3,7 +3,7 @@
 # Github Pages does all the hard work of building the Jekyll site. Yay!
 # Custom CNAME settings in this repository make carpentries.org redirect
 # to the Github Pages page.
-# 
+---
 # ASCII-Font › http://patorjk.com/software/taag/#p=display&f=Slant&t=Phlow
 #
 #      _____ _ __          _____      __  __  _
@@ -33,31 +33,37 @@ author: admin
 url: 'https://www.hpc-carpentry.org'
 baseurl: ''
 filesurl: 'https://www.hpc-carpentry.org/files'
-contact: "maintainers-hpc@lists.carpentries.org"
-carpentries_url: 'https://carpentries.org'
 
-# Regional contacts
-contact_ca: ""      # Canada
-contact_au: ""      # Australia
-contact_nz: ""      # New Zealand
-contact_uk: ""      # United Kingdom
-contact_afr: ""    # Africa
-contact_nordic: "" # Nordic Countries
+github_url     : "https://github.com/hpc-carpentry"
+github_io_url  : "http://hpc-carpentry.github.io"
+incubator_url  : "https://github.com/carpentries-incubator"
+incubator_io   : "https://carpentries-incubator.github.io"
+contact        : "maintainers-hpc@lists.carpentries.org"
+contact_dach   : ""
+contact_nz     : "admin-nz@carpentries.org"  # Megan Guidry, New Zealand
+contact_uk     : ""
+contact_us     : ""
+carpentries_url: 'https://carpentries.org'
 
+amy_url        : "https://amy.carpentries.org/workshops"
+dc_url         : "http://datacarpentry.org"
+lc_url         : "https://librarycarpentry.org"
+store_url      : "http://www.cafepress.com/swcarpentry"
+pad_url        : "http://pad.software-carpentry.org"
 
 # Links to AMY and forms
 
-wrf_landing: "https://amy.carpentries.org/forms/workshop/" # Landing page for the three forms
-wrf_request: "https://amy.carpentries.org/forms/request_workshop/" # Request a workshop
-wrf_inquiry: "https://amy.carpentries.org/forms/inquiry/" # inquire about workshop
-wrf_selforg: "https://amy.carpentries.org/forms/self-organised/" # Report self organized workshop
+wrf_landing: "https://amy.carpentries.org/forms/workshop/"  # Landing page for the three forms
+wrf_request: "https://amy.carpentries.org/forms/request_workshop/"  # Request a workshop
+wrf_inquiry: "https://amy.carpentries.org/forms/inquiry/"  # inquire about workshop
+wrf_selforg: "https://amy.carpentries.org/forms/self-organised/"  # Report self organized workshop
 
 # Website repository
 website_github_repo: "https://github.com/hpc-carpentry/hpc-carpentry.github.io"
 gh_default_branch: "main"
 
 # Website configuration links
-mailing_lists   : "http://carpentries.topicbox.com/groups"
+mailing_lists: "http://carpentries.topicbox.com/groups"
 
 
 # This is for the editing function in _/includes/improve_content
@@ -92,47 +98,50 @@ paginate_path: "blog/page:num"
 markdown: kramdown
 kramdown:
   parse_block_html: true
-permalink: /blog/:year/:month/:title/
-highlight: rouge
-plugins_dir: [jekyll-paginate, jekyll-redirect-from]
+permalink: /blog/:year/:month/:title.html
+highlight: pygments
 excerpt_separator: "<!--more-->"
-include: ['.htaccess']
-# Exclude these files from your production _site
+include:
+  - .htaccess
 exclude:
-    - .sass-cache
-    - Gemfile
-    - Gemfile.lock
-    - LICENSE
-    - README.md
-    - INSTALL.md
-    - vendor/
+  - .sass-cache
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE
+  - README.md
+  - INSTALL.md
+  - Makefile
+  - vendor/
+
+# Build settings
+# - https://github.com/jekyll/jekyll-redirect-from
 
 plugins:
+  - jekyll-paginate
+  - jekyll-redirect-from
   - jekyll-get-json
 
 ## external data sources
 jekyll_get_json:
-  - data: all_badged_people
-    json: 'https://feeds.carpentries.org/all_badged_people.json'
-  - data: all_past_workshops
-    json: 'https://feeds.carpentries.org/all_past_workshops.json'
-  - data: all_upcoming_workshops
-    json: 'https://feeds.carpentries.org/all_upcoming_workshops.json'
-  - data: badges_stats
-    json: 'https://feeds.carpentries.org/badges_stats.json'
 #  - data: community_lessons
 #    json: 'https://feeds.carpentries.org/community_lessons.json'
   - data: help_wanted_issues
     json: 'https://feeds.carpentries.org/help_wanted_issues.json'
-  - data: newsletter
-    json: 'https://feeds.carpentries.org/newsletter.json'
+#  - data: all_badged_people
+#    json: 'https://feeds.carpentries.org/all_badged_people.json'
+#  - data: badges_stats
+#    json: 'https://feeds.carpentries.org/badges_stats.json'
+#  - data: all_past_workshops
+#    json: 'https://feeds.carpentries.org/all_past_workshops.json'
+#  - data: all_upcoming_workshops
+#    json: 'https://feeds.carpentries.org/all_upcoming_workshops.json'
 
 
 # The language setting is used in /includes/header.html for html-settings
 language: "en"
 
 # Use an incremental build (if supported, see https://jekyllrb.com/docs/configuration/incremental-regeneration/)
-incremental: true
+incremental: false
 
 # Used › default.html front-matter and compress.html
 # Options › http://jch.penibelst.de
@@ -143,8 +152,6 @@ compress_html:
   profile: false
   ignore:
     envs: [development]
-
-
 #
 #       ____       ____            ____
 #      / __ \___  / __/___ ___  __/ / /_
@@ -157,11 +164,11 @@ compress_html:
 defaults:
   -
     scope:
-      path: "" 				# an empty string here means all files in the project
+      path: ""  # an empty string here means all files in the project
       type: "pages"
     values:
-      show_meta: false 	# Hide metadata for all pages
-      # sidebar:    		# Possible values › left, right › by default there will be no sidebar
+      show_meta: false  # Hide metadata for all pages
+      # sidebar:        # Possible values › left, right › by default there will be no sidebar
       comments: false
       author: admin     # Default author for pages
       edit_on_github: true
@@ -176,8 +183,6 @@ defaults:
       author: admin     # Default author for posts
       edit_on_github: true
 
-
-
 #       _   __            _             __  _
 #      / | / /___ __   __(_)___ _____ _/ /_(_)___  ____
 #     /  |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
@@ -188,8 +193,6 @@ defaults:
 #  Open _data/navigation.yml to adjust the left and right topbar navigation
 #
 
-
-
 #     _____ __________
 #    / ___// ____/ __ \
 #    \__ \/ __/ / / / /
@@ -201,8 +204,6 @@ defaults:
 # bing_webmastertools_id:    ""
 # alexa_verify_id:           ""
 
-
-
 #       ______            _
 #      / ____/___ __   __(_)________  ____  _____
 #     / /_  / __ `/ | / / / ___/ __ \/ __ \/ ___/
@@ -220,26 +221,9 @@ apple-touch-icon-114x114-precomposed:   "apple-touch-icon-114x114.png"
 apple-touch-icon-76x76-precomposed:     "apple-touch-icon-76x76.png"
 apple-touch-icon-72x72-precomposed:     "apple-touch-icon-72x72.png"
 apple-touch-icon-precomposed:           "apple-touch-icon.png"
-msapplication_tileimage:                "mstile-150x150.png"               # Size 144x144
+msapplication_tileimage:                "mstile-150x150.png"  # Size 144x144
 msapplication_tilecolor:                "#ffffff"
 
-
-#       ______                __                __
-#      / ____/___ _________  / /_  ____  ____  / /__
-#     / /_  / __ `/ ___/ _ \/ __ \/ __ \/ __ \/ //_/
-#    / __/ / /_/ / /__/  __/ /_/ / /_/ / /_/ / ,<
-#   /_/    \__,_/\___/\___/_.___/\____/\____/_/|_|      Facebook-Optimization › http://j.mp/fb_optimize
-
-# https://developers.facebook.com/docs/sharing/best-practices#images
-## image should be 1200x630 (1.91:1 ratio)
-# og_image:                         "HPC-Carpentry-opengraph.png"
-# og_locale:                        "en_EN"
-# og_type:                          "website"
-# og_title:                         "HPC Carpentry"
-# og_description:                   ""
-# og_url:                           "http://www.hpc-carpentry.org"
-
-
 #      _____            _       __   __  ___         ___
 #     / ___/____  _____(_)___ _/ /  /  |/  /__  ____/ (_)___ _
 #     \__ \/ __ \/ ___/ / __ `/ /  / /|_/ / _ \/ __  / / __ `/
@@ -249,7 +233,6 @@ msapplication_tilecolor:                "#ffffff"
 #  Open _data/socialmedia.yml to adjust the left and right topbar navigation
 #
 
-
 #        ____  _
 #       / __ \(_)________ ___  _______
 #      / / / / / ___/ __ `/ / / / ___/
@@ -261,6 +244,16 @@ msapplication_tilecolor:                "#ffffff"
 
 disqus_shortname: hpc-carpentry
 
+#       ______                __                __
+#      / ____/___ _________  / /_  ____  ____  / /__
+#     / /_  / __ `/ ___/ _ \/ __ \/ __ \/ __ \/ //_/
+#    / __/ / /_/ / /__/  __/ /_/ / /_/ / /_/ / ,<
+#   /_/    \__,_/\___/\___/_.___/\____/\____/_/|_|
+#
+# Facebook-Optimize <http://j.mp/fb_optimize> is deprecated.
+# If you wish to connect a page, automatic posting may have been sorted out in
+# the upstream repository: check
+# <https://github.com/carpentries/carpentries.org/blob/main/_config.yml>
 
 #      _____
 #     / ___/____ ___________
@@ -270,9 +263,8 @@ disqus_shortname: hpc-carpentry
 #
 
 sass:
-    sass_dir: _sass
-    style: :compressed
-
+  sass_dir: _sass
+  style: :compressed
 
 #       ___                __      __  _
 #      /   |  ____  ____ _/ /_  __/ /_(_)_________
@@ -284,20 +276,3 @@ sass:
 # used in _includes/footer_scripts
 
 google_analytics_tracking_id: UA-180687781-1
-
-
-
-#   _                 _     _
-#  | |_ __ ___      _| | __| |_ ___
-#  | __/ _` \ \ /\ / / |/ /| __/ _ \
-#  | || (_| |\ V  V /|   < | || (_) |
-#   \__\__,_| \_/\_/ |_|\_(_)__\___/     More › https://www.tawk.to/knowledgebase/
-#
-#  tawk.to is a free live chat app that lets you monitor and chat
-#  with visitors on your website or from a free customizable page
-#
-#  To load the script add tawkto: true in front matter of each page
-#
-# used in _includes/footer_scripts
-
-# tawkto_embed_uri:

_config_dev.yml

@@ -1,16 +1,15 @@
-#
 # This config-file is only needed for development. Instead of changing the url
 # every time you work locally on the project, you start both config-files, overwriting
 # the first one with the development variables needed.
 #
 # Start development with › $ jekyll serve --config _config.yml,_config_dev.yml
+---
+url     : "http://localhost:4000"
+baseurl : ""
+filesurl: "http://localhost:4000/files"
+urlimg:  "http://localhost:4000/images"
 
-url: 		'http://localhost:4000'
-baseurl: 	''
-filesurl:       'http://localhost:4000/files'
-urlimg: 	'http://localhost:4000/images'
-
-# See › https://github.com/jekyll/jekyll-gist#disabling-noscript-support
+# See https://github.com/jekyll/jekyll-gist#disabling-noscript-support
 gist:
   noscript: false
 

_config_netlify.yml

@@ -1,7 +1,8 @@
-url: 		'https://stupefied-einstein-5bde90.netlify.com'
-baseurl: 	''
-filesurl:       'https://stupefied-einstein-5bde90.netlify.com/files'
-urlimg: 	'https://stupefied-einstein-5bde90.netlify.com/images'
+---
+url: "https://stupefied-einstein-5bde90.netlify.com"
+baseurl: ""
+filesurl: "https://stupefied-einstein-5bde90.netlify.com/files"
+urlimg: "https://stupefied-einstein-5bde90.netlify.com/images"
 
 # See › https://github.com/jekyll/jekyll-gist#disabling-noscript-support
 gist:

_data/authors.yml

@@ -5,7 +5,8 @@
 # 3. Change default post/page authors in config.yml
 #
 # Resource › http://blog.sorryapp.com/blogging-with-jekyll/2014/02/06/adding-authors-to-your-jekyll-site.html
-admin: # replace this with your info
+---
+admin:  # replace this with your info
   name: "The HPC Carpentry Team"
   siterole: "webmaster"
   uri: https://www.hpc-carpentry.org/

_data/communities.yml

@@ -1,4 +1,5 @@
 # These data feed the community cards on the /volunteer/ page
+---
 - name: Instructors
   image: /images/areej.jpg
   description: Instructors teach workshops and are trained in evidence-based pedagogical practices.