Skip to content
Snippets Groups Projects
Commit 0404bab8 authored by Christopher Guindon's avatar Christopher Guindon
Browse files

Merge branch 'cguindon/main/add-staging' into 'main'

add support for staging.eclipse.org

See merge request !75
parents 1a59a096 b82e3718
No related branches found
No related tags found
1 merge request!75add support for staging.eclipse.org
Pipeline #18977 passed
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
hugo ( hugo (
appName: 'www.eclipse.org', appName: 'www.eclipse.org',
productionDomain: 'www.eclipse.org', productionDomain: 'www.eclipse.org',
branchDomain: "eclipse.org",
previewBranchesRegex: "staging",
build: [ build: [
containerImage: 'eclipsefdn/hugo-node:h0.110.0-n18.13.0', containerImage: 'eclipsefdn/hugo-node:h0.110.0-n18.13.0',
], ],
deployment: [ deployment: [
nginxServerConf: 'config/nginx/default.conf' nginxServerConf: 'config/nginx/default.conf'
] ]
) )
\ No newline at end of file
...@@ -56,7 +56,7 @@ server { ...@@ -56,7 +56,7 @@ server {
# https://git.eclipse.org/c/www.eclipse.org/getting_started.git/tree/ # https://git.eclipse.org/c/www.eclipse.org/getting_started.git/tree/
rewrite /getting_started /getting-started redirect; rewrite /getting_started /getting-started redirect;
rewrite /getting_started/index.php /getting-started redirect; rewrite /getting_started/index.php /getting-started redirect;
# www.eclipse.org/documentation # www.eclipse.org/documentation
# https://git.eclipse.org/c/www.eclipse.org/documentation.git/tree/ # https://git.eclipse.org/c/www.eclipse.org/documentation.git/tree/
rewrite /documentation/index.php /documentation redirect; rewrite /documentation/index.php /documentation redirect;
...@@ -86,9 +86,9 @@ server { ...@@ -86,9 +86,9 @@ server {
# www.eclipse.org/security # www.eclipse.org/security
# https://git.eclipse.org/c/www.eclipse.org/security.git/tree/ # https://git.eclipse.org/c/www.eclipse.org/security.git/tree/
rewrite /security/index.php /security/ redirect; 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/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/; root /usr/share/nginx/html/;
index index.html index.htm; index index.html index.htm;
......
...@@ -18,15 +18,16 @@ mix.EclipseFdnSolsticeAssets(); ...@@ -18,15 +18,16 @@ mix.EclipseFdnSolsticeAssets();
mix.setPublicPath('static/public'); mix.setPublicPath('static/public');
mix.setResourceRoot('../'); mix.setResourceRoot('../');
// default styles
mix.less('./less/styles.less', 'static/public/css/styles.css'); 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/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/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/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.css('./node_modules/datatables.net-dt/css/jquery.dataTables.min.css', 'static/public/css/datatables.net-dt.css');
mix.js('js/known-vulnerabilities.js', './static/public/js/known-vulnerabilities.js')
mix.js('js/main.js', './static/public/js/main.js'); \ No newline at end of file
mix.js('js/known-vulnerabilities.js', './static/public/js/known-vulnerabilities.js')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment