From b82e371856e85a07bab392f88e7c27cb9149efcc Mon Sep 17 00:00:00 2001
From: Christopher Guindon <chris.guindon@eclipse-foundation.org>
Date: Mon, 26 Jun 2023 17:19:12 +0000
Subject: [PATCH] add support for staging.eclipse.org
---
Jenkinsfile | 4 +++-
config/nginx/default.conf | 6 +++---
webpack.mix.js | 11 ++++++-----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c46a4b77..ab1e1521 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,10 +3,12 @@
hugo (
appName: 'www.eclipse.org',
productionDomain: 'www.eclipse.org',
+ branchDomain: "eclipse.org",
+ previewBranchesRegex: "staging",
build: [
containerImage: 'eclipsefdn/hugo-node:h0.110.0-n18.13.0',
],
deployment: [
nginxServerConf: 'config/nginx/default.conf'
]
-)
+)
\ No newline at end of file
diff --git a/config/nginx/default.conf b/config/nginx/default.conf
index f8572a20..39b7d912 100644
--- a/config/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -56,7 +56,7 @@ server {
# https://git.eclipse.org/c/www.eclipse.org/getting_started.git/tree/
rewrite /getting_started /getting-started redirect;
rewrite /getting_started/index.php /getting-started redirect;
-
+
# www.eclipse.org/documentation
# https://git.eclipse.org/c/www.eclipse.org/documentation.git/tree/
rewrite /documentation/index.php /documentation redirect;
@@ -86,9 +86,9 @@ server {
# www.eclipse.org/security
# https://git.eclipse.org/c/www.eclipse.org/security.git/tree/
rewrite /security/index.php /security/ redirect;
- rewrite /security/team.php /security/team/ redirect;
- rewrite /security/report.php /security/report/ redirect;
rewrite /security/known.php /security/known/ redirect;
+ rewrite /security/policy.php /security/policy/ redirect;
+ rewrite /security/policy_2011.php /security/policy/ redirect;
root /usr/share/nginx/html/;
index index.html index.htm;
diff --git a/webpack.mix.js b/webpack.mix.js
index 9b5641e8..f6a28bda 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,15 +18,16 @@ mix.EclipseFdnSolsticeAssets();
mix.setPublicPath('static/public');
mix.setResourceRoot('../');
+// default styles
mix.less('./less/styles.less', 'static/public/css/styles.css');
+mix.js('js/main.js', './static/public/js/main.js');
+// page_css_file
mix.less('./less/page_css_file/collaborations/styles.less', 'static/public/css/collaborations-styles.css');
mix.less('./less/page_css_file/openchain/styles.less', 'static/public/css/projects-openchain.css');
mix.less('./less/page_css_file/europe/styles.less', 'static/public/css/europe-styles.css');
-mix.less('./less/page_css_file/research/styles.less', 'static/public/css/research-styles.css');
+// eclipse.org/research
+mix.less('./less/page_css_file/research/styles.less', 'static/public/css/research-styles.css');
mix.css('./node_modules/datatables.net-dt/css/jquery.dataTables.min.css', 'static/public/css/datatables.net-dt.css');
-
-mix.js('js/main.js', './static/public/js/main.js');
-mix.js('js/known-vulnerabilities.js', './static/public/js/known-vulnerabilities.js')
-
+mix.js('js/known-vulnerabilities.js', './static/public/js/known-vulnerabilities.js')
\ No newline at end of file
--
GitLab