Bugfix/fikser script navn (#409)

* Opprydning i Jetty konfig, fikset loadbalancer
* Fikser feil script navn.

Author: mrsladek

.deploy/dev-fss-q0.yaml

@@ -48,8 +48,8 @@ spec:
       - mountPath: /var/run/secrets/nais.io/appdynamics
         kvPath: /apikey/appdynamics/dev
   env:
-    - name: LOADBALANCER_FQDN
-      value: fpabakus-q0.nais.preprod.local
+    - name: LOADBALANCER_URL
+      value: https://fpabakus-q0.nais.preprod.local
     - name: ABAC_PDP_ENDPOINT_URL
       value: https://wasapp-q0.adeo.no/asm-pdp/authorize
     - name: SECURITYTOKENSERVICE_URL

.deploy/dev-fss-q1.yaml

@@ -48,8 +48,8 @@ spec:
       - mountPath: /var/run/secrets/nais.io/appdynamics
         kvPath: /apikey/appdynamics/dev
   env:
-    - name: LOADBALANCER_FQDN
-      value: fpabakus-q1.nais.preprod.local
+    - name: LOADBALANCER_URL
+      value: https://fpabakus-q1.nais.preprod.local
     - name: ABAC_PDP_ENDPOINT_URL
       value: https://wasapp-q1.adeo.no/asm-pdp/authorize
     - name: SECURITYTOKENSERVICE_URL

.deploy/dev-fss-t4.yaml

@@ -48,8 +48,8 @@ spec:
       - mountPath: /var/run/secrets/nais.io/appdynamics
         kvPath: /apikey/appdynamics/dev
   env:
-    - name: LOADBALANCER_FQDN
-      value: fpabakus-t4.nais.preprod.local
+    - name: LOADBALANCER_URL
+      value: https://fpabakus-t4.nais.preprod.local
     - name: ABAC_PDP_ENDPOINT_URL
       value: https://wasapp-t4.adeo.no/asm-pdp/authorize
     - name: SECURITYTOKENSERVICE_URL

.deploy/prod-fss-default.yaml

@@ -48,8 +48,8 @@ spec:
       - mountPath: /var/run/secrets/nais.io/appdynamics
         kvPath: /apikey/appdynamics/prod
   env:
-    - name: LOADBALANCER_FQDN
-      value: fpabakus.nais.adeo.no
+    - name: LOADBALANCER_URL
+      value: https://fpabakus.nais.adeo.no
     - name: ABAC_PDP_ENDPOINT_URL
       value: https://wasapp.adeo.no/asm-pdp/authorize
     - name: SECURITYTOKENSERVICE_URL

.scripts/03-import-users.sh renamed to .scripts/05-import-users.sh

@@ -46,51 +46,18 @@ public JettyServer(int serverPort) {
 
     public static void main(String[] args) throws Exception {
         System.setProperty(NAIS_CLUSTER_NAME, ENV.clusterName());
-        JettyServer jettyServer;
-        if (args.length > 0) {
-            int serverPort = Integer.parseUnsignedInt(args[0]);
-            jettyServer = new JettyServer(serverPort);
-        } else {
-            jettyServer = new JettyServer();
-        }
-        jettyServer.bootStrap();
-    }
-
-    @Override
-    protected void konfigurerMiljø() throws Exception {
-        hacks4Nais();
-    }
-
-    private void hacks4Nais() {
-        loadBalancerFqdnTilLoadBalancerUrl();
-        temporært();
+        jettyServer(args).bootStrap();
     }
 
-    private void loadBalancerFqdnTilLoadBalancerUrl() {
-        if (System.getenv("LOADBALANCER_FQDN") != null) {
-            String loadbalancerFqdn = System.getenv("LOADBALANCER_FQDN");
-            String protocol = (loadbalancerFqdn.startsWith("localhost")) ? "http" : "https";
-            System.setProperty("loadbalancer.url", protocol + "://" + loadbalancerFqdn);
+    private static AbstractJettyServer jettyServer(String[] args) {
+        if (args.length > 0) {
+            return new JettyServer(Integer.parseUnsignedInt(args[0]));
         }
+        return new JettyServer();
     }
 
-    private void temporært() {
-        // FIXME (u139158): PFP-1176 Skriv om i OpenAmIssoHealthCheck og
-        // AuthorizationRequestBuilder når Jboss dør
-        if (System.getenv("OIDC_OPENAM_HOSTURL") != null) {
-            System.setProperty("OpenIdConnect.issoHost", System.getenv("OIDC_OPENAM_HOSTURL"));
-        }
-        // FIXME (u139158): PFP-1176 Skriv om i AuthorizationRequestBuilder og
-        // IdTokenAndRefreshTokenProvider når Jboss dør
-        if (System.getenv("OIDC_OPENAM_AGENTNAME") != null) {
-            System.setProperty("OpenIdConnect.username", System.getenv("OIDC_OPENAM_AGENTNAME"));
-        }
-        // FIXME (u139158): PFP-1176 Skriv om i IdTokenAndRefreshTokenProvider når Jboss
-        // dør
-        if (System.getenv("OIDC_OPENAM_PASSWORD") != null) {
-            System.setProperty("OpenIdConnect.password", System.getenv("OIDC_OPENAM_PASSWORD"));
-        }
-    }
+    @Override
+    protected void konfigurerMiljø() throws Exception {}
 
     @Override
     protected void konfigurerJndi() throws Exception {
@@ -145,5 +112,4 @@ protected ResourceCollection createResourceCollection() throws IOException {
         return new ResourceCollection(
                 Resource.newClassPathResource("/web"));
     }
-
 }