From 8c49261b2519bfaff1857713333797f365c32974 Mon Sep 17 00:00:00 2001 From: Camilo Villamizar Date: Thu, 19 Oct 2023 16:02:37 -0300 Subject: [PATCH] NATURE-19 Drupal 9 -> 10 up to step 6a from guide (FAIL) --- .dockworker/deployment/k8s/dev/cronjob.yaml | 54 --------- .../deployment/k8s/dev/deployment.yaml | 104 ------------------ .dockworker/deployment/k8s/prod/backup.yaml | 74 ------------- .dockworker/deployment/k8s/prod/cronjob.yaml | 54 --------- .../deployment/k8s/prod/deployment.yaml | 104 ------------------ .dockworker/deployment/k8s/prod/testing.yaml | 59 ---------- .dockworker/dockworker.yml | 100 +++++++++++++---- .github/workflows/deployment-workflow.yaml | 21 ++-- .github/workflows/update.yaml | 14 +++ .gitignore | 6 +- Dockerfile | 6 +- build/composer.json | 59 +++++----- composer.json | 4 +- config-yml/.gitkeep | 1 - configuration-old/.htaccess | 12 ++ .../block.block.bootstrap_account_menu.yml | 0 .../block.block.bootstrap_branding.yml | 0 .../block.block.bootstrap_breadcrumbs.yml | 0 .../block.block.bootstrap_content.yml | 0 .../block.block.bootstrap_footer.yml | 0 .../block.block.bootstrap_help.yml | 0 .../block.block.bootstrap_local_actions.yml | 0 .../block.block.bootstrap_local_tasks.yml | 0 .../block.block.bootstrap_main_menu.yml | 0 .../block.block.bootstrap_messages.yml | 0 .../block.block.bootstrap_page_title.yml | 0 .../block.block.bootstrap_powered.yml | 0 .../block.block.bootstrap_search.yml | 0 .../block.block.bootstrap_tools.yml | 0 .../block.block.breadcrumbs.yml | 0 .../block.block.help.yml | 0 .../block.block.mainnavigation.yml | 0 .../block.block.mainpagecontent.yml | 0 .../block.block.naturefooter.yml | 0 .../block.block.natureheader.yml | 0 .../block.block.pagetitle.yml | 0 .../block.block.primaryadminactions.yml | 0 .../block.block.seven_local_actions.yml | 0 .../block.block.seven_page_title.yml | 0 .../block.block.seven_primary_local_tasks.yml | 0 ...lock.block.seven_secondary_local_tasks.yml | 0 .../block.block.tabs.yml | 0 .../block.block.useraccountmenu.yml | 0 .../bootstrap.settings.yml | 0 .../colorbox.settings.yml | 0 .../contact.form.personal.yml | 0 .../contact.settings.yml | 0 ...field_override.node.basic_page.promote.yml | 0 ...se_field_override.node.gallery.promote.yml | 0 .../core.date_format.fallback.yml | 0 .../core.date_format.html_date.yml | 0 .../core.date_format.html_datetime.yml | 0 .../core.date_format.html_month.yml | 0 .../core.date_format.html_time.yml | 0 .../core.date_format.html_week.yml | 0 .../core.date_format.html_year.yml | 0 .../core.date_format.html_yearless_date.yml | 0 .../core.date_format.long.yml | 0 .../core.date_format.medium.yml | 0 .../core.date_format.short.yml | 0 ...y_form_display.node.basic_page.default.yml | 0 ...tity_form_display.node.gallery.default.yml | 0 .../core.entity_form_mode.user.register.yml | 0 ...y_view_display.node.basic_page.default.yml | 0 ...ty_view_display.node.basic_page.teaser.yml | 0 ...tity_view_display.node.gallery.default.yml | 0 ...ntity_view_display.node.gallery.teaser.yml | 0 ...re.entity_view_mode.block_content.full.yml | 0 .../core.entity_view_mode.comment.full.yml | 0 .../core.entity_view_mode.node.full.yml | 0 .../core.entity_view_mode.node.rss.yml | 0 ...ore.entity_view_mode.node.search_index.yml | 0 ...re.entity_view_mode.node.search_result.yml | 0 .../core.entity_view_mode.node.teaser.yml | 0 ...re.entity_view_mode.taxonomy_term.full.yml | 0 .../core.entity_view_mode.user.compact.yml | 0 .../core.entity_view_mode.user.full.yml | 0 .../core.extension.yml | 0 .../core.menu.static_menu_link_overrides.yml | 0 .../dblog.settings.yml | 0 .../field.field.node.basic_page.body.yml | 0 ...field.node.basic_page.field_attachment.yml | 0 .../field.field.node.gallery.field_image.yml | 0 .../field.settings.yml | 0 .../field.storage.block_content.body.yml | 0 .../field.storage.comment.comment_body.yml | 0 .../field.storage.node.body.yml | 0 .../field.storage.node.field_attachment.yml | 0 .../field.storage.node.field_image.yml | 0 .../field_ui.settings.yml | 0 .../file.settings.yml | 0 .../filter.format.basic_html.yml | 0 .../filter.format.full_html.yml | 0 .../filter.format.plain_text.yml | 0 .../filter.format.restricted_html.yml | 0 .../filter.settings.yml | 0 .../google_analytics.settings.yml | 0 .../image.settings.yml | 0 .../image.style.large.yml | 0 .../image.style.medium.yml | 0 .../image.style.thumbnail.yml | 0 .../libraries.settings.yml | 0 .../menu_ui.settings.yml | 0 .../naturesbounty_lib_unb_ca.settings.yml | 0 .../node.settings.yml | 0 .../node.type.basic_page.yml | 0 .../node.type.gallery.yml | 0 .../rdf.mapping.user.user.yml | 0 .../search.page.node_search.yml | 0 .../search.page.user_search.yml | 0 .../search.settings.yml | 0 .../system.action.comment_delete_action.yml | 0 .../system.action.comment_publish_action.yml | 0 .../system.action.comment_save_action.yml | 0 ...system.action.comment_unpublish_action.yml | 0 .../system.action.node_delete_action.yml | 0 .../system.action.node_make_sticky_action.yml | 0 ...ystem.action.node_make_unsticky_action.yml | 0 .../system.action.node_promote_action.yml | 0 .../system.action.node_publish_action.yml | 0 .../system.action.node_save_action.yml | 0 .../system.action.node_unpromote_action.yml | 0 .../system.action.node_unpublish_action.yml | 0 .../system.action.user_block_user_action.yml | 0 .../system.action.user_cancel_user_action.yml | 0 ...system.action.user_unblock_user_action.yml | 0 .../system.authorize.yml | 0 .../system.cron.yml | 0 .../system.date.yml | 0 .../system.diff.yml | 0 .../system.file.yml | 0 .../system.image.gd.yml | 0 .../system.image.yml | 0 .../system.logging.yml | 0 .../system.mail.yml | 0 .../system.maintenance.yml | 0 .../system.menu.account.yml | 0 .../system.menu.admin.yml | 0 .../system.menu.footer.yml | 0 .../system.menu.main.yml | 0 .../system.menu.tools.yml | 0 .../system.performance.yml | 0 .../system.rss.yml | 0 .../system.site.yml | 0 .../system.theme.global.yml | 0 .../system.theme.yml | 0 .../taxonomy.settings.yml | 0 .../text.settings.yml | 0 .../update.settings.yml | 0 .../user.flood.yml | 0 .../user.mail.yml | 0 .../user.role.anonymous.yml | 0 .../user.role.authenticated.yml | 0 .../user.settings.yml | 0 .../views.settings.yml | 0 .../views.view.archive.yml | 0 .../views.view.block_content.yml | 0 .../views.view.comment.yml | 0 .../views.view.comments_recent.yml | 0 .../views.view.content.yml | 0 .../views.view.content_recent.yml | 0 .../views.view.files.yml | 0 .../views.view.frontpage.yml | 0 .../views.view.glossary.yml | 0 .../views.view.taxonomy_term.yml | 0 .../views.view.user_admin_people.yml | 0 .../views.view.watchdog.yml | 0 .../views.view.who_s_new.yml | 0 .../views.view.who_s_online.yml | 0 .../modules/nature_menu/nature_menu.info.yml | 2 +- .../naturesbounty_lib_unb_ca.info.yml | 2 +- docker-compose.yml | 7 +- 172 files changed, 158 insertions(+), 525 deletions(-) delete mode 100644 .dockworker/deployment/k8s/dev/cronjob.yaml delete mode 100644 .dockworker/deployment/k8s/dev/deployment.yaml delete mode 100644 .dockworker/deployment/k8s/prod/backup.yaml delete mode 100644 .dockworker/deployment/k8s/prod/cronjob.yaml delete mode 100644 .dockworker/deployment/k8s/prod/deployment.yaml delete mode 100644 .dockworker/deployment/k8s/prod/testing.yaml create mode 100644 .github/workflows/update.yaml delete mode 100644 config-yml/.gitkeep create mode 100644 configuration-old/.htaccess rename {config-yml => configuration-old}/block.block.bootstrap_account_menu.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_branding.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_breadcrumbs.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_content.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_footer.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_help.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_local_actions.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_local_tasks.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_main_menu.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_messages.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_page_title.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_powered.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_search.yml (100%) rename {config-yml => configuration-old}/block.block.bootstrap_tools.yml (100%) rename {config-yml => configuration-old}/block.block.breadcrumbs.yml (100%) rename {config-yml => configuration-old}/block.block.help.yml (100%) rename {config-yml => configuration-old}/block.block.mainnavigation.yml (100%) rename {config-yml => configuration-old}/block.block.mainpagecontent.yml (100%) rename {config-yml => configuration-old}/block.block.naturefooter.yml (100%) rename {config-yml => configuration-old}/block.block.natureheader.yml (100%) rename {config-yml => configuration-old}/block.block.pagetitle.yml (100%) rename {config-yml => configuration-old}/block.block.primaryadminactions.yml (100%) rename {config-yml => configuration-old}/block.block.seven_local_actions.yml (100%) rename {config-yml => configuration-old}/block.block.seven_page_title.yml (100%) rename {config-yml => configuration-old}/block.block.seven_primary_local_tasks.yml (100%) rename {config-yml => configuration-old}/block.block.seven_secondary_local_tasks.yml (100%) rename {config-yml => configuration-old}/block.block.tabs.yml (100%) rename {config-yml => configuration-old}/block.block.useraccountmenu.yml (100%) rename {config-yml => configuration-old}/bootstrap.settings.yml (100%) rename {config-yml => configuration-old}/colorbox.settings.yml (100%) rename {config-yml => configuration-old}/contact.form.personal.yml (100%) rename {config-yml => configuration-old}/contact.settings.yml (100%) rename {config-yml => configuration-old}/core.base_field_override.node.basic_page.promote.yml (100%) rename {config-yml => configuration-old}/core.base_field_override.node.gallery.promote.yml (100%) rename {config-yml => configuration-old}/core.date_format.fallback.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_date.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_datetime.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_month.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_time.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_week.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_year.yml (100%) rename {config-yml => configuration-old}/core.date_format.html_yearless_date.yml (100%) rename {config-yml => configuration-old}/core.date_format.long.yml (100%) rename {config-yml => configuration-old}/core.date_format.medium.yml (100%) rename {config-yml => configuration-old}/core.date_format.short.yml (100%) rename {config-yml => configuration-old}/core.entity_form_display.node.basic_page.default.yml (100%) rename {config-yml => configuration-old}/core.entity_form_display.node.gallery.default.yml (100%) rename {config-yml => configuration-old}/core.entity_form_mode.user.register.yml (100%) rename {config-yml => configuration-old}/core.entity_view_display.node.basic_page.default.yml (100%) rename {config-yml => configuration-old}/core.entity_view_display.node.basic_page.teaser.yml (100%) rename {config-yml => configuration-old}/core.entity_view_display.node.gallery.default.yml (100%) rename {config-yml => configuration-old}/core.entity_view_display.node.gallery.teaser.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.block_content.full.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.comment.full.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.node.full.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.node.rss.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.node.search_index.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.node.search_result.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.node.teaser.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.taxonomy_term.full.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.user.compact.yml (100%) rename {config-yml => configuration-old}/core.entity_view_mode.user.full.yml (100%) rename {config-yml => configuration-old}/core.extension.yml (100%) rename {config-yml => configuration-old}/core.menu.static_menu_link_overrides.yml (100%) rename {config-yml => configuration-old}/dblog.settings.yml (100%) rename {config-yml => configuration-old}/field.field.node.basic_page.body.yml (100%) rename {config-yml => configuration-old}/field.field.node.basic_page.field_attachment.yml (100%) rename {config-yml => configuration-old}/field.field.node.gallery.field_image.yml (100%) rename {config-yml => configuration-old}/field.settings.yml (100%) rename {config-yml => configuration-old}/field.storage.block_content.body.yml (100%) rename {config-yml => configuration-old}/field.storage.comment.comment_body.yml (100%) rename {config-yml => configuration-old}/field.storage.node.body.yml (100%) rename {config-yml => configuration-old}/field.storage.node.field_attachment.yml (100%) rename {config-yml => configuration-old}/field.storage.node.field_image.yml (100%) rename {config-yml => configuration-old}/field_ui.settings.yml (100%) rename {config-yml => configuration-old}/file.settings.yml (100%) rename {config-yml => configuration-old}/filter.format.basic_html.yml (100%) rename {config-yml => configuration-old}/filter.format.full_html.yml (100%) rename {config-yml => configuration-old}/filter.format.plain_text.yml (100%) rename {config-yml => configuration-old}/filter.format.restricted_html.yml (100%) rename {config-yml => configuration-old}/filter.settings.yml (100%) rename {config-yml => configuration-old}/google_analytics.settings.yml (100%) rename {config-yml => configuration-old}/image.settings.yml (100%) rename {config-yml => configuration-old}/image.style.large.yml (100%) rename {config-yml => configuration-old}/image.style.medium.yml (100%) rename {config-yml => configuration-old}/image.style.thumbnail.yml (100%) rename {config-yml => configuration-old}/libraries.settings.yml (100%) rename {config-yml => configuration-old}/menu_ui.settings.yml (100%) rename {config-yml => configuration-old}/naturesbounty_lib_unb_ca.settings.yml (100%) rename {config-yml => configuration-old}/node.settings.yml (100%) rename {config-yml => configuration-old}/node.type.basic_page.yml (100%) rename {config-yml => configuration-old}/node.type.gallery.yml (100%) rename {config-yml => configuration-old}/rdf.mapping.user.user.yml (100%) rename {config-yml => configuration-old}/search.page.node_search.yml (100%) rename {config-yml => configuration-old}/search.page.user_search.yml (100%) rename {config-yml => configuration-old}/search.settings.yml (100%) rename {config-yml => configuration-old}/system.action.comment_delete_action.yml (100%) rename {config-yml => configuration-old}/system.action.comment_publish_action.yml (100%) rename {config-yml => configuration-old}/system.action.comment_save_action.yml (100%) rename {config-yml => configuration-old}/system.action.comment_unpublish_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_delete_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_make_sticky_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_make_unsticky_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_promote_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_publish_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_save_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_unpromote_action.yml (100%) rename {config-yml => configuration-old}/system.action.node_unpublish_action.yml (100%) rename {config-yml => configuration-old}/system.action.user_block_user_action.yml (100%) rename {config-yml => configuration-old}/system.action.user_cancel_user_action.yml (100%) rename {config-yml => configuration-old}/system.action.user_unblock_user_action.yml (100%) rename {config-yml => configuration-old}/system.authorize.yml (100%) rename {config-yml => configuration-old}/system.cron.yml (100%) rename {config-yml => configuration-old}/system.date.yml (100%) rename {config-yml => configuration-old}/system.diff.yml (100%) rename {config-yml => configuration-old}/system.file.yml (100%) rename {config-yml => configuration-old}/system.image.gd.yml (100%) rename {config-yml => configuration-old}/system.image.yml (100%) rename {config-yml => configuration-old}/system.logging.yml (100%) rename {config-yml => configuration-old}/system.mail.yml (100%) rename {config-yml => configuration-old}/system.maintenance.yml (100%) rename {config-yml => configuration-old}/system.menu.account.yml (100%) rename {config-yml => configuration-old}/system.menu.admin.yml (100%) rename {config-yml => configuration-old}/system.menu.footer.yml (100%) rename {config-yml => configuration-old}/system.menu.main.yml (100%) rename {config-yml => configuration-old}/system.menu.tools.yml (100%) rename {config-yml => configuration-old}/system.performance.yml (100%) rename {config-yml => configuration-old}/system.rss.yml (100%) rename {config-yml => configuration-old}/system.site.yml (100%) rename {config-yml => configuration-old}/system.theme.global.yml (100%) rename {config-yml => configuration-old}/system.theme.yml (100%) rename {config-yml => configuration-old}/taxonomy.settings.yml (100%) rename {config-yml => configuration-old}/text.settings.yml (100%) rename {config-yml => configuration-old}/update.settings.yml (100%) rename {config-yml => configuration-old}/user.flood.yml (100%) rename {config-yml => configuration-old}/user.mail.yml (100%) rename {config-yml => configuration-old}/user.role.anonymous.yml (100%) rename {config-yml => configuration-old}/user.role.authenticated.yml (100%) rename {config-yml => configuration-old}/user.settings.yml (100%) rename {config-yml => configuration-old}/views.settings.yml (100%) rename {config-yml => configuration-old}/views.view.archive.yml (100%) rename {config-yml => configuration-old}/views.view.block_content.yml (100%) rename {config-yml => configuration-old}/views.view.comment.yml (100%) rename {config-yml => configuration-old}/views.view.comments_recent.yml (100%) rename {config-yml => configuration-old}/views.view.content.yml (100%) rename {config-yml => configuration-old}/views.view.content_recent.yml (100%) rename {config-yml => configuration-old}/views.view.files.yml (100%) rename {config-yml => configuration-old}/views.view.frontpage.yml (100%) rename {config-yml => configuration-old}/views.view.glossary.yml (100%) rename {config-yml => configuration-old}/views.view.taxonomy_term.yml (100%) rename {config-yml => configuration-old}/views.view.user_admin_people.yml (100%) rename {config-yml => configuration-old}/views.view.watchdog.yml (100%) rename {config-yml => configuration-old}/views.view.who_s_new.yml (100%) rename {config-yml => configuration-old}/views.view.who_s_online.yml (100%) diff --git a/.dockworker/deployment/k8s/dev/cronjob.yaml b/.dockworker/deployment/k8s/dev/cronjob.yaml deleted file mode 100644 index f328d94..0000000 --- a/.dockworker/deployment/k8s/dev/cronjob.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-naturesbounty-lib-unb-ca - namespace: dev - labels: - app: drupal - tier: cron -spec: - schedule: "13,28,43,58 * * * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-naturesbounty-lib-unb-ca - labels: - app: drupal - tier: cron - spec: - template: - spec: - nodeSelector: - deploy_cron: 'true' - containers: - - - name: cron-naturesbounty-lib-unb-ca - command: - - /scripts/drupalCronEntry.sh - env: - - - name: DEPLOY_ENV - value: dev - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - image: "||DEPLOYMENTIMAGE||" - imagePullPolicy: Always - volumeMounts: - - - mountPath: /app/html/sites/default - name: drupal-persistent-storage - priorityClassName: cron-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Never - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: naturesbounty-lib-unb-ca diff --git a/.dockworker/deployment/k8s/dev/deployment.yaml b/.dockworker/deployment/k8s/dev/deployment.yaml deleted file mode 100644 index 6c4fcc6..0000000 --- a/.dockworker/deployment/k8s/dev/deployment.yaml +++ /dev/null @@ -1,104 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: drupal - appMajor: "9" - instance: naturesbounty.lib.unb.ca - tier: frontend - uri: dev-naturesbounty.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: naturesbounty.lib.unb.ca - vcsRef: dev - name: naturesbounty-lib-unb-ca - namespace: dev -spec: - selector: - matchLabels: - uri: dev-naturesbounty.lib.unb.ca - replicas: 1 - revisionHistoryLimit: 2 - minReadySeconds: 30 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: drupal - appMajor: "9" - instance: naturesbounty.lib.unb.ca - tier: frontend - uri: dev-naturesbounty.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: naturesbounty.lib.unb.ca - vcsRef: dev - spec: - nodeSelector: - deploy_dev: 'true' - containers: - - - name: naturesbounty-lib-unb-ca - readinessProbe: - httpGet: - path: /health - port: 80 - initialDelaySeconds: 30 - timeoutSeconds: 3 - periodSeconds: 15 - livenessProbe: - httpGet: - path: /health - port: 80 - initialDelaySeconds: 100 - timeoutSeconds: 3 - periodSeconds: 15 - startupProbe: - httpGet: - path: /health - port: 80 - failureThreshold: 30 - periodSeconds: 10 - env: - - - name: DEPLOY_ENV - value: dev - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: mysql - key: root-password - - - name: NR_INSTALL_KEY - valueFrom: - secretKeyRef: - name: newrelic - key: install-key - image: "||DEPLOYMENTIMAGE||" - imagePullPolicy: Always - ports: - - - containerPort: 80 - volumeMounts: - - - mountPath: /app/html/sites/default - name: drupal-persistent-storage - priorityClassName: dev-low-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Always - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: naturesbounty-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/backup.yaml b/.dockworker/deployment/k8s/prod/backup.yaml deleted file mode 100644 index 225654c..0000000 --- a/.dockworker/deployment/k8s/prod/backup.yaml +++ /dev/null @@ -1,74 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: monthly-backup-naturesbounty-lib-unb-ca - namespace: prod - labels: - app: drupal - tier: backup -spec: - schedule: "15 03 5 * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: monthly-backup-naturesbounty-lib-unb-ca - labels: - app: drupal - tier: backup - spec: - template: - spec: - nodeSelector: - deploy_backup: 'true' - containers: - - - name: monthly-backup-naturesbounty-lib-unb-ca - args: ["monthly"] - env: - - - name: DEPLOY_ENV - value: prod - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - - - name: MYSQL_DATABASE - value: nbounty_db - - - name: MYSQL_USER_NAME - value: root - - - name: MYSQL_USER_PASSWORD - valueFrom: - secretKeyRef: - name: mysql - key: root-password - - - name: RSNAPSHOT_RETAIN_HOURLY - value: "0" - - - name: RSNAPSHOT_RETAIN_DAILY - value: "0" - - - name: RSNAPSHOT_RETAIN_WEEKLY - value: "0" - image: "ghcr.io/unb-libraries/mysql-backup:latest" - imagePullPolicy: Always - volumeMounts: - - - mountPath: /data - name: backup-persistent-storage - priorityClassName: backup-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Never - volumes: - - - name: backup-persistent-storage - persistentVolumeClaim: - claimName: backup-naturesbounty-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/cronjob.yaml b/.dockworker/deployment/k8s/prod/cronjob.yaml deleted file mode 100644 index 21a8923..0000000 --- a/.dockworker/deployment/k8s/prod/cronjob.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-naturesbounty-lib-unb-ca - namespace: prod - labels: - app: drupal - tier: cron -spec: - schedule: "13,28,43,58 * * * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-naturesbounty-lib-unb-ca - labels: - app: drupal - tier: cron - spec: - template: - spec: - nodeSelector: - deploy_cron: 'true' - containers: - - - name: cron-naturesbounty-lib-unb-ca - command: - - /scripts/drupalCronEntry.sh - env: - - - name: DEPLOY_ENV - value: prod - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - image: "||DEPLOYMENTIMAGE||" - imagePullPolicy: Always - volumeMounts: - - - mountPath: /app/html/sites/default - name: drupal-persistent-storage - priorityClassName: cron-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Never - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: naturesbounty-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/deployment.yaml b/.dockworker/deployment/k8s/prod/deployment.yaml deleted file mode 100644 index a1afe8c..0000000 --- a/.dockworker/deployment/k8s/prod/deployment.yaml +++ /dev/null @@ -1,104 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: drupal - appMajor: "9" - instance: naturesbounty.lib.unb.ca - tier: frontend - uri: naturesbounty.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: naturesbounty.lib.unb.ca - vcsRef: prod - name: naturesbounty-lib-unb-ca - namespace: prod -spec: - selector: - matchLabels: - uri: naturesbounty.lib.unb.ca - replicas: 1 - revisionHistoryLimit: 2 - minReadySeconds: 30 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: drupal - appMajor: "9" - instance: naturesbounty.lib.unb.ca - tier: frontend - uri: naturesbounty.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: naturesbounty.lib.unb.ca - vcsRef: prod - spec: - nodeSelector: - deploy_prod: 'true' - containers: - - - name: naturesbounty-lib-unb-ca - readinessProbe: - httpGet: - path: /health - port: 80 - initialDelaySeconds: 30 - timeoutSeconds: 3 - periodSeconds: 15 - livenessProbe: - httpGet: - path: /health - port: 80 - initialDelaySeconds: 100 - timeoutSeconds: 3 - periodSeconds: 15 - startupProbe: - httpGet: - path: /health - port: 80 - failureThreshold: 30 - periodSeconds: 10 - env: - - - name: DEPLOY_ENV - value: prod - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: mysql - key: root-password - - - name: NR_INSTALL_KEY - valueFrom: - secretKeyRef: - name: newrelic - key: install-key - image: "||DEPLOYMENTIMAGE||" - imagePullPolicy: Always - ports: - - - containerPort: 80 - volumeMounts: - - - mountPath: /app/html/sites/default - name: drupal-persistent-storage - priorityClassName: low-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Always - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: naturesbounty-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/testing.yaml b/.dockworker/deployment/k8s/prod/testing.yaml deleted file mode 100644 index 4782755..0000000 --- a/.dockworker/deployment/k8s/prod/testing.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-testing-naturesbounty-lib-unb-ca - namespace: testing - labels: - app: cypress - tier: cron -spec: - schedule: '*/5 * * * *' - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-testing-naturesbounty-lib-unb-ca - labels: - app: cypress - tier: cron - spec: - backoffLimit: 0 - template: - spec: - nodeSelector: - environment: testing - containers: - - name: cron-testing-naturesbounty-lib-unb-ca - env: - - name: CYPRESS_REPORTER_VERBOSITY - value: "20" - - name: CYPRESS_SPEC_FILE - valueFrom: - secretKeyRef: - name: naturesbounty-lib-unb-ca-cypress - key: file - - name: CYPRESS_SPEC_FILE_NAME - valueFrom: - secretKeyRef: - name: naturesbounty-lib-unb-ca-cypress - key: file_name - - name: DEPLOY_ENV - value: testing - - name: MONGODB_CONNECT_URI - valueFrom: - secretKeyRef: - name: mongodb - key: connect-uri - image: ghcr.io/unb-libraries/cypress.status.lib.unb.ca:prod - imagePullPolicy: Always - volumeMounts: - - mountPath: /usr/src/reports - name: cypress-persistent-storage - priorityClassName: cron-priority-services - imagePullSecrets: - - name: github-container-registry-auth - restartPolicy: Never - volumes: - - name: cypress-persistent-storage - persistentVolumeClaim: - claimName: status-lib-unb-ca diff --git a/.dockworker/dockworker.yml b/.dockworker/dockworker.yml index 6b6d2f3..dc57ab2 100644 --- a/.dockworker/dockworker.yml +++ b/.dockworker/dockworker.yml @@ -1,28 +1,80 @@ dockworker: - version: '5' + version: '6' application: - name: naturesbounty.lib.unb.ca - finish_marker: '99_zz_notify_user_URI' - project_prefix: NATURE - upstream_images: - - ghcr.io/unb-libraries/drupal:9.x-2.x-unblib - uuid: 3098 - deployment: - environments: + name: Nature's Bounty - Four Centuries of Plant Exploration in New Brunswick + uri: https://naturesbounty.lib.unb.ca + description: > + This study of plant exploration in New Brunswick from 1604 to 2000 is placed + firmly within a regional framework. It encompasses short biographical sketches + and tells the stories of naturalists and botanists in the light of the times + in which they lived. The account illustrates the development of the science of + botany and shows how, as museums and learning centres were established in the + new land, North Americans became masters in their own house, taking over the + botanical enquiry that had previously been the prerogative of Europeans. It + examines early ecological studies and curious anomalies of plant distribution, + as well as the modern-day emphasis on plant diversity and the need for + conservation. It embodies implicit lessons that speak to our present-day + concerns with climate change and the environment. Finally, it claims a place + for early UNB botanists and for New Brunswick in botanical and environmental historiography. + topics: + - botany + - history + - research + identifiers: + id: naturesbounty.lib.unb.ca + slug: naturesbounty-lib-unb-ca + short_slug: NATURE + uuid: 3094 + framework: + name: Drupal + version: 10 + startup_finished_marker: '99_startup_sequence_complete' + endpoint: + name: http + port: 80 + readiness_timeout: 15 + license: + license: MIT + holder: University of New Brunswick Libraries + shell: + path: /bin/sh + endpoints: + env: - dev - prod - workflow: - source: dockworker-drupal - type: deployment-workflow - drupal: - major: 9 - github: - repo: naturesbounty.lib.unb.ca - owner: unb-libraries - image: - push_branches: - - dev - - prod - name: ghcr.io/unb-libraries/naturesbounty.lib.unb.ca - date_tag_image: true - repository: ghcr + deployments: + naturesbounty-lib-unb-ca: + default: true + managed: true + name: naturesbounty-lib-unb-ca + drupal-mysql-lib-unb-ca: + managed: false + name: mysql + drupal-redis-lib-unb-ca: + managed: false + name: redis + drupal-solr-lib-unb-ca: + managed: false + name: solr + workflows: + vcs: + type: github + owner: unb-libraries + name: naturesbounty.lib.unb.ca + jira: + project_keys: + - NATURESBOUNTY + image: + name: ghcr.io/unb-libraries/naturesbounty.lib.unb.ca + parent: ghcr.io/unb-libraries/drupal:10.x-1.x-unblib + repository: GitHub + push-branches: + - dev + - prod + e2e_tests: + - id: core + frequency: '*/5 * * * *' + source_files: + - .dockworker/tests/e2e/naturesbounty.lib.unb.ca.yml + namespaces: + - prod \ No newline at end of file diff --git a/.github/workflows/deployment-workflow.yaml b/.github/workflows/deployment-workflow.yaml index ab3d477..0ac9853 100644 --- a/.github/workflows/deployment-workflow.yaml +++ b/.github/workflows/deployment-workflow.yaml @@ -1,4 +1,4 @@ -name: naturesbounty.lib.unb.ca +name: Deploy naturesbounty.lib.unb.ca on: pull_request: @@ -6,16 +6,17 @@ on: workflow_dispatch: jobs: - drupal: - uses: unb-libraries/dockworker-drupal/.github/workflows/deployment-workflow.yaml@5.x + deploy: + uses: unb-libraries/dockworker/.github/workflows/build-push-deploy-notify.yaml@6.x with: + branch-env-map: '{"dev":"dev","prod":"prod"}' + build-themes: true deploy-branches: '["dev","prod"]' + image-name: 'ghcr.io/unb-libraries/naturesbounty.lib.unb.ca' + k8s-deployment-name: 'naturesbounty-lib-unb-ca' + push-branches: '["dev","prod"]' secrets: - DOCKER_CLOUD_ACCESS_TOKEN: ${{ secrets.DOCKER_CLOUD_ACCESS_TOKEN }} - DOCKER_CLOUD_USER_NAME: ${{ secrets.DOCKER_CLOUD_USER_NAME }} - GH_CONTAINER_REGISTRY_TOKEN: ${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }} - GH_CONTAINER_REGISTRY_USER: ${{ secrets.GH_CONTAINER_REGISTRY_USER }} - KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_DATA }} - NEW_RELIC_ACCOUNT_ID: ${{ secrets.NEW_RELIC_ACCOUNT_ID }} - NEW_RELIC_API_KEY: ${{ secrets.NEW_RELIC_API_KEY }} + KUBE_CONFIG: ${{ secrets.KUBE_CONFIG_DATA }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + GH_CONTAINER_REGISTRY_USER: ${{ secrets.GH_CONTAINER_REGISTRY_USER }} + GH_CONTAINER_REGISTRY_TOKEN: ${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }} diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml new file mode 100644 index 0000000..3fae357 --- /dev/null +++ b/.github/workflows/update.yaml @@ -0,0 +1,14 @@ +name: Update naturesbounty.lib.unb.ca + +on: + workflow_dispatch: + schedule: + - cron: '48 5 * * 1,4' + +jobs: + deploy: + uses: unb-libraries/dockworker/.github/workflows/update.yaml@6.x + with: + add-paths: 'build/composer.*' + secrets: + PAT_TOKEN: ${{ secrets.UNBLIBBOT_PAT_TOKEN }} diff --git a/.gitignore b/.gitignore index c83ca54..8d9f904 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ .gitkeep vendor -composer.lock +/composer.lock tests/behat/features/bootstrap scripts/local .idea -config-yml/.htaccess +configuration/.htaccess +build/vendor +!configuration \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 361d222..b54a030 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM ghcr.io/unb-libraries/drupal:9.x-2.x-unblib +FROM ghcr.io/unb-libraries/drupal:10.x-1.x-unblib MAINTAINER UNB Libraries # Install additional OS packages. -ENV ADDITIONAL_OS_PACKAGES postfix php7-ldap php7-redis +ENV ADDITIONAL_OS_PACKAGES postfix php-ldap php81-pecl-redis ENV DRUPAL_SITE_ID nbounty ENV DRUPAL_SITE_URI naturesbounty.lib.unb.ca ENV DRUPAL_SITE_UUID 5386f767-6440-4d7e-8eb2-5578c3ae27c0 @@ -16,7 +16,7 @@ RUN ${RSYNC_MOVE} /build/scripts/container/ /scripts/ && \ /scripts/build.sh # Deploy configuration. -COPY ./config-yml ${DRUPAL_CONFIGURATION_DIR} +COPY ./configuration ${DRUPAL_CONFIGURATION_DIR} RUN /scripts/pre-init.d/72_secure_config_sync_dir.sh # Deploy custom modules, themes. diff --git a/build/composer.json b/build/composer.json index 6813810..169fe39 100644 --- a/build/composer.json +++ b/build/composer.json @@ -15,8 +15,9 @@ "composer/installers": true, "cweagans/composer-patches": true, "dealerdirect/phpcodesniffer-composer-installer": true, - "drupal/core-composer-scaffold": true - }, + "drupal/core-composer-scaffold": true, + "phpstan/extension-installer": true + }, "discard-changes": true, "preferred-install": { "*": "dist" @@ -28,14 +29,16 @@ }, "description": "Drupal 8 component of naturesbounty.lib.unb.ca", "extra": { + "drupal-scaffold": { + "locations": { + "web-root": "./" + } + }, "enable-patching": true, "installer-paths": { "core": [ "type:drupal-core" ], - "drush/contrib/{$name}": [ - "type:drupal-drush" - ], "libraries/{$name}": [ "type:drupal-library" ], @@ -47,6 +50,18 @@ ], "themes/contrib/{$name}": [ "type:drupal-theme" + ], + "Commands/contrib/{$name}": [ + "type:drupal-drush" + ], + "modules/custom/{$name}": [ + "type:drupal-custom-module" + ], + "profiles/custom/{$name}": [ + "type:drupal-custom-profile" + ], + "themes/custom/{$name}": [ + "type:drupal-custom-theme" ] }, "patches": {} @@ -77,34 +92,20 @@ } ], "require": { - "drupal/bootstrap": "3.25", - "drupal/colorbox": "1.10", - "drupal/colorbox_inline": "1.2", - "drupal/core": "9.5.8", + "drupal/bootstrap": "^3", + "drupal/colorbox": "^1", + "drupal/colorbox_inline": "^1", + "drupal/core": "10.0.3", + "drupal/core-composer-scaffold": "^10", + "drupal/core-recommended": "^10", "drupal/google_analytics": "^4", - "drupal/health_check": "1.3", + "drupal/health_check": "^1", "drupal/libraries": "3.x.dev", - "drupal/redis": "1.6", - "jackmoore/colorbox": "1.6.4", - "unb-libraries/drupal-builder": "^9" + "drupal/redis": "^1", + "jackmoore/colorbox": "^1" }, "require-dev": { - "unb-libraries/drupal-development-libraries": "^9" - }, - "scripts": { - "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", - "post-install-cmd": [ - "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" - ], - "post-update-cmd": [ - "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" - ], - "pre-install-cmd": [ - "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" - ], - "pre-update-cmd": [ - "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" - ] + "unb-libraries/drupal-development-libraries": "^10" }, "type": "project" } diff --git a/composer.json b/composer.json index 8eeeafc..b9c6698 100644 --- a/composer.json +++ b/composer.json @@ -14,11 +14,11 @@ "name": "unb-libraries/naturesbounty.lib.unb.ca", "prefer-stable": true, "require-dev": { - "unb-libraries/dockworker-drupal": "^5" + "unb-libraries/dockworker-drupal": "^6" }, "scripts": { "post-update-cmd": [ - "vendor/bin/dockworker dockworker:git:setup-hooks" + "vendor/bin/dockworker git:setup-hooks" ] } } diff --git a/config-yml/.gitkeep b/config-yml/.gitkeep deleted file mode 100644 index e166442..0000000 --- a/config-yml/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -.gitkeep diff --git a/configuration-old/.htaccess b/configuration-old/.htaccess new file mode 100644 index 0000000..32a549b --- /dev/null +++ b/configuration-old/.htaccess @@ -0,0 +1,12 @@ +# Turn off all options we don't need. +Options -Indexes -ExecCGI -Includes -MultiViews +# Set the catch-all handler to prevent scripts from being executed. +SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 + + # Override the handler again if we're run later in the evaluation list. + SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 + +# If we know how to do it safely, disable the PHP engine entirely. + + php_flag engine off + diff --git a/config-yml/block.block.bootstrap_account_menu.yml b/configuration-old/block.block.bootstrap_account_menu.yml similarity index 100% rename from config-yml/block.block.bootstrap_account_menu.yml rename to configuration-old/block.block.bootstrap_account_menu.yml diff --git a/config-yml/block.block.bootstrap_branding.yml b/configuration-old/block.block.bootstrap_branding.yml similarity index 100% rename from config-yml/block.block.bootstrap_branding.yml rename to configuration-old/block.block.bootstrap_branding.yml diff --git a/config-yml/block.block.bootstrap_breadcrumbs.yml b/configuration-old/block.block.bootstrap_breadcrumbs.yml similarity index 100% rename from config-yml/block.block.bootstrap_breadcrumbs.yml rename to configuration-old/block.block.bootstrap_breadcrumbs.yml diff --git a/config-yml/block.block.bootstrap_content.yml b/configuration-old/block.block.bootstrap_content.yml similarity index 100% rename from config-yml/block.block.bootstrap_content.yml rename to configuration-old/block.block.bootstrap_content.yml diff --git a/config-yml/block.block.bootstrap_footer.yml b/configuration-old/block.block.bootstrap_footer.yml similarity index 100% rename from config-yml/block.block.bootstrap_footer.yml rename to configuration-old/block.block.bootstrap_footer.yml diff --git a/config-yml/block.block.bootstrap_help.yml b/configuration-old/block.block.bootstrap_help.yml similarity index 100% rename from config-yml/block.block.bootstrap_help.yml rename to configuration-old/block.block.bootstrap_help.yml diff --git a/config-yml/block.block.bootstrap_local_actions.yml b/configuration-old/block.block.bootstrap_local_actions.yml similarity index 100% rename from config-yml/block.block.bootstrap_local_actions.yml rename to configuration-old/block.block.bootstrap_local_actions.yml diff --git a/config-yml/block.block.bootstrap_local_tasks.yml b/configuration-old/block.block.bootstrap_local_tasks.yml similarity index 100% rename from config-yml/block.block.bootstrap_local_tasks.yml rename to configuration-old/block.block.bootstrap_local_tasks.yml diff --git a/config-yml/block.block.bootstrap_main_menu.yml b/configuration-old/block.block.bootstrap_main_menu.yml similarity index 100% rename from config-yml/block.block.bootstrap_main_menu.yml rename to configuration-old/block.block.bootstrap_main_menu.yml diff --git a/config-yml/block.block.bootstrap_messages.yml b/configuration-old/block.block.bootstrap_messages.yml similarity index 100% rename from config-yml/block.block.bootstrap_messages.yml rename to configuration-old/block.block.bootstrap_messages.yml diff --git a/config-yml/block.block.bootstrap_page_title.yml b/configuration-old/block.block.bootstrap_page_title.yml similarity index 100% rename from config-yml/block.block.bootstrap_page_title.yml rename to configuration-old/block.block.bootstrap_page_title.yml diff --git a/config-yml/block.block.bootstrap_powered.yml b/configuration-old/block.block.bootstrap_powered.yml similarity index 100% rename from config-yml/block.block.bootstrap_powered.yml rename to configuration-old/block.block.bootstrap_powered.yml diff --git a/config-yml/block.block.bootstrap_search.yml b/configuration-old/block.block.bootstrap_search.yml similarity index 100% rename from config-yml/block.block.bootstrap_search.yml rename to configuration-old/block.block.bootstrap_search.yml diff --git a/config-yml/block.block.bootstrap_tools.yml b/configuration-old/block.block.bootstrap_tools.yml similarity index 100% rename from config-yml/block.block.bootstrap_tools.yml rename to configuration-old/block.block.bootstrap_tools.yml diff --git a/config-yml/block.block.breadcrumbs.yml b/configuration-old/block.block.breadcrumbs.yml similarity index 100% rename from config-yml/block.block.breadcrumbs.yml rename to configuration-old/block.block.breadcrumbs.yml diff --git a/config-yml/block.block.help.yml b/configuration-old/block.block.help.yml similarity index 100% rename from config-yml/block.block.help.yml rename to configuration-old/block.block.help.yml diff --git a/config-yml/block.block.mainnavigation.yml b/configuration-old/block.block.mainnavigation.yml similarity index 100% rename from config-yml/block.block.mainnavigation.yml rename to configuration-old/block.block.mainnavigation.yml diff --git a/config-yml/block.block.mainpagecontent.yml b/configuration-old/block.block.mainpagecontent.yml similarity index 100% rename from config-yml/block.block.mainpagecontent.yml rename to configuration-old/block.block.mainpagecontent.yml diff --git a/config-yml/block.block.naturefooter.yml b/configuration-old/block.block.naturefooter.yml similarity index 100% rename from config-yml/block.block.naturefooter.yml rename to configuration-old/block.block.naturefooter.yml diff --git a/config-yml/block.block.natureheader.yml b/configuration-old/block.block.natureheader.yml similarity index 100% rename from config-yml/block.block.natureheader.yml rename to configuration-old/block.block.natureheader.yml diff --git a/config-yml/block.block.pagetitle.yml b/configuration-old/block.block.pagetitle.yml similarity index 100% rename from config-yml/block.block.pagetitle.yml rename to configuration-old/block.block.pagetitle.yml diff --git a/config-yml/block.block.primaryadminactions.yml b/configuration-old/block.block.primaryadminactions.yml similarity index 100% rename from config-yml/block.block.primaryadminactions.yml rename to configuration-old/block.block.primaryadminactions.yml diff --git a/config-yml/block.block.seven_local_actions.yml b/configuration-old/block.block.seven_local_actions.yml similarity index 100% rename from config-yml/block.block.seven_local_actions.yml rename to configuration-old/block.block.seven_local_actions.yml diff --git a/config-yml/block.block.seven_page_title.yml b/configuration-old/block.block.seven_page_title.yml similarity index 100% rename from config-yml/block.block.seven_page_title.yml rename to configuration-old/block.block.seven_page_title.yml diff --git a/config-yml/block.block.seven_primary_local_tasks.yml b/configuration-old/block.block.seven_primary_local_tasks.yml similarity index 100% rename from config-yml/block.block.seven_primary_local_tasks.yml rename to configuration-old/block.block.seven_primary_local_tasks.yml diff --git a/config-yml/block.block.seven_secondary_local_tasks.yml b/configuration-old/block.block.seven_secondary_local_tasks.yml similarity index 100% rename from config-yml/block.block.seven_secondary_local_tasks.yml rename to configuration-old/block.block.seven_secondary_local_tasks.yml diff --git a/config-yml/block.block.tabs.yml b/configuration-old/block.block.tabs.yml similarity index 100% rename from config-yml/block.block.tabs.yml rename to configuration-old/block.block.tabs.yml diff --git a/config-yml/block.block.useraccountmenu.yml b/configuration-old/block.block.useraccountmenu.yml similarity index 100% rename from config-yml/block.block.useraccountmenu.yml rename to configuration-old/block.block.useraccountmenu.yml diff --git a/config-yml/bootstrap.settings.yml b/configuration-old/bootstrap.settings.yml similarity index 100% rename from config-yml/bootstrap.settings.yml rename to configuration-old/bootstrap.settings.yml diff --git a/config-yml/colorbox.settings.yml b/configuration-old/colorbox.settings.yml similarity index 100% rename from config-yml/colorbox.settings.yml rename to configuration-old/colorbox.settings.yml diff --git a/config-yml/contact.form.personal.yml b/configuration-old/contact.form.personal.yml similarity index 100% rename from config-yml/contact.form.personal.yml rename to configuration-old/contact.form.personal.yml diff --git a/config-yml/contact.settings.yml b/configuration-old/contact.settings.yml similarity index 100% rename from config-yml/contact.settings.yml rename to configuration-old/contact.settings.yml diff --git a/config-yml/core.base_field_override.node.basic_page.promote.yml b/configuration-old/core.base_field_override.node.basic_page.promote.yml similarity index 100% rename from config-yml/core.base_field_override.node.basic_page.promote.yml rename to configuration-old/core.base_field_override.node.basic_page.promote.yml diff --git a/config-yml/core.base_field_override.node.gallery.promote.yml b/configuration-old/core.base_field_override.node.gallery.promote.yml similarity index 100% rename from config-yml/core.base_field_override.node.gallery.promote.yml rename to configuration-old/core.base_field_override.node.gallery.promote.yml diff --git a/config-yml/core.date_format.fallback.yml b/configuration-old/core.date_format.fallback.yml similarity index 100% rename from config-yml/core.date_format.fallback.yml rename to configuration-old/core.date_format.fallback.yml diff --git a/config-yml/core.date_format.html_date.yml b/configuration-old/core.date_format.html_date.yml similarity index 100% rename from config-yml/core.date_format.html_date.yml rename to configuration-old/core.date_format.html_date.yml diff --git a/config-yml/core.date_format.html_datetime.yml b/configuration-old/core.date_format.html_datetime.yml similarity index 100% rename from config-yml/core.date_format.html_datetime.yml rename to configuration-old/core.date_format.html_datetime.yml diff --git a/config-yml/core.date_format.html_month.yml b/configuration-old/core.date_format.html_month.yml similarity index 100% rename from config-yml/core.date_format.html_month.yml rename to configuration-old/core.date_format.html_month.yml diff --git a/config-yml/core.date_format.html_time.yml b/configuration-old/core.date_format.html_time.yml similarity index 100% rename from config-yml/core.date_format.html_time.yml rename to configuration-old/core.date_format.html_time.yml diff --git a/config-yml/core.date_format.html_week.yml b/configuration-old/core.date_format.html_week.yml similarity index 100% rename from config-yml/core.date_format.html_week.yml rename to configuration-old/core.date_format.html_week.yml diff --git a/config-yml/core.date_format.html_year.yml b/configuration-old/core.date_format.html_year.yml similarity index 100% rename from config-yml/core.date_format.html_year.yml rename to configuration-old/core.date_format.html_year.yml diff --git a/config-yml/core.date_format.html_yearless_date.yml b/configuration-old/core.date_format.html_yearless_date.yml similarity index 100% rename from config-yml/core.date_format.html_yearless_date.yml rename to configuration-old/core.date_format.html_yearless_date.yml diff --git a/config-yml/core.date_format.long.yml b/configuration-old/core.date_format.long.yml similarity index 100% rename from config-yml/core.date_format.long.yml rename to configuration-old/core.date_format.long.yml diff --git a/config-yml/core.date_format.medium.yml b/configuration-old/core.date_format.medium.yml similarity index 100% rename from config-yml/core.date_format.medium.yml rename to configuration-old/core.date_format.medium.yml diff --git a/config-yml/core.date_format.short.yml b/configuration-old/core.date_format.short.yml similarity index 100% rename from config-yml/core.date_format.short.yml rename to configuration-old/core.date_format.short.yml diff --git a/config-yml/core.entity_form_display.node.basic_page.default.yml b/configuration-old/core.entity_form_display.node.basic_page.default.yml similarity index 100% rename from config-yml/core.entity_form_display.node.basic_page.default.yml rename to configuration-old/core.entity_form_display.node.basic_page.default.yml diff --git a/config-yml/core.entity_form_display.node.gallery.default.yml b/configuration-old/core.entity_form_display.node.gallery.default.yml similarity index 100% rename from config-yml/core.entity_form_display.node.gallery.default.yml rename to configuration-old/core.entity_form_display.node.gallery.default.yml diff --git a/config-yml/core.entity_form_mode.user.register.yml b/configuration-old/core.entity_form_mode.user.register.yml similarity index 100% rename from config-yml/core.entity_form_mode.user.register.yml rename to configuration-old/core.entity_form_mode.user.register.yml diff --git a/config-yml/core.entity_view_display.node.basic_page.default.yml b/configuration-old/core.entity_view_display.node.basic_page.default.yml similarity index 100% rename from config-yml/core.entity_view_display.node.basic_page.default.yml rename to configuration-old/core.entity_view_display.node.basic_page.default.yml diff --git a/config-yml/core.entity_view_display.node.basic_page.teaser.yml b/configuration-old/core.entity_view_display.node.basic_page.teaser.yml similarity index 100% rename from config-yml/core.entity_view_display.node.basic_page.teaser.yml rename to configuration-old/core.entity_view_display.node.basic_page.teaser.yml diff --git a/config-yml/core.entity_view_display.node.gallery.default.yml b/configuration-old/core.entity_view_display.node.gallery.default.yml similarity index 100% rename from config-yml/core.entity_view_display.node.gallery.default.yml rename to configuration-old/core.entity_view_display.node.gallery.default.yml diff --git a/config-yml/core.entity_view_display.node.gallery.teaser.yml b/configuration-old/core.entity_view_display.node.gallery.teaser.yml similarity index 100% rename from config-yml/core.entity_view_display.node.gallery.teaser.yml rename to configuration-old/core.entity_view_display.node.gallery.teaser.yml diff --git a/config-yml/core.entity_view_mode.block_content.full.yml b/configuration-old/core.entity_view_mode.block_content.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.block_content.full.yml rename to configuration-old/core.entity_view_mode.block_content.full.yml diff --git a/config-yml/core.entity_view_mode.comment.full.yml b/configuration-old/core.entity_view_mode.comment.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.comment.full.yml rename to configuration-old/core.entity_view_mode.comment.full.yml diff --git a/config-yml/core.entity_view_mode.node.full.yml b/configuration-old/core.entity_view_mode.node.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.full.yml rename to configuration-old/core.entity_view_mode.node.full.yml diff --git a/config-yml/core.entity_view_mode.node.rss.yml b/configuration-old/core.entity_view_mode.node.rss.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.rss.yml rename to configuration-old/core.entity_view_mode.node.rss.yml diff --git a/config-yml/core.entity_view_mode.node.search_index.yml b/configuration-old/core.entity_view_mode.node.search_index.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.search_index.yml rename to configuration-old/core.entity_view_mode.node.search_index.yml diff --git a/config-yml/core.entity_view_mode.node.search_result.yml b/configuration-old/core.entity_view_mode.node.search_result.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.search_result.yml rename to configuration-old/core.entity_view_mode.node.search_result.yml diff --git a/config-yml/core.entity_view_mode.node.teaser.yml b/configuration-old/core.entity_view_mode.node.teaser.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.teaser.yml rename to configuration-old/core.entity_view_mode.node.teaser.yml diff --git a/config-yml/core.entity_view_mode.taxonomy_term.full.yml b/configuration-old/core.entity_view_mode.taxonomy_term.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.taxonomy_term.full.yml rename to configuration-old/core.entity_view_mode.taxonomy_term.full.yml diff --git a/config-yml/core.entity_view_mode.user.compact.yml b/configuration-old/core.entity_view_mode.user.compact.yml similarity index 100% rename from config-yml/core.entity_view_mode.user.compact.yml rename to configuration-old/core.entity_view_mode.user.compact.yml diff --git a/config-yml/core.entity_view_mode.user.full.yml b/configuration-old/core.entity_view_mode.user.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.user.full.yml rename to configuration-old/core.entity_view_mode.user.full.yml diff --git a/config-yml/core.extension.yml b/configuration-old/core.extension.yml similarity index 100% rename from config-yml/core.extension.yml rename to configuration-old/core.extension.yml diff --git a/config-yml/core.menu.static_menu_link_overrides.yml b/configuration-old/core.menu.static_menu_link_overrides.yml similarity index 100% rename from config-yml/core.menu.static_menu_link_overrides.yml rename to configuration-old/core.menu.static_menu_link_overrides.yml diff --git a/config-yml/dblog.settings.yml b/configuration-old/dblog.settings.yml similarity index 100% rename from config-yml/dblog.settings.yml rename to configuration-old/dblog.settings.yml diff --git a/config-yml/field.field.node.basic_page.body.yml b/configuration-old/field.field.node.basic_page.body.yml similarity index 100% rename from config-yml/field.field.node.basic_page.body.yml rename to configuration-old/field.field.node.basic_page.body.yml diff --git a/config-yml/field.field.node.basic_page.field_attachment.yml b/configuration-old/field.field.node.basic_page.field_attachment.yml similarity index 100% rename from config-yml/field.field.node.basic_page.field_attachment.yml rename to configuration-old/field.field.node.basic_page.field_attachment.yml diff --git a/config-yml/field.field.node.gallery.field_image.yml b/configuration-old/field.field.node.gallery.field_image.yml similarity index 100% rename from config-yml/field.field.node.gallery.field_image.yml rename to configuration-old/field.field.node.gallery.field_image.yml diff --git a/config-yml/field.settings.yml b/configuration-old/field.settings.yml similarity index 100% rename from config-yml/field.settings.yml rename to configuration-old/field.settings.yml diff --git a/config-yml/field.storage.block_content.body.yml b/configuration-old/field.storage.block_content.body.yml similarity index 100% rename from config-yml/field.storage.block_content.body.yml rename to configuration-old/field.storage.block_content.body.yml diff --git a/config-yml/field.storage.comment.comment_body.yml b/configuration-old/field.storage.comment.comment_body.yml similarity index 100% rename from config-yml/field.storage.comment.comment_body.yml rename to configuration-old/field.storage.comment.comment_body.yml diff --git a/config-yml/field.storage.node.body.yml b/configuration-old/field.storage.node.body.yml similarity index 100% rename from config-yml/field.storage.node.body.yml rename to configuration-old/field.storage.node.body.yml diff --git a/config-yml/field.storage.node.field_attachment.yml b/configuration-old/field.storage.node.field_attachment.yml similarity index 100% rename from config-yml/field.storage.node.field_attachment.yml rename to configuration-old/field.storage.node.field_attachment.yml diff --git a/config-yml/field.storage.node.field_image.yml b/configuration-old/field.storage.node.field_image.yml similarity index 100% rename from config-yml/field.storage.node.field_image.yml rename to configuration-old/field.storage.node.field_image.yml diff --git a/config-yml/field_ui.settings.yml b/configuration-old/field_ui.settings.yml similarity index 100% rename from config-yml/field_ui.settings.yml rename to configuration-old/field_ui.settings.yml diff --git a/config-yml/file.settings.yml b/configuration-old/file.settings.yml similarity index 100% rename from config-yml/file.settings.yml rename to configuration-old/file.settings.yml diff --git a/config-yml/filter.format.basic_html.yml b/configuration-old/filter.format.basic_html.yml similarity index 100% rename from config-yml/filter.format.basic_html.yml rename to configuration-old/filter.format.basic_html.yml diff --git a/config-yml/filter.format.full_html.yml b/configuration-old/filter.format.full_html.yml similarity index 100% rename from config-yml/filter.format.full_html.yml rename to configuration-old/filter.format.full_html.yml diff --git a/config-yml/filter.format.plain_text.yml b/configuration-old/filter.format.plain_text.yml similarity index 100% rename from config-yml/filter.format.plain_text.yml rename to configuration-old/filter.format.plain_text.yml diff --git a/config-yml/filter.format.restricted_html.yml b/configuration-old/filter.format.restricted_html.yml similarity index 100% rename from config-yml/filter.format.restricted_html.yml rename to configuration-old/filter.format.restricted_html.yml diff --git a/config-yml/filter.settings.yml b/configuration-old/filter.settings.yml similarity index 100% rename from config-yml/filter.settings.yml rename to configuration-old/filter.settings.yml diff --git a/config-yml/google_analytics.settings.yml b/configuration-old/google_analytics.settings.yml similarity index 100% rename from config-yml/google_analytics.settings.yml rename to configuration-old/google_analytics.settings.yml diff --git a/config-yml/image.settings.yml b/configuration-old/image.settings.yml similarity index 100% rename from config-yml/image.settings.yml rename to configuration-old/image.settings.yml diff --git a/config-yml/image.style.large.yml b/configuration-old/image.style.large.yml similarity index 100% rename from config-yml/image.style.large.yml rename to configuration-old/image.style.large.yml diff --git a/config-yml/image.style.medium.yml b/configuration-old/image.style.medium.yml similarity index 100% rename from config-yml/image.style.medium.yml rename to configuration-old/image.style.medium.yml diff --git a/config-yml/image.style.thumbnail.yml b/configuration-old/image.style.thumbnail.yml similarity index 100% rename from config-yml/image.style.thumbnail.yml rename to configuration-old/image.style.thumbnail.yml diff --git a/config-yml/libraries.settings.yml b/configuration-old/libraries.settings.yml similarity index 100% rename from config-yml/libraries.settings.yml rename to configuration-old/libraries.settings.yml diff --git a/config-yml/menu_ui.settings.yml b/configuration-old/menu_ui.settings.yml similarity index 100% rename from config-yml/menu_ui.settings.yml rename to configuration-old/menu_ui.settings.yml diff --git a/config-yml/naturesbounty_lib_unb_ca.settings.yml b/configuration-old/naturesbounty_lib_unb_ca.settings.yml similarity index 100% rename from config-yml/naturesbounty_lib_unb_ca.settings.yml rename to configuration-old/naturesbounty_lib_unb_ca.settings.yml diff --git a/config-yml/node.settings.yml b/configuration-old/node.settings.yml similarity index 100% rename from config-yml/node.settings.yml rename to configuration-old/node.settings.yml diff --git a/config-yml/node.type.basic_page.yml b/configuration-old/node.type.basic_page.yml similarity index 100% rename from config-yml/node.type.basic_page.yml rename to configuration-old/node.type.basic_page.yml diff --git a/config-yml/node.type.gallery.yml b/configuration-old/node.type.gallery.yml similarity index 100% rename from config-yml/node.type.gallery.yml rename to configuration-old/node.type.gallery.yml diff --git a/config-yml/rdf.mapping.user.user.yml b/configuration-old/rdf.mapping.user.user.yml similarity index 100% rename from config-yml/rdf.mapping.user.user.yml rename to configuration-old/rdf.mapping.user.user.yml diff --git a/config-yml/search.page.node_search.yml b/configuration-old/search.page.node_search.yml similarity index 100% rename from config-yml/search.page.node_search.yml rename to configuration-old/search.page.node_search.yml diff --git a/config-yml/search.page.user_search.yml b/configuration-old/search.page.user_search.yml similarity index 100% rename from config-yml/search.page.user_search.yml rename to configuration-old/search.page.user_search.yml diff --git a/config-yml/search.settings.yml b/configuration-old/search.settings.yml similarity index 100% rename from config-yml/search.settings.yml rename to configuration-old/search.settings.yml diff --git a/config-yml/system.action.comment_delete_action.yml b/configuration-old/system.action.comment_delete_action.yml similarity index 100% rename from config-yml/system.action.comment_delete_action.yml rename to configuration-old/system.action.comment_delete_action.yml diff --git a/config-yml/system.action.comment_publish_action.yml b/configuration-old/system.action.comment_publish_action.yml similarity index 100% rename from config-yml/system.action.comment_publish_action.yml rename to configuration-old/system.action.comment_publish_action.yml diff --git a/config-yml/system.action.comment_save_action.yml b/configuration-old/system.action.comment_save_action.yml similarity index 100% rename from config-yml/system.action.comment_save_action.yml rename to configuration-old/system.action.comment_save_action.yml diff --git a/config-yml/system.action.comment_unpublish_action.yml b/configuration-old/system.action.comment_unpublish_action.yml similarity index 100% rename from config-yml/system.action.comment_unpublish_action.yml rename to configuration-old/system.action.comment_unpublish_action.yml diff --git a/config-yml/system.action.node_delete_action.yml b/configuration-old/system.action.node_delete_action.yml similarity index 100% rename from config-yml/system.action.node_delete_action.yml rename to configuration-old/system.action.node_delete_action.yml diff --git a/config-yml/system.action.node_make_sticky_action.yml b/configuration-old/system.action.node_make_sticky_action.yml similarity index 100% rename from config-yml/system.action.node_make_sticky_action.yml rename to configuration-old/system.action.node_make_sticky_action.yml diff --git a/config-yml/system.action.node_make_unsticky_action.yml b/configuration-old/system.action.node_make_unsticky_action.yml similarity index 100% rename from config-yml/system.action.node_make_unsticky_action.yml rename to configuration-old/system.action.node_make_unsticky_action.yml diff --git a/config-yml/system.action.node_promote_action.yml b/configuration-old/system.action.node_promote_action.yml similarity index 100% rename from config-yml/system.action.node_promote_action.yml rename to configuration-old/system.action.node_promote_action.yml diff --git a/config-yml/system.action.node_publish_action.yml b/configuration-old/system.action.node_publish_action.yml similarity index 100% rename from config-yml/system.action.node_publish_action.yml rename to configuration-old/system.action.node_publish_action.yml diff --git a/config-yml/system.action.node_save_action.yml b/configuration-old/system.action.node_save_action.yml similarity index 100% rename from config-yml/system.action.node_save_action.yml rename to configuration-old/system.action.node_save_action.yml diff --git a/config-yml/system.action.node_unpromote_action.yml b/configuration-old/system.action.node_unpromote_action.yml similarity index 100% rename from config-yml/system.action.node_unpromote_action.yml rename to configuration-old/system.action.node_unpromote_action.yml diff --git a/config-yml/system.action.node_unpublish_action.yml b/configuration-old/system.action.node_unpublish_action.yml similarity index 100% rename from config-yml/system.action.node_unpublish_action.yml rename to configuration-old/system.action.node_unpublish_action.yml diff --git a/config-yml/system.action.user_block_user_action.yml b/configuration-old/system.action.user_block_user_action.yml similarity index 100% rename from config-yml/system.action.user_block_user_action.yml rename to configuration-old/system.action.user_block_user_action.yml diff --git a/config-yml/system.action.user_cancel_user_action.yml b/configuration-old/system.action.user_cancel_user_action.yml similarity index 100% rename from config-yml/system.action.user_cancel_user_action.yml rename to configuration-old/system.action.user_cancel_user_action.yml diff --git a/config-yml/system.action.user_unblock_user_action.yml b/configuration-old/system.action.user_unblock_user_action.yml similarity index 100% rename from config-yml/system.action.user_unblock_user_action.yml rename to configuration-old/system.action.user_unblock_user_action.yml diff --git a/config-yml/system.authorize.yml b/configuration-old/system.authorize.yml similarity index 100% rename from config-yml/system.authorize.yml rename to configuration-old/system.authorize.yml diff --git a/config-yml/system.cron.yml b/configuration-old/system.cron.yml similarity index 100% rename from config-yml/system.cron.yml rename to configuration-old/system.cron.yml diff --git a/config-yml/system.date.yml b/configuration-old/system.date.yml similarity index 100% rename from config-yml/system.date.yml rename to configuration-old/system.date.yml diff --git a/config-yml/system.diff.yml b/configuration-old/system.diff.yml similarity index 100% rename from config-yml/system.diff.yml rename to configuration-old/system.diff.yml diff --git a/config-yml/system.file.yml b/configuration-old/system.file.yml similarity index 100% rename from config-yml/system.file.yml rename to configuration-old/system.file.yml diff --git a/config-yml/system.image.gd.yml b/configuration-old/system.image.gd.yml similarity index 100% rename from config-yml/system.image.gd.yml rename to configuration-old/system.image.gd.yml diff --git a/config-yml/system.image.yml b/configuration-old/system.image.yml similarity index 100% rename from config-yml/system.image.yml rename to configuration-old/system.image.yml diff --git a/config-yml/system.logging.yml b/configuration-old/system.logging.yml similarity index 100% rename from config-yml/system.logging.yml rename to configuration-old/system.logging.yml diff --git a/config-yml/system.mail.yml b/configuration-old/system.mail.yml similarity index 100% rename from config-yml/system.mail.yml rename to configuration-old/system.mail.yml diff --git a/config-yml/system.maintenance.yml b/configuration-old/system.maintenance.yml similarity index 100% rename from config-yml/system.maintenance.yml rename to configuration-old/system.maintenance.yml diff --git a/config-yml/system.menu.account.yml b/configuration-old/system.menu.account.yml similarity index 100% rename from config-yml/system.menu.account.yml rename to configuration-old/system.menu.account.yml diff --git a/config-yml/system.menu.admin.yml b/configuration-old/system.menu.admin.yml similarity index 100% rename from config-yml/system.menu.admin.yml rename to configuration-old/system.menu.admin.yml diff --git a/config-yml/system.menu.footer.yml b/configuration-old/system.menu.footer.yml similarity index 100% rename from config-yml/system.menu.footer.yml rename to configuration-old/system.menu.footer.yml diff --git a/config-yml/system.menu.main.yml b/configuration-old/system.menu.main.yml similarity index 100% rename from config-yml/system.menu.main.yml rename to configuration-old/system.menu.main.yml diff --git a/config-yml/system.menu.tools.yml b/configuration-old/system.menu.tools.yml similarity index 100% rename from config-yml/system.menu.tools.yml rename to configuration-old/system.menu.tools.yml diff --git a/config-yml/system.performance.yml b/configuration-old/system.performance.yml similarity index 100% rename from config-yml/system.performance.yml rename to configuration-old/system.performance.yml diff --git a/config-yml/system.rss.yml b/configuration-old/system.rss.yml similarity index 100% rename from config-yml/system.rss.yml rename to configuration-old/system.rss.yml diff --git a/config-yml/system.site.yml b/configuration-old/system.site.yml similarity index 100% rename from config-yml/system.site.yml rename to configuration-old/system.site.yml diff --git a/config-yml/system.theme.global.yml b/configuration-old/system.theme.global.yml similarity index 100% rename from config-yml/system.theme.global.yml rename to configuration-old/system.theme.global.yml diff --git a/config-yml/system.theme.yml b/configuration-old/system.theme.yml similarity index 100% rename from config-yml/system.theme.yml rename to configuration-old/system.theme.yml diff --git a/config-yml/taxonomy.settings.yml b/configuration-old/taxonomy.settings.yml similarity index 100% rename from config-yml/taxonomy.settings.yml rename to configuration-old/taxonomy.settings.yml diff --git a/config-yml/text.settings.yml b/configuration-old/text.settings.yml similarity index 100% rename from config-yml/text.settings.yml rename to configuration-old/text.settings.yml diff --git a/config-yml/update.settings.yml b/configuration-old/update.settings.yml similarity index 100% rename from config-yml/update.settings.yml rename to configuration-old/update.settings.yml diff --git a/config-yml/user.flood.yml b/configuration-old/user.flood.yml similarity index 100% rename from config-yml/user.flood.yml rename to configuration-old/user.flood.yml diff --git a/config-yml/user.mail.yml b/configuration-old/user.mail.yml similarity index 100% rename from config-yml/user.mail.yml rename to configuration-old/user.mail.yml diff --git a/config-yml/user.role.anonymous.yml b/configuration-old/user.role.anonymous.yml similarity index 100% rename from config-yml/user.role.anonymous.yml rename to configuration-old/user.role.anonymous.yml diff --git a/config-yml/user.role.authenticated.yml b/configuration-old/user.role.authenticated.yml similarity index 100% rename from config-yml/user.role.authenticated.yml rename to configuration-old/user.role.authenticated.yml diff --git a/config-yml/user.settings.yml b/configuration-old/user.settings.yml similarity index 100% rename from config-yml/user.settings.yml rename to configuration-old/user.settings.yml diff --git a/config-yml/views.settings.yml b/configuration-old/views.settings.yml similarity index 100% rename from config-yml/views.settings.yml rename to configuration-old/views.settings.yml diff --git a/config-yml/views.view.archive.yml b/configuration-old/views.view.archive.yml similarity index 100% rename from config-yml/views.view.archive.yml rename to configuration-old/views.view.archive.yml diff --git a/config-yml/views.view.block_content.yml b/configuration-old/views.view.block_content.yml similarity index 100% rename from config-yml/views.view.block_content.yml rename to configuration-old/views.view.block_content.yml diff --git a/config-yml/views.view.comment.yml b/configuration-old/views.view.comment.yml similarity index 100% rename from config-yml/views.view.comment.yml rename to configuration-old/views.view.comment.yml diff --git a/config-yml/views.view.comments_recent.yml b/configuration-old/views.view.comments_recent.yml similarity index 100% rename from config-yml/views.view.comments_recent.yml rename to configuration-old/views.view.comments_recent.yml diff --git a/config-yml/views.view.content.yml b/configuration-old/views.view.content.yml similarity index 100% rename from config-yml/views.view.content.yml rename to configuration-old/views.view.content.yml diff --git a/config-yml/views.view.content_recent.yml b/configuration-old/views.view.content_recent.yml similarity index 100% rename from config-yml/views.view.content_recent.yml rename to configuration-old/views.view.content_recent.yml diff --git a/config-yml/views.view.files.yml b/configuration-old/views.view.files.yml similarity index 100% rename from config-yml/views.view.files.yml rename to configuration-old/views.view.files.yml diff --git a/config-yml/views.view.frontpage.yml b/configuration-old/views.view.frontpage.yml similarity index 100% rename from config-yml/views.view.frontpage.yml rename to configuration-old/views.view.frontpage.yml diff --git a/config-yml/views.view.glossary.yml b/configuration-old/views.view.glossary.yml similarity index 100% rename from config-yml/views.view.glossary.yml rename to configuration-old/views.view.glossary.yml diff --git a/config-yml/views.view.taxonomy_term.yml b/configuration-old/views.view.taxonomy_term.yml similarity index 100% rename from config-yml/views.view.taxonomy_term.yml rename to configuration-old/views.view.taxonomy_term.yml diff --git a/config-yml/views.view.user_admin_people.yml b/configuration-old/views.view.user_admin_people.yml similarity index 100% rename from config-yml/views.view.user_admin_people.yml rename to configuration-old/views.view.user_admin_people.yml diff --git a/config-yml/views.view.watchdog.yml b/configuration-old/views.view.watchdog.yml similarity index 100% rename from config-yml/views.view.watchdog.yml rename to configuration-old/views.view.watchdog.yml diff --git a/config-yml/views.view.who_s_new.yml b/configuration-old/views.view.who_s_new.yml similarity index 100% rename from config-yml/views.view.who_s_new.yml rename to configuration-old/views.view.who_s_new.yml diff --git a/config-yml/views.view.who_s_online.yml b/configuration-old/views.view.who_s_online.yml similarity index 100% rename from config-yml/views.view.who_s_online.yml rename to configuration-old/views.view.who_s_online.yml diff --git a/custom/modules/nature_menu/nature_menu.info.yml b/custom/modules/nature_menu/nature_menu.info.yml index 910ed8d..61baa01 100644 --- a/custom/modules/nature_menu/nature_menu.info.yml +++ b/custom/modules/nature_menu/nature_menu.info.yml @@ -2,5 +2,5 @@ name: NATURE Main Menu type: module description: Menu for naturesbounty.lib.unb.ca core: 8.x -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 package: NATURE Custom diff --git a/custom/themes/naturesbounty_lib_unb_ca/naturesbounty_lib_unb_ca.info.yml b/custom/themes/naturesbounty_lib_unb_ca/naturesbounty_lib_unb_ca.info.yml index c79acb9..77565ce 100644 --- a/custom/themes/naturesbounty_lib_unb_ca/naturesbounty_lib_unb_ca.info.yml +++ b/custom/themes/naturesbounty_lib_unb_ca/naturesbounty_lib_unb_ca.info.yml @@ -1,5 +1,5 @@ core: 8.x -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 type: theme base theme: bootstrap diff --git a/docker-compose.yml b/docker-compose.yml index d1b7365..5f49e80 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: build: context: . restart: unless-stopped - container_name: naturesbounty.lib.unb.ca + container_name: naturesbounty-lib-unb-ca expose: - "80" ports: @@ -14,7 +14,7 @@ services: - naturesbounty.lib.unb.ca volumes: - drupal-data:/app/html/sites/default - - ./config-yml:/app/configuration + - ./configuration:/app/configuration - ./custom/modules:/app/html/modules/custom - ./custom/themes:/app/html/themes/custom - ./tests:/app/tests @@ -35,8 +35,9 @@ services: volumes: - mysql-data:/var/lib/mysql drupal-redis-lib-unb-ca: - image: redis:5-alpine + image: redis:7-alpine restart: unless-stopped + command: redis-server --maxmemory-policy allkeys-lru --maxmemory 128mb expose: - "6379" networks: