From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 3 Oct 2018 22:57:33 +0000 (-0700)
Subject: Move Nexus Context path to '/'
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=3f0813d0143c43d04b4180d27e20cd00f8ae39d4;p=releng%2Fci-workshop.git

Move Nexus Context path to '/'

This reduces the confusion when trying to access Nexus at
'nexus.localhost' as the default context is '/nexus'. Without going
directly to 'nexus.localhost/nexus' users were given a 404 response.

Change-Id: I024f447a60f53f35626752f44f556c4883421149
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/config.env b/config.env
index 7f2bfdf..877aaca 100644
--- a/config.env
+++ b/config.env
@@ -37,9 +37,9 @@ JENKINS_SLAVE_SSH_PUBKEY=ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUX11sDBXacCE/LBd
 #   Global Properties for Jenkins
 ##
 JJB_GIT_URL=ssh://gerrit:29418/
-JJB_NEXUS_URL=http://nexus.localhost/nexus
+JJB_NEXUS_URL=http://nexus.localhost
 # JJB_NEXUSPROXY=http://nexus:8081/nexus
-JJB_LOGS_SERVER=http://nexus.localhost/nexus/content/sites/logs
+JJB_LOGS_SERVER=http://nexus.localhost/content/sites/logs
 JJB_SILO=production
 JJB_JENKINS_HOSTNAME=jenkins
 
@@ -71,7 +71,7 @@ LDAP_REMOVE_CONFIG_AFTER_SETUP=false
 # Nexus
 #   https://hub.docker.com/r/sonatype/nexus/
 ##
-#CONTEXT_PATH="/nexus"
+CONTEXT_PATH=/
 #MAX_HEAP="768m"
 #MIN_HEAP="256m"
 #JAVA_OPTS="-server -XX:MaxPermSize192m -Djava.net.preferIPv4Stack=true"
diff --git a/init/playbooks/site.yaml b/init/playbooks/site.yaml
index abd1974..5b7a982 100644
--- a/init/playbooks/site.yaml
+++ b/init/playbooks/site.yaml
@@ -124,12 +124,12 @@
             dest: '/var/tmp/repo.json'
       - name: Check for Logs repo in Nexus
         uri:
-            url: http://nexus:8081/nexus/service/local/repositories
+            url: http://nexus:8081/service/local/repositories
             return_content: true
         register: nexus_repos
       - name: Create Logs repo in Nexus
         uri:
-            url: http://nexus:8081/nexus/service/local/repositories
+            url: http://nexus:8081/service/local/repositories
             method: POST
             body: "{{ lookup('file', '/var/tmp/repo.json') }}"
             user: admin