From 83d223428be846e69767f0ae36a97f691b39e9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Barbero?=
<mikael.barbero@eclipse-foundation.org>
Date: Mon, 9 May 2022 18:14:20 +0200
Subject: [PATCH] Issue 110: Move to new jamstack preview framework
---
Jenkinsfile | 8 ++++++--
config/nginx/default.conf | 8 +++++++-
config/nginx/default.redirects | 6 ------
k8s/deployments.jsonnet | 5 -----
4 files changed, 13 insertions(+), 14 deletions(-)
delete mode 100644 config/nginx/default.redirects
delete mode 100644 k8s/deployments.jsonnet
diff --git a/Jenkinsfile b/Jenkinsfile
index affc2d42..b0c06997 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,7 @@
-@Library('common-shared') _
+@Library('releng-pipeline') _
-hugoWebsitePipeline appname: 'www.eclipse.org'
+hugo (
+ appName: 'www.eclipse.org',
+ productionDomain: 'www.eclipse.org',
+ nginxServerConf: 'config/nginx/default.conf'
+)
diff --git a/config/nginx/default.conf b/config/nginx/default.conf
index 639d912b..a1356723 100644
--- a/config/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -45,7 +45,13 @@ server {
error_page 404 /404.html;
location / {
- include conf.d/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;
+
root /usr/share/nginx/html/;
index index.html index.htm;
}
diff --git a/config/nginx/default.redirects b/config/nginx/default.redirects
deleted file mode 100644
index f6f0afde..00000000
--- a/config/nginx/default.redirects
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
diff --git a/k8s/deployments.jsonnet b/k8s/deployments.jsonnet
deleted file mode 100644
index d194690b..00000000
--- a/k8s/deployments.jsonnet
+++ /dev/null
@@ -1,5 +0,0 @@
-local deployment = import "../../releng/hugo-websites/kube-deployment.jsonnet";
-
-deployment.newProductionDeploymentWithStaging(
- "www.eclipse.org", "staging.eclipse.org"
-)
\ No newline at end of file
--
GitLab