diff --git a/cmd/memcached.go b/cmd/memcached.go index e46e9f3..7c39a3f 100644 --- a/cmd/memcached.go +++ b/cmd/memcached.go @@ -107,12 +107,11 @@ func drupalServiceComponents() ([]corecomponent.ComposeServiceComponent, error) "solr": "solr.{domain}", "traefik": "traefik.{domain}", }, - ServiceEnvTemplates: map[string]map[string]string{ - "drupal": { - "DRUPAL_DEFAULT_SITE_URL": "{base_url}", - "DRUPAL_ENABLE_HTTPS": "{https_enabled}", - "DRUSH_OPTIONS_URI": "{base_url}", - }, + AppEnvDeletes: []string{ + "DRUPAL_DEFAULT_SITE_URL", + "DRUPAL_ENABLE_HTTPS", + "DRUPAL_TRUSTED_HOST_PATTERNS", + "DRUSH_OPTIONS_URI", }, }) if err != nil { diff --git a/cmd/root.go b/cmd/root.go index 8c65814..0f3e264 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -38,10 +38,8 @@ func RegisterCommands(s *plugin.SDK) error { sdk.RegisterDebugRunner(&drupalDebugRunner{}) sdk.RegisterHealthcheckRunner(drupalHealthcheckRunner) sdk.RegisterIngressRouteProvider(plugin.StandardComposeWebIngressRoutesWithOptions(plugin.StandardComposeWebIngressOptions{ - AppService: "drupal", - Router: "drupal", - URLVariables: []string{"DRUPAL_DEFAULT_SITE_URL", "DRUSH_OPTIONS_URI"}, - HTTPSVariables: []string{"DRUPAL_ENABLE_HTTPS"}, + AppService: "drupal", + Router: "drupal", })) sdk.AddCommand(drushCmd) sdk.AddCommand(loginCmd) diff --git a/go.mod b/go.mod index 8b93dd2..c402ff1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/libops/sitectl-drupal go 1.26.1 require ( - github.com/libops/sitectl v0.35.1 + github.com/libops/sitectl v0.35.3 github.com/spf13/cobra v1.10.2 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 16715e2..cd6da05 100644 --- a/go.sum +++ b/go.sum @@ -102,6 +102,8 @@ github.com/libops/sitectl v0.35.0 h1:yH89aMG0lBKjbXv2uEMurvEfVzGjdhel+0wU3ICnY2o github.com/libops/sitectl v0.35.0/go.mod h1:uoXxmr3TSUYVgcWxwcFSOiDUmmKQW2ASr856dk/9yd8= github.com/libops/sitectl v0.35.1 h1:vAcrasIu8cUAbwK5ePr3/cebHxOkXA46ZEYJrod0eLg= github.com/libops/sitectl v0.35.1/go.mod h1:uoXxmr3TSUYVgcWxwcFSOiDUmmKQW2ASr856dk/9yd8= +github.com/libops/sitectl v0.35.3 h1:CdA2yaXEeC/41xcOoyPQ2Ke2pYV4+T2bJAFXxOsa/O8= +github.com/libops/sitectl v0.35.3/go.mod h1:uoXxmr3TSUYVgcWxwcFSOiDUmmKQW2ASr856dk/9yd8= github.com/lrstanley/bubblezone/v2 v2.0.0 h1:pMb9fHKs0slJF6OrzQ2hEgWusqyl9VU/S0UZ5hyh7ZA= github.com/lrstanley/bubblezone/v2 v2.0.0/go.mod h1:yV/QTjcm4Zu5cqvGvdHi7xVUfnB36w/SafOuDp57dgY= github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=