Remove 'https' "twin bindings" from handlers and filter chains

14 files changed, 24 insertions, 79 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 46acdb44746..d5e42276c1a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.admin.clustercontroller;
 
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.ComponentSpecification;
+import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
@@ -10,10 +11,8 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
-import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.container.Container;
-import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.vespa.model.container.component.AccessLogComponent;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
@@ -21,6 +20,8 @@ import com.yahoo.vespa.model.container.component.Handler;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+
 /**
  * Container implementation for cluster-controllers
  */
@@ -87,8 +88,7 @@ public class ClusterControllerContainer extends Container implements
     }
 
     private void addHandler(Handler h, String binding) {
-        h.addServerBindings("http://*/" + binding,
-                            "https://*/" + binding);
+        h.addServerBindings("http://*/" + binding);
         super.addHandler(h);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index a370e0dc38b..446169c0ed2 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -212,9 +212,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         Handler<AbstractConfigProducer<?>> stateHandler = new Handler<>(
                 new ComponentModel(STATE_HANDLER_CLASS, null, null, null));
         stateHandler.addServerBindings("http://*" + StateHandler.STATE_API_ROOT,
-                                       "https://*" + StateHandler.STATE_API_ROOT,
-                                       "http://*" + StateHandler.STATE_API_ROOT + "/*",
-                                       "https://*" + StateHandler.STATE_API_ROOT + "/*");
+                                       "http://*" + StateHandler.STATE_API_ROOT + "/*");
         addComponent(stateHandler);
     }
 
@@ -242,13 +240,13 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         Handler<AbstractConfigProducer<?>> statusHandler = new Handler<>(
                 new ComponentModel(BundleInstantiationSpecification.getInternalHandlerSpecificationFromStrings(
                         APPLICATION_STATUS_HANDLER_CLASS, null), null));
-        statusHandler.addServerBindings("http://*/ApplicationStatus", "https://*/ApplicationStatus");
+        statusHandler.addServerBindings("http://*/ApplicationStatus");
         addComponent(statusHandler);
     }
 
     public void addVipHandler() {
         Handler<?> vipHandler = Handler.fromClassName(FileStatusHandlerComponent.CLASS);
-        vipHandler.addServerBindings("http://*/status.html", "https://*/status.html");
+        vipHandler.addServerBindings("http://*/status.html");
         addComponent(vipHandler);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
index b7c8460a9a5..6b4f8d486ec 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java
@@ -49,9 +49,7 @@ public class ContainerModelEvaluation implements RankProfilesConfig.Producer, Ra
     public static Handler<?> getHandler() {
         Handler<?> handler = new Handler<>(new ComponentModel(REST_HANDLER_NAME, null, BUNDLE_NAME));
         handler.addServerBindings("http://*/" + REST_BINDING,
-                                  "https://*/" + REST_BINDING,
-                                  "http://*/" + REST_BINDING + "/*",
-                                  "https://*/" + REST_BINDING + "/*");
+                                  "http://*/" + REST_BINDING + "/*");
         return handler;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
index 4220a6571a0..071411845ad 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
@@ -153,6 +153,6 @@ public final class AccessControl {
     }
 
     private static Stream<String> servletBindings(Servlet servlet) {
-        return Stream.of("http://*/", "https://*/").map(protocol -> protocol + servlet.bindingPath);
+        return Stream.of("http://*/").map(protocol -> protocol + servlet.bindingPath);
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
index 32f0f373a92..4fd79a4f335 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java
@@ -4,10 +4,6 @@ package com.yahoo.vespa.model.container.processing;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.component.chain.Chains;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Root config producer for processing
  *
@@ -15,7 +11,7 @@ import java.util.List;
  */
 public class ProcessingChains extends Chains<ProcessingChain> {
 
-    public static final String[] defaultBindings = new String[] {"http://*/processing/*", "https://*/processing/*"};
+    public static final String[] defaultBindings = new String[] {"http://*/processing/*"};
 
 
     public ProcessingChains(AbstractConfigProducer parent, String subId) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 6663dc0bbc0..7e80c6be221 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -271,7 +271,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             Optional<String> statusFile = Optional.ofNullable(System.getenv(HOSTED_VESPA_STATUS_FILE_SETTING));
             cluster.addComponent(
                     new FileStatusHandlerComponent(name + "-status-handler", statusFile.orElse(HOSTED_VESPA_STATUS_FILE),
-                            "http://*/" + name, "https://*/" + name));
+                            "http://*/" + name));
         } else {
             cluster.addVipHandler();
         }
@@ -712,7 +712,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         ProcessingHandler<SearchChains> searchHandler = new ProcessingHandler<>(
                 cluster.getSearch().getChains(), "com.yahoo.search.handler.SearchHandler");
 
-        String[] defaultBindings = {"http://*/search/*", "https://*/search/*"};
+        String[] defaultBindings = {"http://*/search/*"};
         for (String binding: serverBindings(searchElement, defaultBindings)) {
             searchHandler.addServerBindings(binding);
         }
@@ -722,7 +722,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private void addGUIHandler(ApplicationContainerCluster cluster) {
         Handler<?> guiHandler = new GUIHandler();
-        guiHandler.addServerBindings("http://"+GUIHandler.BINDING, "https://"+GUIHandler.BINDING);
+        guiHandler.addServerBindings("http://"+GUIHandler.BINDING);
         cluster.addComponent(guiHandler);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index a44f5440a9f..10e24a609f7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
 public class DocumentApiOptionsBuilder {
 
     private static final Logger log = Logger.getLogger(DocumentApiOptionsBuilder.class.getName());
-    private static final String[] DEFAULT_BINDINGS = {"http://*/", "https://*/"};
+    private static final String[] DEFAULT_BINDINGS = {"http://*/"};
 
     public static ContainerDocumentApi.Options build(Element spec) {
         return new ContainerDocumentApi.Options(
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index fd1ea2ae7ab..f5df3df0070 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -196,8 +196,8 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     @Test
     public void servlet_can_be_excluded_by_excluding_one_of_its_bindings() throws Exception {
         final String servletPath = "servlet/path";
-        final String notExcludedBinding = "https://*/" + servletPath;
-        final String excludedBinding = "http://*/" + servletPath;
+        final String notExcludedBinding = "http://*:8081/" + servletPath;
+        final String excludedBinding = "http://*:8080/" + servletPath;
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc version='1.0'>",
                 httpWithExcludedBinding(excludedBinding),
@@ -217,8 +217,8 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     @Test
     public void rest_api_can_be_excluded_by_excluding_one_of_its_bindings() throws Exception {
         final String restApiPath = "api/v0";
-        final String notExcludedBinding = "http://*/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
-        final String excludedBinding = "https://*/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
+        final String notExcludedBinding = "http://*:8081/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
+        final String excludedBinding = "http://*:8080/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc version='1.0'>",
                 httpWithExcludedBinding(excludedBinding),
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index 428286c4794..5b92934678d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertThat;
 
@@ -64,7 +63,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
         Element elem = DomBuilderTest.parse(
                 "<jdisc id='cluster1' version='1.0'>",
                 "  <document-api>",
-                "    <binding>https://*/document-api/</binding>",
+                "    <binding>http://*/document-api/</binding>",
                 "    <binding>missing-trailing-slash</binding>",
                 "  </document-api>",
                 nodesXml,
@@ -77,8 +76,8 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     private void verifyCustomBindings(String id, String bindingSuffix) {
         Handler<?> handler = getHandlers("cluster1").get(id);
 
-        assertThat(handler.getServerBindings(), hasItem("https://*/document-api/" + bindingSuffix));
-        assertThat(handler.getServerBindings(), hasItem("https://*/document-api/" + bindingSuffix + "/"));
+        assertThat(handler.getServerBindings(), hasItem("http://*/document-api/" + bindingSuffix));
+        assertThat(handler.getServerBindings(), hasItem("http://*/document-api/" + bindingSuffix + "/"));
         assertThat(handler.getServerBindings(), hasItem("missing-trailing-slash/" + bindingSuffix));
         assertThat(handler.getServerBindings(), hasItem("missing-trailing-slash/" + bindingSuffix + "/"));
 
@@ -102,9 +101,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
 
         assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler"), not(nullValue()));
         assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().contains("http://*/" + ContainerCluster.RESERVED_URI_PREFIX + "/feedapi"), is(true));
-        assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().contains("https://*/" + ContainerCluster.RESERVED_URI_PREFIX + "/feedapi"), is(true));
         assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().contains("http://*/" + ContainerCluster.RESERVED_URI_PREFIX + "/feedapi/"), is(true));
-        assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().contains("https://*/" + ContainerCluster.RESERVED_URI_PREFIX + "/feedapi/"), is(true));
-        assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().size(), equalTo(4));
+        assertThat(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().size(), equalTo(2));
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 26820672f2c..31077df7f7c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -35,7 +35,6 @@ import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.SecretStore;
 import com.yahoo.vespa.model.container.component.Component;
-import com.yahoo.vespa.model.container.component.HttpFilter;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
 import org.junit.Test;
@@ -266,11 +265,11 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
 
         JdiscBindingsConfig.Handlers applicationStatusHandler = config.handlers(ApplicationStatusHandler.class.getName());
         assertThat(applicationStatusHandler.serverBindings(),
-                   contains("http://*/ApplicationStatus", "https://*/ApplicationStatus"));
+                   contains("http://*/ApplicationStatus"));
 
         JdiscBindingsConfig.Handlers fileRequestHandler = config.handlers(VipStatusHandler.class.getName());
         assertThat(fileRequestHandler.serverBindings(),
-                   contains("http://*/status.html", "https://*/status.html"));
+                   contains("http://*/status.html"));
     }
 
     @Test
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 40a2b31b3fc..d5a02949cf3 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -75,7 +75,6 @@
         <access-control domain="my.athens-domain" read="true">
           <exclude>
             <binding>http//*/foo/*</binding>
-            <binding>https://*/foo/*</binding>
           </exclude>
           <application>my-app</application>
           <vespa-domain>vespa.vespa.cd</vespa-domain>
@@ -134,7 +133,6 @@
 
     <document-api>
       <binding>http://*/document-api/</binding>
-      <binding>https://*/document-api/</binding>
       <abortondocumenterror>false</abortondocumenterror>
       <retryenabled>false</retryenabled>
       <timeout>5.55</timeout>
diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml
index e36218fa084..0656f293001 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -70,7 +70,6 @@
 
   <document-api>
     <binding>http://*/document-api/</binding>
-    <binding>https://*/document-api/</binding>
     <abortondocumenterror>false</abortondocumenterror>
     <retryenabled>false</retryenabled>
     <timeout>5.55</timeout>
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index b2c426e707b..5aca82409a9 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -76,115 +76,77 @@
 
     <handler id='com.yahoo.vespa.config.server.http.HttpGetConfigHandler' bundle='configserver'>
       <binding>http://*/config/v1/*/*</binding>
-      <binding>https://*/config/v1/*/*</binding>
       <binding>http://*/config/v1/*</binding>
-      <binding>https://*/config/v1/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.HttpListConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v1/</binding>
-      <binding>https://*/config/v1/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.HttpListNamedConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v1/*/</binding>
-      <binding>https://*/config/v1/*/</binding>
       <binding>http://*/config/v1/*/*/</binding>
-      <binding>https://*/config/v1/*/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.status.StatusHandler' bundle='configserver'>
       <binding>http://*/status</binding>
-      <binding>https://*/status</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.flags.FlagsHandler' bundle='configserver'>
       <binding>http://*/flags/v1</binding>
-      <binding>https://*/flags/v1</binding>
       <binding>http://*/flags/v1/*</binding>
-      <binding>https://*/flags/v1/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.TenantHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/</binding>
-      <binding>https://*/application/v2/tenant/</binding>
       <binding>http://*/application/v2/tenant/*</binding>
-      <binding>https://*/application/v2/tenant/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionCreateHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session</binding>
-      <binding>https://*/application/v2/tenant/*/session</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionPrepareHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/prepared</binding>
-      <binding>https://*/application/v2/tenant/*/session/*/prepared</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionActiveHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/active</binding>
-      <binding>https://*/application/v2/tenant/*/session/*/active</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.ApplicationApiHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/prepareandactivate</binding>
-      <binding>https://*/application/v2/tenant/*/prepareandactivate</binding>
       <binding>http://*/application/v2/tenant/*/session/*/prepareandactivate</binding>
-      <binding>https://*/application/v2/tenant/*/session/*/prepareandactivate</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionContentHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/content/*</binding>
-      <binding>https://*/application/v2/tenant/*/session/*/content/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.ListApplicationsHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/application/</binding>
-      <binding>https://*/application/v2/tenant/*/application/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.ApplicationHandler' bundle='configserver'>
       <!-- WARNING: THIS LIST *MUST* MATCH THE ONE IN ApplicationHandler::getBindingMatch -->
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/content/*</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/content/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/filedistributionstatus</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/filedistributionstatus</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/suspended</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/restart</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/restart</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/converge</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/converge</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*</binding>
-      <binding>https://*/application/v2/tenant/*/application/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/logs</binding>
-      <binding>https://*/application/v2/tenant/*/application/*/logs</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpGetConfigHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/*</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/*/*</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpListConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpListNamedConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/*/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*/</binding>
-      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HostHandler' bundle='configserver'>
       <binding>http://*/application/v2/host/*</binding>
-      <binding>https://*/application/v2/host/*</binding>
     </handler>
 
     <http>
diff --git a/node-repository/src/main/config/node-repository.xml b/node-repository/src/main/config/node-repository.xml
index f46a2d9d2e3..2bc3ae5cfeb 100644
--- a/node-repository/src/main/config/node-repository.xml
+++ b/node-repository/src/main/config/node-repository.xml
@@ -8,12 +8,10 @@
 
 <handler id="com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler" bundle="node-repository">
     <binding>http://*/nodes/v2/*</binding>
-    <binding>https://*/nodes/v2/*</binding>
 </handler>
 
 <handler id="com.yahoo.vespa.hosted.provision.restapi.v2.LoadBalancersApiHandler" bundle="node-repository">
     <binding>http://*/loadbalancers/v1/*</binding>
-    <binding>https://*/loadbalancers/v1/*</binding>
 </handler>
 
 <preprocess:include file="node-flavors.xml" required="false" />