diff --git a/Jenkinsfile b/Jenkinsfile index affc2d42ae85e6a8f4787b8c4497af277db5febb..b0c06997efae78cdbfaa0d95c6e790c8a9a90557 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 639d912bcf08c1de6237977e603ec61ef670fe12..a1356723c05229c010f155912cf6edcf5e5e8e9c 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 f6f0afdee85fd306747d730c8e743479e8e3736f..0000000000000000000000000000000000000000 --- 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 d194690b4345273fe40b625c81890509f8813b63..0000000000000000000000000000000000000000 --- 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