Merge branch 'cguindon/main/poc-nginx' into 'main'

create a poc for hosting eclipse.org with hugo

See merge request eclipsefdn/it/websites/eclipse.org!18

Dockerfile

+ARG NGINX_IMAGE_TAG=stable-alpine-for-hugo
+
+FROM eclipsefdn/nginx:${NGINX_IMAGE_TAG}
+
+ADD config/nginx /etc/nginx/conf.d
+COPY public /usr/share/nginx/html/

config.toml

@@ -3,7 +3,7 @@ DefaultContentLanguage = "en"
 title = "Eclipse Foundation"
 theme = "eclipsefdn-hugo-solstice-theme"
 metaDataFormat = "yaml"
-disableKinds = []
+disableKinds = ["taxonomy", "term"]
 themesDir = "node_modules/"
 enableRobotsTXT = true
 pluralizeListTitles = false
@@ -24,9 +24,9 @@ pluralizeListTitles = false
   call_for_action_text = "Download"
   call_for_action_url = "/download/"
   call_for_action_icon = "fa-download"
-  share_img = "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-400x400.png"
-#  logo = ""
-#  favicon = ""
+  share_img = "/images/logos/eclipse-foundation-400x400.png"
+  logo = "/images/logos/eclipse-foundation-white-orange.svg"
+  favicon = "/images/favicon.ico"
 
 #  logo_width = ""
 #  header_left_classes = ""

config/nginx/default.conf

+server {
+  listen 8080;
+  server_name localhost;
+  port_in_redirect off;
+
+  # access_log  /var/log/nginx/host.access.log  main;
+
+  # client_max_body_size 16m;
+  # client_body_buffer_size 128k;
+
+  # proxy buffering configuration
+  # https://stackoverflow.com/a/27551259/8538422
+  # proxy_buffer_size 128k;
+  # proxy_buffers 4 256k;
+  # proxy_busy_buffers_size 256k;
+
+  # location /css {
+  #   alias /usr/share/nginx/html/css;
+  # }
+
+  # location /fonts {
+  #   alias /usr/share/nginx/html/fonts;
+  # }
+
+  # location /home {
+  #   alias  /usr/share/nginx/html/home;
+  # }
+
+  # location /images {
+  #   alias /usr/share/nginx/html/images;
+  # }
+
+  # location /js {
+  #   alias /usr/share/nginx/html/js;
+  # }
+
+  # location /sitemap.xml {
+  #   alias  /usr/share/nginx/html/sitemap.xml;
+  # }
+
+  # location /robots.txt {
+  #   alias  /usr/share/nginx/html/robots.txt;
+  # }
+
+  error_page 404 /404.html;
+
+  location / {
+    include conf.d/default.redirects;
+    root /usr/share/nginx/html/;
+    index index.html index.htm;
+  }
+
+  # redirect server error pages to the static page /50x.html
+  error_page 500 502 503 504 /50x.html;
+  location = /50x.html {
+    root /usr/share/nginx/html;
+  }
+
+  # deny access to .htaccess files, if Apache's document root
+  # concurs with nginx's one
+  #
+  #location ~ /\.ht {
+  #    deny  all;
+  #}
+}
\ No newline at end of file

config/nginx/default.redirects

+# www.eclipse.org/home
+# https://git.eclipse.org/c/www.eclipse.org/home.git/tree/
+rewrite /home/search.php /home/search redirect;
+rewrite /home/newcomers.php /home/newcomers redirect;
+rewrite /home/welcome.php /home/welcome redirect;
+rewrite /home/whatis.php /home/whatis redirect;
\ No newline at end of file

content/_index.md → content/home/_index.md

@@ -20,13 +20,9 @@ links:
   - - href: /org/value
     - text: Business Value
 container: container-fluid
-lastmod: 2022-03-21T15:21:29.336Z
+lastmod: 2022-04-29T14:50:37.859Z
 header_wrapper_class: header-wrapper header-anniversary-bg-img header-default-bg-img
   featured-jumbotron-bottom-shape
-aliases:
-  - /home
-  - /home/
-  - /home/index.php
 description: The Eclipse Foundation provides our global community of individuals and
   organizations with a mature, scalable, and business-friendly environment for
   open source software collaboration and innovation.

content/home/newcomers.md

 ---
 title: Eclipse Newcomers FAQ
 date: 2022-01-06T19:22:17.000Z
-description: ''
+description: ""
 categories: []
 keywords: []
-slug: ''
-aliases:
-  - /home/newcomers.php
+slug: ""
 toc: false
 draft: false
-lastmod: '2022-01-06T19:25:13.516Z'
+lastmod: 2022-03-21T18:52:07.137Z
 ---
 
 ## What is Eclipse?

content/home/search.md

 ---
 title: Search
 date: 2022-01-06T19:34:06.000Z
-description: ''
+description: ""
 categories: []
 keywords: []
-slug: ''
-aliases:
-  -  /home/search.php
+slug: ""
 toc: false
 draft: false
-lastmod: '2022-01-06T20:31:20.527Z'
-main_sidebar_custom_html: |
-  <div class="eclipsefdn-promo-content text-center" data-ad-format="ads_square,ads_medium_banner" data-ad-publish-to="eclipse_org_home"></div>
+lastmod: 2022-03-21T18:52:12.407Z
+main_sidebar_custom_html: >
+  <div class="eclipsefdn-promo-content text-center"
+  data-ad-format="ads_square,ads_medium_banner"
+  data-ad-publish-to="eclipse_org_home"></div>
 hide_sidebar_menu_links: true
 ---
 

content/home/welcome.md

 ---
 title: Getting to know Eclipse.org
 date: 2022-01-06T19:39:43.000Z
-description: ''
+description: ""
 categories: []
 keywords: []
-slug: ''
-aliases:
-  - /home/welcome.php
+slug: ""
 toc: false
 draft: false
-lastmod: '2022-01-06T19:52:54.099Z'
+lastmod: 2022-03-21T18:52:49.578Z
 hide_sidebar: true
 ---
 

content/home/whatis.md

 ---
 title: What is Eclipse?
 date: 2022-01-06T19:53:39.000Z
-description: ''
+description: ""
 categories: []
 keywords: []
-slug: ''
-aliases:
-  - /home/whatis.php
+slug: ""
 toc: false
 draft: false
-lastmod: '2022-01-06T19:56:30.692Z'
+lastmod: 2022-03-21T18:52:54.424Z
 hide_sidebar: true
 ---
 

docker-compose.yml

+version: '3'
+services:
+  www:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    ports:
+      - 80:8080
+    volumes:
+      - ./public:/usr/share/nginx/html
\ No newline at end of file

layouts/home/list.html

-<!--
-  Keep this file empty for /home alias redirect
-
-  We need to do this since we have content pages in content/home.
--->
\ No newline at end of file

layouts/shortcodes/pages/home/foundation-by-the-numbers.html

@@ -116,7 +116,7 @@
                 </svg></span>
             </span>
             <span class="col-xs-12 featured-stats-text-container">
-              <span class="featured-stats-number">18</span><br>
+              <span class="featured-stats-number">20</span><br>
               Working Groups
             </span>
           </a>

package.json

@@ -6,11 +6,11 @@
   "license": "EPL-2.0",
   "version": "0.0.0",
   "bugs": {
-    "url": "https://github.com/eclipsefdn/eclipse.org/issues"
+    "url": "https://gitlab.eclipse.org/eclipsefdn/it/websites/eclipse.org/-/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/eclipsefdn/eclipse.org.git"
+    "url": "https://gitlab.eclipse.org/eclipsefdn/it/websites/eclipse.org.git"
   },
   "scripts": {
     "dev": "NODE_ENV=development webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
@@ -20,7 +20,7 @@
     "install": "NODE_ENV=production npm run production"
   },
   "dependencies": {
-    "eclipsefdn-hugo-solstice-theme": "0.0.143",
+    "eclipsefdn-hugo-solstice-theme": "0.0.148",
     "js-yaml": "^3.13.1",
     "json-minify": "^1.0.0"
   },

static/images/logos/eclipse-foundation-white-orange.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="283px" height="92px" viewBox="0 0 283 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <title>eclipse-foundation-white-orange</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="eclipse-foundation-white-orange" sketch:type="MSLayerGroup">
+            <g id="Layer_1" sketch:type="MSShapeGroup">
+                <path d="M266.56,84.3 L257.89,73.3 L255.18,73.3 L255.18,91 L258.52,91 L258.52,79 L267.83,91 L269.9,91 L269.9,73.31 L266.56,73.31 L266.56,84.3 Z M234.15,76 C238.32,76 239.99,79.34 239.94,82.33 C239.89,85.32 238.32,88.33 234.15,88.33 C229.98,88.33 228.41,85.22 228.34,82.33 C228.27,79.44 230,76 234.15,76 L234.15,76 Z M234.15,73 C228.03,73 225.05,77.68 225.05,82.33 C225.05,86.98 227.93,91.46 234.15,91.46 C240.37,91.46 243.15,86.88 243.23,82.3 C243.31,77.72 240.25,73 234.15,73 L234.15,73 Z M212.92,91 L212.92,73.31 L209.6,73.31 L209.6,91 L212.92,91 Z M189.36,91 L192.7,91 L192.7,76.34 L198.31,76.34 L198.31,73.34 L183.74,73.34 L183.74,76.34 L189.36,76.34 L189.36,91 Z M170.45,84.56 L163.87,84.56 L167.16,77 L170.45,84.56 Z M173.28,91 L176.92,91 L169,73.31 L165.36,73.31 L157.4,91 L161,91 L162.51,87.67 L171.77,87.67 L173.28,91 Z M135.28,76.44 L138.92,76.44 C142.77,76.44 144.38,79.2 144.46,81.96 C144.54,84.72 142.94,87.79 138.92,87.79 L135.28,87.79 L135.28,76.44 Z M138.92,73.28 L132,73.28 L132,91 L138.95,91 C145.15,91 147.88,86.48 147.8,82 C147.72,77.52 145,73.31 138.92,73.31 L138.92,73.28 Z M116.55,84.28 L107.88,73.28 L105.17,73.28 L105.17,91 L108.51,91 L108.51,79 L117.81,91 L119.89,91 L119.89,73.31 L116.55,73.31 L116.55,84.28 Z M89.09,73.34 L89.09,83.5 C89.09,86.5 87.53,88.38 84.77,88.38 C82.01,88.38 80.19,86.69 80.19,83.5 L80.19,73.36 L76.88,73.36 L76.88,83.5 C76.88,88.83 80.5,91.41 84.74,91.41 C89.19,91.41 92.41,88.73 92.41,83.5 L92.41,73.36 L89.09,73.34 Z M56.09,75.99 C60.26,75.99 61.93,79.33 61.88,82.32 C61.83,85.31 60.26,88.32 56.09,88.32 C51.92,88.32 50.35,85.21 50.27,82.32 C50.19,79.43 51.93,76 56.1,76 L56.09,75.99 Z M56.09,72.99 C49.97,72.99 46.99,77.67 46.99,82.32 C46.99,86.97 49.87,91.45 56.09,91.45 C62.31,91.45 65.09,86.87 65.17,82.29 C65.25,77.71 62.19,73 56.1,73 L56.09,72.99 Z M26.32,91 L26.32,84.46 L35.19,84.46 L35.19,81.4 L26.32,81.4 L26.32,76.57 L35.7,76.57 L35.7,73.36 L23,73.36 L23,91 L26.32,91 Z" id="Shape" fill="#F79422"></path>
+                <path d="M270.23,54.75 L248.06,54.75 L248.06,45.84 L269.44,45.84 L269.44,38.9 L248.06,38.9 L248.06,29.76 L270.23,29.76 L270.23,22.54 L240.67,22.54 L240.67,62.08 L270.23,62.08 L270.23,54.75 Z M230.23,29.09 C227.23,22.99 220.87,21.25 214.72,21.25 C207.44,21.25 199.43,24.63 199.43,32.75 C199.43,41.61 206.88,43.75 214.94,44.75 C220.19,45.31 224.08,46.84 224.08,50.56 C224.08,54.85 219.68,56.48 215,56.48 C210.32,56.48 205.64,54.56 203.89,50.22 L197.68,53.44 C200.62,60.66 206.82,63.14 214.89,63.14 C223.69,63.14 231.47,59.36 231.47,50.56 C231.47,41.14 223.8,39 215.56,37.98 C210.83,37.42 206.77,36.46 206.77,32.98 C206.77,30.05 209.42,27.73 214.94,27.73 C219.23,27.73 222.94,29.88 224.31,32.13 L230.23,29.09 Z M176.89,22.54 C170.68,22.49 164.48,22.54 158.27,22.54 L158.27,62.08 L165.72,62.08 L165.72,50.46 L176.89,50.46 C196.25,50.46 196.2,22.54 176.91,22.54 L176.89,22.54 Z M165.72,29.65 L176.89,29.65 C186.36,29.65 186.42,43.65 176.89,43.65 L165.74,43.65 L165.72,29.65 Z M147.72,62.08 L147.72,22.54 L140.33,22.54 L140.33,62.08 L147.72,62.08 Z M103.72,22.54 L103.72,62.08 L131.47,62.08 L131.47,55.2 L111.22,55.2 L111.22,22.54 L103.72,22.54 Z M91.55,52 C88.872234,54.5461867 85.3249894,55.9765273 81.63,56 C71.87,56 68.09,49.18 68.03,42.63 C67.97,36.08 72.09,28.93 81.63,28.93 C85.170522,28.8781619 88.5908757,30.2132842 91.16,32.65 L96.16,27.86 C92.3256045,24.0044101 87.1076372,21.8437611 81.67,21.86 C67.4,21.86 60.67,32.35 60.74,42.67 C60.81,52.99 67,63 81.63,63 C87.2148501,63.1339444 92.6194416,61.0189476 96.63,57.13 L91.55,52 Z M52.55,54.76 L30.37,54.76 L30.37,45.84 L51.75,45.84 L51.75,38.9 L30.37,38.9 L30.37,29.76 L52.54,29.76 L52.54,22.54 L23,22.54 L23,62.08 L52.56,62.08 L52.55,54.76 Z" id="Shape" fill="#FFFFFF"></path>
+                <path d="M10.66,18.52 C19.66,4.42 37.81,-0.48 52.91,6.27 L51.91,5.58 C36.4929712,-4.30589702 15.980897,0.177971208 6.095,15.595 C-3.79089702,31.0120288 0.692971208,51.524103 16.11,61.41 L17.16,62.04 C4.69,51.14 1.61,32.63 10.66,18.52 L10.66,18.52 Z" id="Shape" fill="#F79422"></path>
+                <path d="M273,26.41 L273,26.41 C273,23.8805358 275.050536,21.83 277.58,21.83 C280.109464,21.83 282.16,23.8805358 282.16,26.41 L282.16,26.41 C282.16,28.9394642 280.109464,30.99 277.58,30.99 C275.050536,30.99 273,28.9394642 273,26.41 L273,26.41 Z M281.63,26.41 L281.63,26.41 C281.63,24.1732468 279.816753,22.36 277.58,22.36 C275.343247,22.36 273.53,24.1732468 273.53,26.41 L273.53,26.41 C273.50824,27.4933869 273.926957,28.5392467 274.690349,29.3082936 C275.453741,30.0773405 276.496482,30.5037636 277.58,30.49 C278.66986,30.4954084 279.716357,30.0634812 280.485132,29.2909468 C281.253907,28.5184125 281.680725,27.4698208 281.67,26.38 L281.63,26.41 Z M275.69,23.94 L278,23.94 C279.11,23.94 279.92,24.44 279.92,25.52 C279.951766,26.208838 279.49725,26.825978 278.83,27 L280,28.67 L278.61,28.67 L277.61,27.17 L276.87,27.17 L276.87,28.67 L275.72,28.67 L275.69,23.94 Z M277.84,26.25 C278.37,26.25 278.66,25.99 278.66,25.6 C278.66,25.21 278.34,24.94 277.84,24.94 L276.84,24.94 L276.84,26.25 L277.84,26.25 Z" id="Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file