diff --git a/.dockerignore b/.dockerignore index f30dd9d..22a5d70 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,4 +5,4 @@ !Dockerfile !custom !build -!config-yml +!configuration diff --git a/.dockworker/deployment/k8s/dev/cronjob.yaml b/.dockworker/deployment/k8s/dev/cronjob.yaml deleted file mode 100644 index fd280c5..0000000 --- a/.dockworker/deployment/k8s/dev/cronjob.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-nble-lib-unb-ca - namespace: dev - labels: - app: drupal - tier: cron -spec: - schedule: "03,18,33,48 * * * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-nble-lib-unb-ca - labels: - app: drupal - tier: cron - spec: - template: - spec: - nodeSelector: - deploy_cron: 'true' - containers: - - - name: cron-nble-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: nble-lib-unb-ca diff --git a/.dockworker/deployment/k8s/dev/deployment.yaml b/.dockworker/deployment/k8s/dev/deployment.yaml deleted file mode 100644 index d05ceb0..0000000 --- a/.dockworker/deployment/k8s/dev/deployment.yaml +++ /dev/null @@ -1,103 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: drupal - appMajor: "9" - instance: nble.lib.unb.ca - tier: frontend - uri: dev-nble.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: nble.lib.unb.ca - vcsRef: dev - name: nble-lib-unb-ca - namespace: dev -spec: - selector: - matchLabels: - uri: dev-nble.lib.unb.ca - replicas: 1 - revisionHistoryLimit: 2 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: drupal - appMajor: "9" - instance: nble.lib.unb.ca - tier: frontend - uri: dev-nble.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: nble.lib.unb.ca - vcsRef: dev - spec: - nodeSelector: - deploy_dev: 'true' - containers: - - - name: nble-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-med-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Always - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: nble-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/backup.yaml b/.dockworker/deployment/k8s/prod/backup.yaml deleted file mode 100644 index 4fec9ec..0000000 --- a/.dockworker/deployment/k8s/prod/backup.yaml +++ /dev/null @@ -1,146 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: weekly-backup-nble-lib-unb-ca - namespace: prod - labels: - app: drupal - tier: backup -spec: - schedule: "23 02 * * 1" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: weekly-backup-nble-lib-unb-ca - labels: - app: drupal - tier: backup - spec: - template: - spec: - nodeSelector: - deploy_backup: 'true' - containers: - - - name: weekly-backup-nble-lib-unb-ca - args: ["weekly"] - env: - - - name: DEPLOY_ENV - value: prod - - - name: MYSQL_HOSTNAME - value: drupal-mysql-lib-unb-ca - - - name: MYSQL_PORT - value: "3306" - - - name: MYSQL_DATABASE - value: nble_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" - 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-nble-lib-unb-ca ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: monthly-backup-nble-lib-unb-ca - namespace: prod - labels: - app: drupal - tier: backup -spec: - schedule: "28 04 3 * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: monthly-backup-nble-lib-unb-ca - labels: - app: drupal - tier: backup - spec: - template: - spec: - nodeSelector: - deploy_backup: 'true' - containers: - - - name: monthly-backup-nble-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: nble_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-nble-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/cronjob.yaml b/.dockworker/deployment/k8s/prod/cronjob.yaml deleted file mode 100644 index 38aab76..0000000 --- a/.dockworker/deployment/k8s/prod/cronjob.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-nble-lib-unb-ca - namespace: prod - labels: - app: drupal - tier: cron -spec: - schedule: "03,18,33,48 * * * *" - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-nble-lib-unb-ca - labels: - app: drupal - tier: cron - spec: - template: - spec: - nodeSelector: - deploy_cron: 'true' - containers: - - - name: cron-nble-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: nble-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/deployment.yaml b/.dockworker/deployment/k8s/prod/deployment.yaml deleted file mode 100644 index c21e7fe..0000000 --- a/.dockworker/deployment/k8s/prod/deployment.yaml +++ /dev/null @@ -1,103 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: drupal - appMajor: "9" - instance: nble.lib.unb.ca - tier: frontend - uri: nble.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: nble.lib.unb.ca - vcsRef: prod - name: nble-lib-unb-ca - namespace: prod -spec: - selector: - matchLabels: - uri: nble.lib.unb.ca - replicas: 1 - revisionHistoryLimit: 2 - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - template: - metadata: - labels: - app: drupal - appMajor: "9" - instance: nble.lib.unb.ca - tier: frontend - uri: nble.lib.unb.ca - vcsOwner: unb-libraries - vcsRepository: nble.lib.unb.ca - vcsRef: prod - spec: - nodeSelector: - deploy_prod: 'true' - containers: - - - name: nble-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: high-priority-services - imagePullSecrets: - - - name: github-container-registry-auth - restartPolicy: Always - volumes: - - - name: drupal-persistent-storage - persistentVolumeClaim: - claimName: nble-lib-unb-ca diff --git a/.dockworker/deployment/k8s/prod/testing.yaml b/.dockworker/deployment/k8s/prod/testing.yaml deleted file mode 100644 index c5c9f50..0000000 --- a/.dockworker/deployment/k8s/prod/testing.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: cron-testing-nble-lib-unb-ca - namespace: testing - labels: - app: cypress - tier: cron -spec: - schedule: '*/5 * * * *' - startingDeadlineSeconds: 480 - concurrencyPolicy: Forbid - jobTemplate: - metadata: - name: cron-testing-nble-lib-unb-ca - labels: - app: cypress - tier: cron - spec: - backoffLimit: 0 - template: - spec: - nodeSelector: - environment: testing - containers: - - name: cron-testing-nble-lib-unb-ca - env: - - name: CYPRESS_REPORTER_VERBOSITY - value: "20" - - name: CYPRESS_SPEC_FILE - valueFrom: - secretKeyRef: - name: nble-lib-unb-ca-cypress - key: file - - name: CYPRESS_SPEC_FILE_NAME - valueFrom: - secretKeyRef: - name: nble-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 8265bd5..5cdb764 100644 --- a/.dockworker/dockworker.yml +++ b/.dockworker/dockworker.yml @@ -1,28 +1,74 @@ dockworker: - version: '5' + version: '6' application: - name: nble.lib.unb.ca - finish_marker: '99_zz_notify_user_URI' - project_prefix: NBLE - upstream_images: - - ghcr.io/unb-libraries/drupal:9.x-2.x-unblib - uuid: 3104 - deployment: - environments: + name: The Peskotomuhkati-Wolastoqey Language Portal + uri: https://nble.lib.unb.ca + description: > + The New Brunswick Literary Encyclopedia is an encyclopedia of biographical, critical, + and bibliographic information about more than 200 New Brunswick writers and literary + subjects. + topics: + - new brunswick + - literature + - encyclopedia + - writers + - history + - research + identifiers: + id: nble.lib.unb.ca + slug: nble-lib-unb-ca + short_slug: nble + uuid: 3104 + framework: + name: Drupal + version: 9 + startup_finished_marker: '99_zz_notify_user_URI' + 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: nble.lib.unb.ca - owner: unb-libraries - image: - push_branches: - - dev - - prod - name: ghcr.io/unb-libraries/nble.lib.unb.ca - date_tag_image: true - repository: ghcr + deployments: + nble-lib-unb-ca: + default: true + managed: true + name: nble-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: nble.lib.unb.ca + jira: + project_keys: + - NBLE + image: + name: ghcr.io/unb-libraries/nble.lib.unb.ca + parent: ghcr.io/unb-libraries/drupal:9.x-2.x-unblib + repository: GitHub + push-branches: + - dev + - prod + e2e_tests: + - id: core + frequency: '*/5 * * * *' + source_files: + - .dockworker/tests/e2e/nble.lib.unb.ca.yml + namespaces: + - prod diff --git a/.github/workflows/deployment-workflow.yaml b/.github/workflows/deployment-workflow.yaml index 8f5babb..79a6c59 100644 --- a/.github/workflows/deployment-workflow.yaml +++ b/.github/workflows/deployment-workflow.yaml @@ -1,4 +1,4 @@ -name: nble.lib.unb.ca +name: Deploy nble.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/nble.lib.unb.ca' + k8s-deployment-name: 'nble-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..9bb819c --- /dev/null +++ b/.github/workflows/update.yaml @@ -0,0 +1,14 @@ +name: Update nble.lib.unb.ca + +on: + workflow_dispatch: + schedule: + - cron: '53 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 e6cf55f..f895fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ .gitkeep .idea vendor -composer.lock +/composer.lock tests/features/bootstrap build/scripts/local -config-yml/.htaccess +configuration/.htaccess +/build/vendor diff --git a/Dockerfile b/Dockerfile index 7ee0958..dbd86f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/composer.json b/composer.json index ffa9fc5..334980f 100644 --- a/composer.json +++ b/composer.json @@ -1,4 +1,9 @@ { + "autoload": { + "psr-4": { + "Dockworker\\": ".dockworker/src" + } + }, "config": { "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, @@ -8,10 +13,10 @@ "*": "dist" } }, - "description": "Scaffold and provision local development for composites.lib.unb.ca", + "description": "Scaffold and provision local development for nble.lib.unb.ca", "license": "MIT", "minimum-stability": "dev", - "name": "unb-libraries/composites.lib.unb.ca", + "name": "unb-libraries/nble.lib.unb.ca", "prefer-stable": true, "replace": { "drupal/core": "*" @@ -24,11 +29,11 @@ ], "require-dev": { "drupal/bootstrap4": "2.1.16", - "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/configuration/.gitkeep similarity index 100% rename from config-yml/.gitkeep rename to configuration/.gitkeep diff --git a/config-yml/block.block.bootstrap4_account_menu.yml b/configuration/block.block.bootstrap4_account_menu.yml similarity index 100% rename from config-yml/block.block.bootstrap4_account_menu.yml rename to configuration/block.block.bootstrap4_account_menu.yml diff --git a/config-yml/block.block.bootstrap4_branding.yml b/configuration/block.block.bootstrap4_branding.yml similarity index 100% rename from config-yml/block.block.bootstrap4_branding.yml rename to configuration/block.block.bootstrap4_branding.yml diff --git a/config-yml/block.block.bootstrap4_breadcrumbs.yml b/configuration/block.block.bootstrap4_breadcrumbs.yml similarity index 100% rename from config-yml/block.block.bootstrap4_breadcrumbs.yml rename to configuration/block.block.bootstrap4_breadcrumbs.yml diff --git a/config-yml/block.block.bootstrap4_content.yml b/configuration/block.block.bootstrap4_content.yml similarity index 100% rename from config-yml/block.block.bootstrap4_content.yml rename to configuration/block.block.bootstrap4_content.yml diff --git a/config-yml/block.block.bootstrap4_footer.yml b/configuration/block.block.bootstrap4_footer.yml similarity index 100% rename from config-yml/block.block.bootstrap4_footer.yml rename to configuration/block.block.bootstrap4_footer.yml diff --git a/config-yml/block.block.bootstrap4_help.yml b/configuration/block.block.bootstrap4_help.yml similarity index 100% rename from config-yml/block.block.bootstrap4_help.yml rename to configuration/block.block.bootstrap4_help.yml diff --git a/config-yml/block.block.bootstrap4_local_actions.yml b/configuration/block.block.bootstrap4_local_actions.yml similarity index 100% rename from config-yml/block.block.bootstrap4_local_actions.yml rename to configuration/block.block.bootstrap4_local_actions.yml diff --git a/config-yml/block.block.bootstrap4_local_tasks.yml b/configuration/block.block.bootstrap4_local_tasks.yml similarity index 100% rename from config-yml/block.block.bootstrap4_local_tasks.yml rename to configuration/block.block.bootstrap4_local_tasks.yml diff --git a/config-yml/block.block.bootstrap4_main_menu.yml b/configuration/block.block.bootstrap4_main_menu.yml similarity index 100% rename from config-yml/block.block.bootstrap4_main_menu.yml rename to configuration/block.block.bootstrap4_main_menu.yml diff --git a/config-yml/block.block.bootstrap4_messages.yml b/configuration/block.block.bootstrap4_messages.yml similarity index 100% rename from config-yml/block.block.bootstrap4_messages.yml rename to configuration/block.block.bootstrap4_messages.yml diff --git a/config-yml/block.block.bootstrap4_page_title.yml b/configuration/block.block.bootstrap4_page_title.yml similarity index 100% rename from config-yml/block.block.bootstrap4_page_title.yml rename to configuration/block.block.bootstrap4_page_title.yml diff --git a/config-yml/block.block.breadcrumbs.yml b/configuration/block.block.breadcrumbs.yml similarity index 100% rename from config-yml/block.block.breadcrumbs.yml rename to configuration/block.block.breadcrumbs.yml diff --git a/config-yml/block.block.exposedformsearch_encyclopediapage_1.yml b/configuration/block.block.exposedformsearch_encyclopediapage_1.yml similarity index 100% rename from config-yml/block.block.exposedformsearch_encyclopediapage_1.yml rename to configuration/block.block.exposedformsearch_encyclopediapage_1.yml diff --git a/config-yml/block.block.mainnavigation.yml b/configuration/block.block.mainnavigation.yml similarity index 100% rename from config-yml/block.block.mainnavigation.yml rename to configuration/block.block.mainnavigation.yml diff --git a/config-yml/block.block.mainpagecontent.yml b/configuration/block.block.mainpagecontent.yml similarity index 100% rename from config-yml/block.block.mainpagecontent.yml rename to configuration/block.block.mainpagecontent.yml diff --git a/config-yml/block.block.pagetitle.yml b/configuration/block.block.pagetitle.yml similarity index 100% rename from config-yml/block.block.pagetitle.yml rename to configuration/block.block.pagetitle.yml diff --git a/config-yml/block.block.primaryadminactions.yml b/configuration/block.block.primaryadminactions.yml similarity index 100% rename from config-yml/block.block.primaryadminactions.yml rename to configuration/block.block.primaryadminactions.yml diff --git a/config-yml/block.block.seven_breadcrumbs.yml b/configuration/block.block.seven_breadcrumbs.yml similarity index 100% rename from config-yml/block.block.seven_breadcrumbs.yml rename to configuration/block.block.seven_breadcrumbs.yml diff --git a/config-yml/block.block.seven_content.yml b/configuration/block.block.seven_content.yml similarity index 100% rename from config-yml/block.block.seven_content.yml rename to configuration/block.block.seven_content.yml diff --git a/config-yml/block.block.seven_help.yml b/configuration/block.block.seven_help.yml similarity index 100% rename from config-yml/block.block.seven_help.yml rename to configuration/block.block.seven_help.yml diff --git a/config-yml/block.block.seven_local_actions.yml b/configuration/block.block.seven_local_actions.yml similarity index 100% rename from config-yml/block.block.seven_local_actions.yml rename to configuration/block.block.seven_local_actions.yml diff --git a/config-yml/block.block.seven_login.yml b/configuration/block.block.seven_login.yml similarity index 100% rename from config-yml/block.block.seven_login.yml rename to configuration/block.block.seven_login.yml diff --git a/config-yml/block.block.seven_messages.yml b/configuration/block.block.seven_messages.yml similarity index 100% rename from config-yml/block.block.seven_messages.yml rename to configuration/block.block.seven_messages.yml diff --git a/config-yml/block.block.seven_page_title.yml b/configuration/block.block.seven_page_title.yml similarity index 100% rename from config-yml/block.block.seven_page_title.yml rename to configuration/block.block.seven_page_title.yml diff --git a/config-yml/block.block.seven_primary_local_tasks.yml b/configuration/block.block.seven_primary_local_tasks.yml similarity index 100% rename from config-yml/block.block.seven_primary_local_tasks.yml rename to configuration/block.block.seven_primary_local_tasks.yml diff --git a/config-yml/block.block.seven_secondary_local_tasks.yml b/configuration/block.block.seven_secondary_local_tasks.yml similarity index 100% rename from config-yml/block.block.seven_secondary_local_tasks.yml rename to configuration/block.block.seven_secondary_local_tasks.yml diff --git a/config-yml/block.block.sitebranding.yml b/configuration/block.block.sitebranding.yml similarity index 100% rename from config-yml/block.block.sitebranding.yml rename to configuration/block.block.sitebranding.yml diff --git a/config-yml/block.block.tabs.yml b/configuration/block.block.tabs.yml similarity index 100% rename from config-yml/block.block.tabs.yml rename to configuration/block.block.tabs.yml diff --git a/config-yml/block.block.views_block__browse_encyclopedia_block_1.yml b/configuration/block.block.views_block__browse_encyclopedia_block_1.yml similarity index 100% rename from config-yml/block.block.views_block__browse_encyclopedia_block_1.yml rename to configuration/block.block.views_block__browse_encyclopedia_block_1.yml diff --git a/config-yml/block_content.type.basic_block.yml b/configuration/block_content.type.basic_block.yml similarity index 100% rename from config-yml/block_content.type.basic_block.yml rename to configuration/block_content.type.basic_block.yml diff --git a/config-yml/bootstrap4.settings.yml b/configuration/bootstrap4.settings.yml similarity index 100% rename from config-yml/bootstrap4.settings.yml rename to configuration/bootstrap4.settings.yml diff --git a/config-yml/comment.settings.yml b/configuration/comment.settings.yml similarity index 100% rename from config-yml/comment.settings.yml rename to configuration/comment.settings.yml diff --git a/config-yml/contact.form.personal.yml b/configuration/contact.form.personal.yml similarity index 100% rename from config-yml/contact.form.personal.yml rename to configuration/contact.form.personal.yml diff --git a/config-yml/contact.settings.yml b/configuration/contact.settings.yml similarity index 100% rename from config-yml/contact.settings.yml rename to configuration/contact.settings.yml diff --git a/config-yml/core.base_field_override.node.basic_page.promote.yml b/configuration/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/core.base_field_override.node.basic_page.promote.yml diff --git a/config-yml/core.base_field_override.node.encyclopedia_item.promote.yml b/configuration/core.base_field_override.node.encyclopedia_item.promote.yml similarity index 100% rename from config-yml/core.base_field_override.node.encyclopedia_item.promote.yml rename to configuration/core.base_field_override.node.encyclopedia_item.promote.yml diff --git a/config-yml/core.date_format.fallback.yml b/configuration/core.date_format.fallback.yml similarity index 100% rename from config-yml/core.date_format.fallback.yml rename to configuration/core.date_format.fallback.yml diff --git a/config-yml/core.date_format.html_date.yml b/configuration/core.date_format.html_date.yml similarity index 100% rename from config-yml/core.date_format.html_date.yml rename to configuration/core.date_format.html_date.yml diff --git a/config-yml/core.date_format.html_datetime.yml b/configuration/core.date_format.html_datetime.yml similarity index 100% rename from config-yml/core.date_format.html_datetime.yml rename to configuration/core.date_format.html_datetime.yml diff --git a/config-yml/core.date_format.html_month.yml b/configuration/core.date_format.html_month.yml similarity index 100% rename from config-yml/core.date_format.html_month.yml rename to configuration/core.date_format.html_month.yml diff --git a/config-yml/core.date_format.html_time.yml b/configuration/core.date_format.html_time.yml similarity index 100% rename from config-yml/core.date_format.html_time.yml rename to configuration/core.date_format.html_time.yml diff --git a/config-yml/core.date_format.html_week.yml b/configuration/core.date_format.html_week.yml similarity index 100% rename from config-yml/core.date_format.html_week.yml rename to configuration/core.date_format.html_week.yml diff --git a/config-yml/core.date_format.html_year.yml b/configuration/core.date_format.html_year.yml similarity index 100% rename from config-yml/core.date_format.html_year.yml rename to configuration/core.date_format.html_year.yml diff --git a/config-yml/core.date_format.html_yearless_date.yml b/configuration/core.date_format.html_yearless_date.yml similarity index 100% rename from config-yml/core.date_format.html_yearless_date.yml rename to configuration/core.date_format.html_yearless_date.yml diff --git a/config-yml/core.date_format.long.yml b/configuration/core.date_format.long.yml similarity index 100% rename from config-yml/core.date_format.long.yml rename to configuration/core.date_format.long.yml diff --git a/config-yml/core.date_format.medium.yml b/configuration/core.date_format.medium.yml similarity index 100% rename from config-yml/core.date_format.medium.yml rename to configuration/core.date_format.medium.yml diff --git a/config-yml/core.date_format.short.yml b/configuration/core.date_format.short.yml similarity index 100% rename from config-yml/core.date_format.short.yml rename to configuration/core.date_format.short.yml diff --git a/config-yml/core.entity_form_display.block_content.basic_block.default.yml b/configuration/core.entity_form_display.block_content.basic_block.default.yml similarity index 100% rename from config-yml/core.entity_form_display.block_content.basic_block.default.yml rename to configuration/core.entity_form_display.block_content.basic_block.default.yml diff --git a/config-yml/core.entity_form_display.node.basic_page.default.yml b/configuration/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/core.entity_form_display.node.basic_page.default.yml diff --git a/config-yml/core.entity_form_display.node.encyclopedia_item.default.yml b/configuration/core.entity_form_display.node.encyclopedia_item.default.yml similarity index 100% rename from config-yml/core.entity_form_display.node.encyclopedia_item.default.yml rename to configuration/core.entity_form_display.node.encyclopedia_item.default.yml diff --git a/config-yml/core.entity_form_display.user.user.default.yml b/configuration/core.entity_form_display.user.user.default.yml similarity index 100% rename from config-yml/core.entity_form_display.user.user.default.yml rename to configuration/core.entity_form_display.user.user.default.yml diff --git a/config-yml/core.entity_form_mode.user.register.yml b/configuration/core.entity_form_mode.user.register.yml similarity index 100% rename from config-yml/core.entity_form_mode.user.register.yml rename to configuration/core.entity_form_mode.user.register.yml diff --git a/config-yml/core.entity_view_display.block_content.basic_block.default.yml b/configuration/core.entity_view_display.block_content.basic_block.default.yml similarity index 100% rename from config-yml/core.entity_view_display.block_content.basic_block.default.yml rename to configuration/core.entity_view_display.block_content.basic_block.default.yml diff --git a/config-yml/core.entity_view_display.node.basic_page.default.yml b/configuration/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/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/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/core.entity_view_display.node.basic_page.teaser.yml diff --git a/config-yml/core.entity_view_display.node.encyclopedia_item.default.yml b/configuration/core.entity_view_display.node.encyclopedia_item.default.yml similarity index 100% rename from config-yml/core.entity_view_display.node.encyclopedia_item.default.yml rename to configuration/core.entity_view_display.node.encyclopedia_item.default.yml diff --git a/config-yml/core.entity_view_display.node.encyclopedia_item.teaser.yml b/configuration/core.entity_view_display.node.encyclopedia_item.teaser.yml similarity index 100% rename from config-yml/core.entity_view_display.node.encyclopedia_item.teaser.yml rename to configuration/core.entity_view_display.node.encyclopedia_item.teaser.yml diff --git a/config-yml/core.entity_view_mode.block.token.yml b/configuration/core.entity_view_mode.block.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.block.token.yml rename to configuration/core.entity_view_mode.block.token.yml diff --git a/config-yml/core.entity_view_mode.block_content.full.yml b/configuration/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/core.entity_view_mode.block_content.full.yml diff --git a/config-yml/core.entity_view_mode.block_content.token.yml b/configuration/core.entity_view_mode.block_content.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.block_content.token.yml rename to configuration/core.entity_view_mode.block_content.token.yml diff --git a/config-yml/core.entity_view_mode.comment.full.yml b/configuration/core.entity_view_mode.comment.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.comment.full.yml rename to configuration/core.entity_view_mode.comment.full.yml diff --git a/config-yml/core.entity_view_mode.comment.token.yml b/configuration/core.entity_view_mode.comment.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.comment.token.yml rename to configuration/core.entity_view_mode.comment.token.yml diff --git a/config-yml/core.entity_view_mode.contact_message.token.yml b/configuration/core.entity_view_mode.contact_message.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.contact_message.token.yml rename to configuration/core.entity_view_mode.contact_message.token.yml diff --git a/config-yml/core.entity_view_mode.file.token.yml b/configuration/core.entity_view_mode.file.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.file.token.yml rename to configuration/core.entity_view_mode.file.token.yml diff --git a/config-yml/core.entity_view_mode.menu_link_content.token.yml b/configuration/core.entity_view_mode.menu_link_content.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.menu_link_content.token.yml rename to configuration/core.entity_view_mode.menu_link_content.token.yml diff --git a/config-yml/core.entity_view_mode.node.full.yml b/configuration/core.entity_view_mode.node.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.full.yml rename to configuration/core.entity_view_mode.node.full.yml diff --git a/config-yml/core.entity_view_mode.node.rss.yml b/configuration/core.entity_view_mode.node.rss.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.rss.yml rename to configuration/core.entity_view_mode.node.rss.yml diff --git a/config-yml/core.entity_view_mode.node.search_index.yml b/configuration/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/core.entity_view_mode.node.search_index.yml diff --git a/config-yml/core.entity_view_mode.node.search_result.yml b/configuration/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/core.entity_view_mode.node.search_result.yml diff --git a/config-yml/core.entity_view_mode.node.teaser.yml b/configuration/core.entity_view_mode.node.teaser.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.teaser.yml rename to configuration/core.entity_view_mode.node.teaser.yml diff --git a/config-yml/core.entity_view_mode.node.token.yml b/configuration/core.entity_view_mode.node.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.node.token.yml rename to configuration/core.entity_view_mode.node.token.yml diff --git a/config-yml/core.entity_view_mode.taxonomy_term.full.yml b/configuration/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/core.entity_view_mode.taxonomy_term.full.yml diff --git a/config-yml/core.entity_view_mode.taxonomy_term.token.yml b/configuration/core.entity_view_mode.taxonomy_term.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.taxonomy_term.token.yml rename to configuration/core.entity_view_mode.taxonomy_term.token.yml diff --git a/config-yml/core.entity_view_mode.user.compact.yml b/configuration/core.entity_view_mode.user.compact.yml similarity index 100% rename from config-yml/core.entity_view_mode.user.compact.yml rename to configuration/core.entity_view_mode.user.compact.yml diff --git a/config-yml/core.entity_view_mode.user.full.yml b/configuration/core.entity_view_mode.user.full.yml similarity index 100% rename from config-yml/core.entity_view_mode.user.full.yml rename to configuration/core.entity_view_mode.user.full.yml diff --git a/config-yml/core.entity_view_mode.user.token.yml b/configuration/core.entity_view_mode.user.token.yml similarity index 100% rename from config-yml/core.entity_view_mode.user.token.yml rename to configuration/core.entity_view_mode.user.token.yml diff --git a/config-yml/core.extension.yml b/configuration/core.extension.yml similarity index 100% rename from config-yml/core.extension.yml rename to configuration/core.extension.yml diff --git a/config-yml/core.menu.static_menu_link_overrides.yml b/configuration/core.menu.static_menu_link_overrides.yml similarity index 100% rename from config-yml/core.menu.static_menu_link_overrides.yml rename to configuration/core.menu.static_menu_link_overrides.yml diff --git a/config-yml/editor.editor.full_html.yml b/configuration/editor.editor.full_html.yml similarity index 100% rename from config-yml/editor.editor.full_html.yml rename to configuration/editor.editor.full_html.yml diff --git a/config-yml/field.field.block_content.basic_block.body.yml b/configuration/field.field.block_content.basic_block.body.yml similarity index 100% rename from config-yml/field.field.block_content.basic_block.body.yml rename to configuration/field.field.block_content.basic_block.body.yml diff --git a/config-yml/field.field.node.basic_page.body.yml b/configuration/field.field.node.basic_page.body.yml similarity index 100% rename from config-yml/field.field.node.basic_page.body.yml rename to configuration/field.field.node.basic_page.body.yml diff --git a/config-yml/field.field.node.encyclopedia_item.body.yml b/configuration/field.field.node.encyclopedia_item.body.yml similarity index 100% rename from config-yml/field.field.node.encyclopedia_item.body.yml rename to configuration/field.field.node.encyclopedia_item.body.yml diff --git a/config-yml/field.field.node.encyclopedia_item.field_glossary_section.yml b/configuration/field.field.node.encyclopedia_item.field_glossary_section.yml similarity index 100% rename from config-yml/field.field.node.encyclopedia_item.field_glossary_section.yml rename to configuration/field.field.node.encyclopedia_item.field_glossary_section.yml diff --git a/config-yml/field.field.node.encyclopedia_item.field_image.yml b/configuration/field.field.node.encyclopedia_item.field_image.yml similarity index 100% rename from config-yml/field.field.node.encyclopedia_item.field_image.yml rename to configuration/field.field.node.encyclopedia_item.field_image.yml diff --git a/config-yml/field.field.node.encyclopedia_item.field_image_caption.yml b/configuration/field.field.node.encyclopedia_item.field_image_caption.yml similarity index 100% rename from config-yml/field.field.node.encyclopedia_item.field_image_caption.yml rename to configuration/field.field.node.encyclopedia_item.field_image_caption.yml diff --git a/config-yml/field.field.node.encyclopedia_item.field_listing_title.yml b/configuration/field.field.node.encyclopedia_item.field_listing_title.yml similarity index 100% rename from config-yml/field.field.node.encyclopedia_item.field_listing_title.yml rename to configuration/field.field.node.encyclopedia_item.field_listing_title.yml diff --git a/config-yml/field.settings.yml b/configuration/field.settings.yml similarity index 100% rename from config-yml/field.settings.yml rename to configuration/field.settings.yml diff --git a/config-yml/field.storage.block_content.body.yml b/configuration/field.storage.block_content.body.yml similarity index 100% rename from config-yml/field.storage.block_content.body.yml rename to configuration/field.storage.block_content.body.yml diff --git a/config-yml/field.storage.comment.comment_body.yml b/configuration/field.storage.comment.comment_body.yml similarity index 100% rename from config-yml/field.storage.comment.comment_body.yml rename to configuration/field.storage.comment.comment_body.yml diff --git a/config-yml/field.storage.node.body.yml b/configuration/field.storage.node.body.yml similarity index 100% rename from config-yml/field.storage.node.body.yml rename to configuration/field.storage.node.body.yml diff --git a/config-yml/field.storage.node.field_glossary_section.yml b/configuration/field.storage.node.field_glossary_section.yml similarity index 100% rename from config-yml/field.storage.node.field_glossary_section.yml rename to configuration/field.storage.node.field_glossary_section.yml diff --git a/config-yml/field.storage.node.field_image.yml b/configuration/field.storage.node.field_image.yml similarity index 100% rename from config-yml/field.storage.node.field_image.yml rename to configuration/field.storage.node.field_image.yml diff --git a/config-yml/field.storage.node.field_image_caption.yml b/configuration/field.storage.node.field_image_caption.yml similarity index 100% rename from config-yml/field.storage.node.field_image_caption.yml rename to configuration/field.storage.node.field_image_caption.yml diff --git a/config-yml/field.storage.node.field_listing_title.yml b/configuration/field.storage.node.field_listing_title.yml similarity index 100% rename from config-yml/field.storage.node.field_listing_title.yml rename to configuration/field.storage.node.field_listing_title.yml diff --git a/config-yml/field_ui.settings.yml b/configuration/field_ui.settings.yml similarity index 100% rename from config-yml/field_ui.settings.yml rename to configuration/field_ui.settings.yml diff --git a/config-yml/file.settings.yml b/configuration/file.settings.yml similarity index 100% rename from config-yml/file.settings.yml rename to configuration/file.settings.yml diff --git a/config-yml/filter.format.basic_html.yml b/configuration/filter.format.basic_html.yml similarity index 100% rename from config-yml/filter.format.basic_html.yml rename to configuration/filter.format.basic_html.yml diff --git a/config-yml/filter.format.full_html.yml b/configuration/filter.format.full_html.yml similarity index 100% rename from config-yml/filter.format.full_html.yml rename to configuration/filter.format.full_html.yml diff --git a/config-yml/filter.format.plain_text.yml b/configuration/filter.format.plain_text.yml similarity index 100% rename from config-yml/filter.format.plain_text.yml rename to configuration/filter.format.plain_text.yml diff --git a/config-yml/filter.format.restricted_html.yml b/configuration/filter.format.restricted_html.yml similarity index 100% rename from config-yml/filter.format.restricted_html.yml rename to configuration/filter.format.restricted_html.yml diff --git a/config-yml/filter.settings.yml b/configuration/filter.settings.yml similarity index 100% rename from config-yml/filter.settings.yml rename to configuration/filter.settings.yml diff --git a/config-yml/google_analytics.settings.yml b/configuration/google_analytics.settings.yml similarity index 100% rename from config-yml/google_analytics.settings.yml rename to configuration/google_analytics.settings.yml diff --git a/config-yml/image.settings.yml b/configuration/image.settings.yml similarity index 100% rename from config-yml/image.settings.yml rename to configuration/image.settings.yml diff --git a/config-yml/image.style.encyclopedia_image.yml b/configuration/image.style.encyclopedia_image.yml similarity index 100% rename from config-yml/image.style.encyclopedia_image.yml rename to configuration/image.style.encyclopedia_image.yml diff --git a/config-yml/image.style.large.yml b/configuration/image.style.large.yml similarity index 100% rename from config-yml/image.style.large.yml rename to configuration/image.style.large.yml diff --git a/config-yml/image.style.linkit_result_thumbnail.yml b/configuration/image.style.linkit_result_thumbnail.yml similarity index 100% rename from config-yml/image.style.linkit_result_thumbnail.yml rename to configuration/image.style.linkit_result_thumbnail.yml diff --git a/config-yml/image.style.medium.yml b/configuration/image.style.medium.yml similarity index 100% rename from config-yml/image.style.medium.yml rename to configuration/image.style.medium.yml diff --git a/config-yml/image.style.thumbnail.yml b/configuration/image.style.thumbnail.yml similarity index 100% rename from config-yml/image.style.thumbnail.yml rename to configuration/image.style.thumbnail.yml diff --git a/config-yml/jquery_scrollup.settings.yml b/configuration/jquery_scrollup.settings.yml similarity index 100% rename from config-yml/jquery_scrollup.settings.yml rename to configuration/jquery_scrollup.settings.yml diff --git a/config-yml/language.content_settings.node.basic_page.yml b/configuration/language.content_settings.node.basic_page.yml similarity index 100% rename from config-yml/language.content_settings.node.basic_page.yml rename to configuration/language.content_settings.node.basic_page.yml diff --git a/config-yml/language.content_settings.node.encyclopedia_item.yml b/configuration/language.content_settings.node.encyclopedia_item.yml similarity index 100% rename from config-yml/language.content_settings.node.encyclopedia_item.yml rename to configuration/language.content_settings.node.encyclopedia_item.yml diff --git a/config-yml/language.content_settings.path_alias.path_alias.yml b/configuration/language.content_settings.path_alias.path_alias.yml similarity index 100% rename from config-yml/language.content_settings.path_alias.path_alias.yml rename to configuration/language.content_settings.path_alias.path_alias.yml diff --git a/config-yml/language.entity.en.yml b/configuration/language.entity.en.yml similarity index 100% rename from config-yml/language.entity.en.yml rename to configuration/language.entity.en.yml diff --git a/config-yml/language.entity.und.yml b/configuration/language.entity.und.yml similarity index 100% rename from config-yml/language.entity.und.yml rename to configuration/language.entity.und.yml diff --git a/config-yml/language.entity.zxx.yml b/configuration/language.entity.zxx.yml similarity index 100% rename from config-yml/language.entity.zxx.yml rename to configuration/language.entity.zxx.yml diff --git a/config-yml/language.mappings.yml b/configuration/language.mappings.yml similarity index 100% rename from config-yml/language.mappings.yml rename to configuration/language.mappings.yml diff --git a/config-yml/language.negotiation.yml b/configuration/language.negotiation.yml similarity index 100% rename from config-yml/language.negotiation.yml rename to configuration/language.negotiation.yml diff --git a/config-yml/language.types.yml b/configuration/language.types.yml similarity index 100% rename from config-yml/language.types.yml rename to configuration/language.types.yml diff --git a/config-yml/linkit.linkit_profile.all_content_types.yml b/configuration/linkit.linkit_profile.all_content_types.yml similarity index 100% rename from config-yml/linkit.linkit_profile.all_content_types.yml rename to configuration/linkit.linkit_profile.all_content_types.yml diff --git a/config-yml/login_destination.destination.front_page_redirect.yml b/configuration/login_destination.destination.front_page_redirect.yml similarity index 100% rename from config-yml/login_destination.destination.front_page_redirect.yml rename to configuration/login_destination.destination.front_page_redirect.yml diff --git a/config-yml/login_destination.settings.yml b/configuration/login_destination.settings.yml similarity index 100% rename from config-yml/login_destination.settings.yml rename to configuration/login_destination.settings.yml diff --git a/config-yml/menu_ui.settings.yml b/configuration/menu_ui.settings.yml similarity index 100% rename from config-yml/menu_ui.settings.yml rename to configuration/menu_ui.settings.yml diff --git a/config-yml/nble_lib_unb_ca.settings.yml b/configuration/nble_lib_unb_ca.settings.yml similarity index 100% rename from config-yml/nble_lib_unb_ca.settings.yml rename to configuration/nble_lib_unb_ca.settings.yml diff --git a/config-yml/node.settings.yml b/configuration/node.settings.yml similarity index 100% rename from config-yml/node.settings.yml rename to configuration/node.settings.yml diff --git a/config-yml/node.type.basic_page.yml b/configuration/node.type.basic_page.yml similarity index 100% rename from config-yml/node.type.basic_page.yml rename to configuration/node.type.basic_page.yml diff --git a/config-yml/node.type.encyclopedia_item.yml b/configuration/node.type.encyclopedia_item.yml similarity index 100% rename from config-yml/node.type.encyclopedia_item.yml rename to configuration/node.type.encyclopedia_item.yml diff --git a/config-yml/noreqnewpass.settings_form.yml b/configuration/noreqnewpass.settings_form.yml similarity index 100% rename from config-yml/noreqnewpass.settings_form.yml rename to configuration/noreqnewpass.settings_form.yml diff --git a/config-yml/pathauto.pattern.basic_page_paths.yml b/configuration/pathauto.pattern.basic_page_paths.yml similarity index 100% rename from config-yml/pathauto.pattern.basic_page_paths.yml rename to configuration/pathauto.pattern.basic_page_paths.yml diff --git a/config-yml/pathauto.pattern.encyclodpedia_itme.yml b/configuration/pathauto.pattern.encyclodpedia_itme.yml similarity index 100% rename from config-yml/pathauto.pattern.encyclodpedia_itme.yml rename to configuration/pathauto.pattern.encyclodpedia_itme.yml diff --git a/config-yml/pathauto.settings.yml b/configuration/pathauto.settings.yml similarity index 100% rename from config-yml/pathauto.settings.yml rename to configuration/pathauto.settings.yml diff --git a/config-yml/samlauth.authentication.yml b/configuration/samlauth.authentication.yml similarity index 100% rename from config-yml/samlauth.authentication.yml rename to configuration/samlauth.authentication.yml diff --git a/config-yml/search_api.index.resources_nble_lib_unb_ca.yml b/configuration/search_api.index.resources_nble_lib_unb_ca.yml similarity index 100% rename from config-yml/search_api.index.resources_nble_lib_unb_ca.yml rename to configuration/search_api.index.resources_nble_lib_unb_ca.yml diff --git a/config-yml/search_api.server.drupal_solr_nble_lib_unb_ca.yml b/configuration/search_api.server.drupal_solr_nble_lib_unb_ca.yml similarity index 100% rename from config-yml/search_api.server.drupal_solr_nble_lib_unb_ca.yml rename to configuration/search_api.server.drupal_solr_nble_lib_unb_ca.yml diff --git a/config-yml/search_api.settings.yml b/configuration/search_api.settings.yml similarity index 100% rename from config-yml/search_api.settings.yml rename to configuration/search_api.settings.yml diff --git a/config-yml/search_api_solr.solr_cache.cache_document_default_7_0_0.yml b/configuration/search_api_solr.solr_cache.cache_document_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_cache.cache_document_default_7_0_0.yml rename to configuration/search_api_solr.solr_cache.cache_document_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml b/configuration/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml rename to configuration/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml b/configuration/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml rename to configuration/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml b/configuration/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml rename to configuration/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml b/configuration/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml rename to configuration/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_en_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_en_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_en_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_en_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_en_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_en_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_en_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_en_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_und_6_0_0.yml b/configuration/search_api_solr.solr_field_type.text_und_6_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_und_6_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_und_6_0_0.yml diff --git a/config-yml/search_api_solr.solr_field_type.text_und_7_0_0.yml b/configuration/search_api_solr.solr_field_type.text_und_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_field_type.text_und_7_0_0.yml rename to configuration/search_api_solr.solr_field_type.text_und_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml b/configuration/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml b/configuration/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml diff --git a/config-yml/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml b/configuration/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml similarity index 100% rename from config-yml/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml rename to configuration/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml diff --git a/config-yml/simple_sitemap.bundle_settings.default.node.basic_page.yml b/configuration/simple_sitemap.bundle_settings.default.node.basic_page.yml similarity index 100% rename from config-yml/simple_sitemap.bundle_settings.default.node.basic_page.yml rename to configuration/simple_sitemap.bundle_settings.default.node.basic_page.yml diff --git a/config-yml/simple_sitemap.bundle_settings.default.node.encyclopedia_item.yml b/configuration/simple_sitemap.bundle_settings.default.node.encyclopedia_item.yml similarity index 100% rename from config-yml/simple_sitemap.bundle_settings.default.node.encyclopedia_item.yml rename to configuration/simple_sitemap.bundle_settings.default.node.encyclopedia_item.yml diff --git a/config-yml/simple_sitemap.settings.yml b/configuration/simple_sitemap.settings.yml similarity index 100% rename from config-yml/simple_sitemap.settings.yml rename to configuration/simple_sitemap.settings.yml diff --git a/config-yml/simple_sitemap.sitemap.default.yml b/configuration/simple_sitemap.sitemap.default.yml similarity index 100% rename from config-yml/simple_sitemap.sitemap.default.yml rename to configuration/simple_sitemap.sitemap.default.yml diff --git a/config-yml/simple_sitemap.sitemap.index.yml b/configuration/simple_sitemap.sitemap.index.yml similarity index 100% rename from config-yml/simple_sitemap.sitemap.index.yml rename to configuration/simple_sitemap.sitemap.index.yml diff --git a/config-yml/simple_sitemap.type.default_hreflang.yml b/configuration/simple_sitemap.type.default_hreflang.yml similarity index 100% rename from config-yml/simple_sitemap.type.default_hreflang.yml rename to configuration/simple_sitemap.type.default_hreflang.yml diff --git a/config-yml/simple_sitemap.type.index.yml b/configuration/simple_sitemap.type.index.yml similarity index 100% rename from config-yml/simple_sitemap.type.index.yml rename to configuration/simple_sitemap.type.index.yml diff --git a/config-yml/system.action.comment_delete_action.yml b/configuration/system.action.comment_delete_action.yml similarity index 100% rename from config-yml/system.action.comment_delete_action.yml rename to configuration/system.action.comment_delete_action.yml diff --git a/config-yml/system.action.comment_publish_action.yml b/configuration/system.action.comment_publish_action.yml similarity index 100% rename from config-yml/system.action.comment_publish_action.yml rename to configuration/system.action.comment_publish_action.yml diff --git a/config-yml/system.action.comment_save_action.yml b/configuration/system.action.comment_save_action.yml similarity index 100% rename from config-yml/system.action.comment_save_action.yml rename to configuration/system.action.comment_save_action.yml diff --git a/config-yml/system.action.comment_unpublish_action.yml b/configuration/system.action.comment_unpublish_action.yml similarity index 100% rename from config-yml/system.action.comment_unpublish_action.yml rename to configuration/system.action.comment_unpublish_action.yml diff --git a/config-yml/system.action.node_delete_action.yml b/configuration/system.action.node_delete_action.yml similarity index 100% rename from config-yml/system.action.node_delete_action.yml rename to configuration/system.action.node_delete_action.yml diff --git a/config-yml/system.action.node_make_sticky_action.yml b/configuration/system.action.node_make_sticky_action.yml similarity index 100% rename from config-yml/system.action.node_make_sticky_action.yml rename to configuration/system.action.node_make_sticky_action.yml diff --git a/config-yml/system.action.node_make_unsticky_action.yml b/configuration/system.action.node_make_unsticky_action.yml similarity index 100% rename from config-yml/system.action.node_make_unsticky_action.yml rename to configuration/system.action.node_make_unsticky_action.yml diff --git a/config-yml/system.action.node_promote_action.yml b/configuration/system.action.node_promote_action.yml similarity index 100% rename from config-yml/system.action.node_promote_action.yml rename to configuration/system.action.node_promote_action.yml diff --git a/config-yml/system.action.node_publish_action.yml b/configuration/system.action.node_publish_action.yml similarity index 100% rename from config-yml/system.action.node_publish_action.yml rename to configuration/system.action.node_publish_action.yml diff --git a/config-yml/system.action.node_save_action.yml b/configuration/system.action.node_save_action.yml similarity index 100% rename from config-yml/system.action.node_save_action.yml rename to configuration/system.action.node_save_action.yml diff --git a/config-yml/system.action.node_unpromote_action.yml b/configuration/system.action.node_unpromote_action.yml similarity index 100% rename from config-yml/system.action.node_unpromote_action.yml rename to configuration/system.action.node_unpromote_action.yml diff --git a/config-yml/system.action.node_unpublish_action.yml b/configuration/system.action.node_unpublish_action.yml similarity index 100% rename from config-yml/system.action.node_unpublish_action.yml rename to configuration/system.action.node_unpublish_action.yml diff --git a/config-yml/system.action.pathauto_update_alias_node.yml b/configuration/system.action.pathauto_update_alias_node.yml similarity index 100% rename from config-yml/system.action.pathauto_update_alias_node.yml rename to configuration/system.action.pathauto_update_alias_node.yml diff --git a/config-yml/system.action.pathauto_update_alias_user.yml b/configuration/system.action.pathauto_update_alias_user.yml similarity index 100% rename from config-yml/system.action.pathauto_update_alias_user.yml rename to configuration/system.action.pathauto_update_alias_user.yml diff --git a/config-yml/system.action.user_add_role_action.editor.yml b/configuration/system.action.user_add_role_action.editor.yml similarity index 100% rename from config-yml/system.action.user_add_role_action.editor.yml rename to configuration/system.action.user_add_role_action.editor.yml diff --git a/config-yml/system.action.user_block_user_action.yml b/configuration/system.action.user_block_user_action.yml similarity index 100% rename from config-yml/system.action.user_block_user_action.yml rename to configuration/system.action.user_block_user_action.yml diff --git a/config-yml/system.action.user_cancel_user_action.yml b/configuration/system.action.user_cancel_user_action.yml similarity index 100% rename from config-yml/system.action.user_cancel_user_action.yml rename to configuration/system.action.user_cancel_user_action.yml diff --git a/config-yml/system.action.user_remove_role_action.editor.yml b/configuration/system.action.user_remove_role_action.editor.yml similarity index 100% rename from config-yml/system.action.user_remove_role_action.editor.yml rename to configuration/system.action.user_remove_role_action.editor.yml diff --git a/config-yml/system.action.user_unblock_user_action.yml b/configuration/system.action.user_unblock_user_action.yml similarity index 100% rename from config-yml/system.action.user_unblock_user_action.yml rename to configuration/system.action.user_unblock_user_action.yml diff --git a/config-yml/system.authorize.yml b/configuration/system.authorize.yml similarity index 100% rename from config-yml/system.authorize.yml rename to configuration/system.authorize.yml diff --git a/config-yml/system.cron.yml b/configuration/system.cron.yml similarity index 100% rename from config-yml/system.cron.yml rename to configuration/system.cron.yml diff --git a/config-yml/system.date.yml b/configuration/system.date.yml similarity index 100% rename from config-yml/system.date.yml rename to configuration/system.date.yml diff --git a/config-yml/system.diff.yml b/configuration/system.diff.yml similarity index 100% rename from config-yml/system.diff.yml rename to configuration/system.diff.yml diff --git a/config-yml/system.file.yml b/configuration/system.file.yml similarity index 100% rename from config-yml/system.file.yml rename to configuration/system.file.yml diff --git a/config-yml/system.image.gd.yml b/configuration/system.image.gd.yml similarity index 100% rename from config-yml/system.image.gd.yml rename to configuration/system.image.gd.yml diff --git a/config-yml/system.image.yml b/configuration/system.image.yml similarity index 100% rename from config-yml/system.image.yml rename to configuration/system.image.yml diff --git a/config-yml/system.logging.yml b/configuration/system.logging.yml similarity index 100% rename from config-yml/system.logging.yml rename to configuration/system.logging.yml diff --git a/config-yml/system.mail.yml b/configuration/system.mail.yml similarity index 100% rename from config-yml/system.mail.yml rename to configuration/system.mail.yml diff --git a/config-yml/system.maintenance.yml b/configuration/system.maintenance.yml similarity index 100% rename from config-yml/system.maintenance.yml rename to configuration/system.maintenance.yml diff --git a/config-yml/system.menu.account.yml b/configuration/system.menu.account.yml similarity index 100% rename from config-yml/system.menu.account.yml rename to configuration/system.menu.account.yml diff --git a/config-yml/system.menu.admin.yml b/configuration/system.menu.admin.yml similarity index 100% rename from config-yml/system.menu.admin.yml rename to configuration/system.menu.admin.yml diff --git a/config-yml/system.menu.footer.yml b/configuration/system.menu.footer.yml similarity index 100% rename from config-yml/system.menu.footer.yml rename to configuration/system.menu.footer.yml diff --git a/config-yml/system.menu.main.yml b/configuration/system.menu.main.yml similarity index 100% rename from config-yml/system.menu.main.yml rename to configuration/system.menu.main.yml diff --git a/config-yml/system.menu.tools.yml b/configuration/system.menu.tools.yml similarity index 100% rename from config-yml/system.menu.tools.yml rename to configuration/system.menu.tools.yml diff --git a/config-yml/system.performance.yml b/configuration/system.performance.yml similarity index 100% rename from config-yml/system.performance.yml rename to configuration/system.performance.yml diff --git a/config-yml/system.rss.yml b/configuration/system.rss.yml similarity index 100% rename from config-yml/system.rss.yml rename to configuration/system.rss.yml diff --git a/config-yml/system.site.yml b/configuration/system.site.yml similarity index 100% rename from config-yml/system.site.yml rename to configuration/system.site.yml diff --git a/config-yml/system.theme.global.yml b/configuration/system.theme.global.yml similarity index 100% rename from config-yml/system.theme.global.yml rename to configuration/system.theme.global.yml diff --git a/config-yml/system.theme.yml b/configuration/system.theme.yml similarity index 100% rename from config-yml/system.theme.yml rename to configuration/system.theme.yml diff --git a/config-yml/taxonomy.settings.yml b/configuration/taxonomy.settings.yml similarity index 100% rename from config-yml/taxonomy.settings.yml rename to configuration/taxonomy.settings.yml diff --git a/config-yml/text.settings.yml b/configuration/text.settings.yml similarity index 100% rename from config-yml/text.settings.yml rename to configuration/text.settings.yml diff --git a/config-yml/update.settings.yml b/configuration/update.settings.yml similarity index 100% rename from config-yml/update.settings.yml rename to configuration/update.settings.yml diff --git a/config-yml/user.flood.yml b/configuration/user.flood.yml similarity index 100% rename from config-yml/user.flood.yml rename to configuration/user.flood.yml diff --git a/config-yml/user.mail.yml b/configuration/user.mail.yml similarity index 100% rename from config-yml/user.mail.yml rename to configuration/user.mail.yml diff --git a/config-yml/user.role.anonymous.yml b/configuration/user.role.anonymous.yml similarity index 100% rename from config-yml/user.role.anonymous.yml rename to configuration/user.role.anonymous.yml diff --git a/config-yml/user.role.authenticated.yml b/configuration/user.role.authenticated.yml similarity index 100% rename from config-yml/user.role.authenticated.yml rename to configuration/user.role.authenticated.yml diff --git a/config-yml/user.role.editor.yml b/configuration/user.role.editor.yml similarity index 100% rename from config-yml/user.role.editor.yml rename to configuration/user.role.editor.yml diff --git a/config-yml/user.settings.yml b/configuration/user.settings.yml similarity index 100% rename from config-yml/user.settings.yml rename to configuration/user.settings.yml diff --git a/config-yml/views.settings.yml b/configuration/views.settings.yml similarity index 100% rename from config-yml/views.settings.yml rename to configuration/views.settings.yml diff --git a/config-yml/views.view.archive.yml b/configuration/views.view.archive.yml similarity index 100% rename from config-yml/views.view.archive.yml rename to configuration/views.view.archive.yml diff --git a/config-yml/views.view.block_content.yml b/configuration/views.view.block_content.yml similarity index 100% rename from config-yml/views.view.block_content.yml rename to configuration/views.view.block_content.yml diff --git a/config-yml/views.view.browse_encyclopedia.yml b/configuration/views.view.browse_encyclopedia.yml similarity index 100% rename from config-yml/views.view.browse_encyclopedia.yml rename to configuration/views.view.browse_encyclopedia.yml diff --git a/config-yml/views.view.comment.yml b/configuration/views.view.comment.yml similarity index 100% rename from config-yml/views.view.comment.yml rename to configuration/views.view.comment.yml diff --git a/config-yml/views.view.comments_recent.yml b/configuration/views.view.comments_recent.yml similarity index 100% rename from config-yml/views.view.comments_recent.yml rename to configuration/views.view.comments_recent.yml diff --git a/config-yml/views.view.content.yml b/configuration/views.view.content.yml similarity index 100% rename from config-yml/views.view.content.yml rename to configuration/views.view.content.yml diff --git a/config-yml/views.view.content_recent.yml b/configuration/views.view.content_recent.yml similarity index 100% rename from config-yml/views.view.content_recent.yml rename to configuration/views.view.content_recent.yml diff --git a/config-yml/views.view.files.yml b/configuration/views.view.files.yml similarity index 100% rename from config-yml/views.view.files.yml rename to configuration/views.view.files.yml diff --git a/config-yml/views.view.frontpage.yml b/configuration/views.view.frontpage.yml similarity index 100% rename from config-yml/views.view.frontpage.yml rename to configuration/views.view.frontpage.yml diff --git a/config-yml/views.view.glossary.yml b/configuration/views.view.glossary.yml similarity index 100% rename from config-yml/views.view.glossary.yml rename to configuration/views.view.glossary.yml diff --git a/config-yml/views.view.search_encyclopedia.yml b/configuration/views.view.search_encyclopedia.yml similarity index 100% rename from config-yml/views.view.search_encyclopedia.yml rename to configuration/views.view.search_encyclopedia.yml diff --git a/config-yml/views.view.taxonomy_term.yml b/configuration/views.view.taxonomy_term.yml similarity index 100% rename from config-yml/views.view.taxonomy_term.yml rename to configuration/views.view.taxonomy_term.yml diff --git a/config-yml/views.view.user_admin_people.yml b/configuration/views.view.user_admin_people.yml similarity index 100% rename from config-yml/views.view.user_admin_people.yml rename to configuration/views.view.user_admin_people.yml diff --git a/config-yml/views.view.who_s_new.yml b/configuration/views.view.who_s_new.yml similarity index 100% rename from config-yml/views.view.who_s_new.yml rename to configuration/views.view.who_s_new.yml diff --git a/config-yml/views.view.who_s_online.yml b/configuration/views.view.who_s_online.yml similarity index 100% rename from config-yml/views.view.who_s_online.yml rename to configuration/views.view.who_s_online.yml diff --git a/docker-compose.yml b/docker-compose.yml index c0336d6..4549414 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: - nble.lib.unb.ca entrypoint: - docker-entrypoint-multiple.sh - - resources.nble.lib.unb.ca:/solr-conf + - resources.nble-lib-unb-ca:/solr-conf volumes: - solr-data:/opt/solr/server/solr/mycores drupal-redis-lib-unb-ca: @@ -34,11 +34,11 @@ services: - nble.lib.unb.ca env_file: - ./env/redis.env - nble.lib.unb.ca: + nble-lib-unb-ca: build: context: . restart: unless-stopped - container_name: nble.lib.unb.ca + container_name: nble-lib-unb-ca depends_on: - drupal-mysql-lib-unb-ca - drupal-solr-lib-unb-ca @@ -53,7 +53,7 @@ services: - ./env/drupal.env 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