Skip to content

Commit 1c27aa6

Browse files
sylussylus
committed
chore(cleanup): Remove outdated configuration
1 parent 09a8f60 commit 1c27aa6

File tree

4 files changed

+6
-193
lines changed

4 files changed

+6
-193
lines changed

‎charts/drupal/Chart.yaml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
name: drupal
22
apiVersion: v2
33
type: application
4-
version: 1.0.0-beta13
4+
version: 1.0.0-beta14
55
appVersion: 5.2.3
6-
description: Drupal 10 variant of the Web Experience Toolkit (WxT).
6+
description: Helm Chart for deploying an enterprise-grade Drupal environment.
77
keywords:
8-
- drupal
98
- cms
10-
- wxt
9+
- drupal
1110
- http
12-
- web
13-
- application
1411
- php
15-
home: http://www.drupal.org/project/wxt
12+
- web
13+
home: http://www.drupal.org/project/drupal
1614
icon: https://bitnami.com/assets/stacks/drupal/img/drupal-stack-220x234.png
1715
sources:
18-
- https://github.com/drupalwxt/wxt
16+
- https://github.com/drupalwxt/helm-drupal
1917
maintainers:
2018
- name: sylus
2119
email: [email protected]

‎charts/drupal/conf/settings.d10.php‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -931,85 +931,6 @@
931931

932932
$settings["config_sync_directory"] = '{{ .Values.drupal.configSync.directory }}';
933933

934-
{{- if .Values.drupal.configSplit.enabled }}
935-
/**
936-
* Configuration Split for Configuration Management
937-
*
938-
* WxT is following the best practices given by Acquia for configuration
939-
* management. The "default" configuration directory should be shared between
940-
* all multi-sites, and each multisite will override this selectively using
941-
* configuration splits.
942-
*
943-
* To disable this functionality simply set the following parameters:
944-
* $wxt_override_config_dirs = FALSE;
945-
* $settings['config_sync_directory'] = $dir . "/private/config/$site_dir";
946-
*
947-
* See https://github.com/acquia/blt/blob/12.x/settings/config.settings.php
948-
* for more information.
949-
*/
950-
951-
use Drupal\wxt\Robo\Common\EnvironmentDetector;
952-
953-
if (!isset($wxt_override_config_dirs)) {
954-
$wxt_override_config_dirs = TRUE;
955-
}
956-
if ($wxt_override_config_dirs) {
957-
$config_directories['sync'] = $repo_root . "/private/config/default";
958-
$settings['config_sync_directory'] = $repo_root . "/private/config/default";
959-
}
960-
$split_filename_prefix = 'config_split.config_split';
961-
if (isset($config_directories['sync'])) {
962-
$split_filepath_prefix = $config_directories['sync'] . '/' . $split_filename_prefix;
963-
}
964-
else {
965-
$split_filepath_prefix = $settings['config_sync_directory'] . '/' . $split_filename_prefix;
966-
}
967-
968-
/**
969-
* Set environment splits.
970-
*/
971-
$split_envs = [
972-
'local',
973-
'dev',
974-
'test',
975-
'qa',
976-
'prod',
977-
'ci',
978-
];
979-
foreach ($split_envs as $split_env) {
980-
$config["$split_filename_prefix.$split_env"]['status'] = FALSE;
981-
}
982-
if (!isset($split)) {
983-
$split = 'none';
984-
if (EnvironmentDetector::isLocalEnv()) {
985-
$split = 'local';
986-
}
987-
if (EnvironmentDetector::isCiEnv()) {
988-
$split = 'ci';
989-
}
990-
if (EnvironmentDetector::isDevEnv()) {
991-
$split = 'dev';
992-
}
993-
elseif (EnvironmentDetector::isTestEnv()) {
994-
$split = 'test';
995-
}
996-
elseif (EnvironmentDetector::isQaEnv()) {
997-
$split = 'qa';
998-
}
999-
elseif (EnvironmentDetector::isProdEnv()) {
1000-
$split = 'prod';
1001-
}
1002-
}
1003-
if ($split != 'none') {
1004-
$config["$split_filename_prefix.$split"]['status'] = TRUE;
1005-
}
1006-
1007-
/**
1008-
* Set multisite split.
1009-
*/
1010-
// $config["$split_filename_prefix.SITENAME"]['status'] = TRUE;
1011-
{{- end }}
1012-
1013934
{{- if .Values.redis.enabled }}
1014935
if (extension_loaded('redis')) {
1015936
// Set Redis as the default backend for any cache bin not otherwise specified.

‎charts/drupal/conf/settings.d9.php‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -844,85 +844,6 @@
844844

845845
$settings["config_sync_directory"] = '{{ .Values.drupal.configSync.directory }}';
846846

847-
{{- if .Values.drupal.configSplit.enabled }}
848-
/**
849-
* Configuration Split for Configuration Management
850-
*
851-
* WxT is following the best practices given by Acquia for configuration
852-
* management. The "default" configuration directory should be shared between
853-
* all multi-sites, and each multisite will override this selectively using
854-
* configuration splits.
855-
*
856-
* To disable this functionality simply set the following parameters:
857-
* $wxt_override_config_dirs = FALSE;
858-
* $settings['config_sync_directory'] = $dir . "/private/config/$site_dir";
859-
*
860-
* See https://github.com/acquia/blt/blob/12.x/settings/config.settings.php
861-
* for more information.
862-
*/
863-
864-
use Drupal\wxt\Robo\Common\EnvironmentDetector;
865-
866-
if (!isset($wxt_override_config_dirs)) {
867-
$wxt_override_config_dirs = TRUE;
868-
}
869-
if ($wxt_override_config_dirs) {
870-
$config_directories['sync'] = $repo_root . "/private/config/default";
871-
$settings['config_sync_directory'] = $repo_root . "/private/config/default";
872-
}
873-
$split_filename_prefix = 'config_split.config_split';
874-
if (isset($config_directories['sync'])) {
875-
$split_filepath_prefix = $config_directories['sync'] . '/' . $split_filename_prefix;
876-
}
877-
else {
878-
$split_filepath_prefix = $settings['config_sync_directory'] . '/' . $split_filename_prefix;
879-
}
880-
881-
/**
882-
* Set environment splits.
883-
*/
884-
$split_envs = [
885-
'local',
886-
'dev',
887-
'test',
888-
'qa',
889-
'prod',
890-
'ci',
891-
];
892-
foreach ($split_envs as $split_env) {
893-
$config["$split_filename_prefix.$split_env"]['status'] = FALSE;
894-
}
895-
if (!isset($split)) {
896-
$split = 'none';
897-
if (EnvironmentDetector::isLocalEnv()) {
898-
$split = 'local';
899-
}
900-
if (EnvironmentDetector::isCiEnv()) {
901-
$split = 'ci';
902-
}
903-
if (EnvironmentDetector::isDevEnv()) {
904-
$split = 'dev';
905-
}
906-
elseif (EnvironmentDetector::isTestEnv()) {
907-
$split = 'test';
908-
}
909-
elseif (EnvironmentDetector::isQaEnv()) {
910-
$split = 'qa';
911-
}
912-
elseif (EnvironmentDetector::isProdEnv()) {
913-
$split = 'prod';
914-
}
915-
}
916-
if ($split != 'none') {
917-
$config["$split_filename_prefix.$split"]['status'] = TRUE;
918-
}
919-
920-
/**
921-
* Set multisite split.
922-
*/
923-
// $config["$split_filename_prefix.SITENAME"]['status'] = TRUE;
924-
{{- end }}
925-
926847
{{- if .Values.redis.enabled }}
927848
if (extension_loaded('redis')) {
928849
// Set Redis as the default backend for any cache bin not otherwise specified.

‎charts/drupal/templates/NOTES.txt‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,6 @@ kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush si {{ .Values.dr
5858

5959
{{- end }}
6060

61-
** Migrations
62-
63-
{{- if or (not .Values.drupal.migrate) (not .Values.drupal.install) (not .Values.drupal.reconfigure) }}
64-
65-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/instance={{ .Release.Name }},tier=drupal" -o jsonpath="{.items[0].metadata.name}")
66-
67-
# Baseline migrations for Canada.ca
68-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import wxt_file
69-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import --group wxt --tag 'Core'
70-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import --group gcweb --tag 'Core'
71-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import --group gcweb --tag 'Menu'
72-
73-
# Group migration
74-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import --group gcweb --tag 'Menu'
75-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush php-eval 'node_access_rebuild();'
76-
77-
{{- else }}
78-
79-
Default Canada.ca content migrations have been run.
80-
81-
To perform additional migrations, run:
82-
83-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/instance={{ .Release.Name }},tier=drupal" -o jsonpath="{.items[0].metadata.name}")
84-
kubectl exec -it $POD_NAME -n {{ .Release.Namespace }} -- drush migrate:import $MIGRATION
85-
86-
{{- end }}
87-
8861
** Login
8962

9063
{{- if .Values.drupal.usePasswordFiles }}

0 commit comments

Comments
 (0)