Skip to content

Commit cdbb614

Browse files
committed
Rename conf folder to config
1 parent 96854ef commit cdbb614

9 files changed

+18
-138
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/vendor/
44
/mutagen/
55

6-
/conf/.env.development
7-
/conf/.env.production
6+
/config/.env.development
7+
/config/.env.production
88
/certificates/private.key
99
/certificates/public.key
1010
/certificates/youvo7.key

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To set up a Drupal distribution with the `youvo_development` profile, do the fol
1010

1111
1. Clone repository to your server.
1212
2. Run `composer install`.
13-
3. Copy or configure `conf/.env.development`.
13+
3. Copy or configure `config/.env.development`.
1414
4. Run `scripts/install-development.sh`.
1515

1616
This includes development modules such as `devel`, `coder`, `phpcodesniffer`, `phpunit`, `admin_toolbar` and more.
@@ -24,7 +24,7 @@ To set up a Drupal distribution with the `youvo_platform` profile, do the follow
2424

2525
1. Clone repository to your server.
2626
2. Run `composer install --no-dev`.
27-
3. Copy or configure `conf/.env.production`.
27+
3. Copy or configure `config/.env.production`.
2828
4. Run `scripts/install-production.sh`.
2929

3030
This provides a clean-state installation. This administrator login can be found in the environment file. The
@@ -81,14 +81,14 @@ To set up a local Drupal distribution with the `youvo_development` profile, do t
8181

8282
1. Clone repository to your system.
8383
2. Run `composer install --no-interaction --no-progress`.
84-
3. Consult and configure `conf/.env.local`.
84+
3. Consult and configure `config/.env.local`.
8585
4. Run `scripts/install-local.sh`.
8686

87-
Provides development modules as described above. You may need to adjust folder permissions for
87+
Provides development modules as described above. You may need to adjust folder permissions for
8888
dummy content folders `academy` and `projects`. Use
8989

90-
`chmod 0666 -R academy`
91-
`chmod 0666 -R projects`
90+
`chmod 0666 -R academy`
91+
`chmod 0666 -R projects`
9292

9393
in the `sites/default/files` folder to grant permissions.
9494

conf/.env.local

-120
This file was deleted.
File renamed without changes.
File renamed without changes.

docker.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include conf/.env.local
1+
include config/.env.local
22

33
default: up
44

@@ -19,8 +19,8 @@ endif
1919
.PHONY: up
2020
up:
2121
@echo "Starting up containers for $(PROJECT_NAME)..."
22-
docker-compose --env-file conf/.env.local pull
23-
docker-compose --env-file conf/.env.local up -d --remove-orphans
22+
docker-compose --env-file config/.env.local pull
23+
docker-compose --env-file config/.env.local up -d --remove-orphans
2424

2525
.PHONY: mutagen
2626
mutagen:

scripts/install-development.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
cd ~
1010
cd www/$SITE_FOLDER
11-
set -a; source conf/.env.development; set +a
11+
set -a; source config/.env.development; set +a
1212

1313
# Delete database.
1414
mysql -e "DROP DATABASE IF EXISTS ${DB_NAME}"
@@ -49,13 +49,13 @@
4949
# Rebuild Cache.
5050
echo "Rebuilding Cache ..."
5151
drush cr > /dev/null 2>&1
52-
52+
5353
# Set permissions for settings file.
5454
cd ~
5555
cd www/$SITE_FOLDER/web/sites/default
5656
chmod 0444 settings.php
5757
chmod 0444 default.settings.php
58-
58+
5959
# Bye bye.
6060
echo "Exit in 3 seconds!"
6161
sleep 3

scripts/install-local-ddev.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# Get variables and stop docker containers.
1414
cd ..
15-
set -a; source conf/.env.local-ddev; set +a
15+
set -a; source config/.env.local-ddev; set +a
1616
echo "Stopping docker containers ..."
1717
ddev stop > /dev/null 2>&1
1818

scripts/install-production.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
cd ~
1010
cd www/$SITE_FOLDER
11-
set -a; source conf/.env.production; set +a
11+
set -a; source config/.env.production; set +a
1212

1313
# Delete database.
1414
mysql -e "DROP DATABASE IF EXISTS ${DB_NAME}"
@@ -49,13 +49,13 @@
4949
# Rebuild Cache.
5050
echo "Rebuilding Cache ..."
5151
drush cr > /dev/null 2>&1
52-
52+
5353
# Set permissions for settings file.
5454
cd ~
5555
cd www/$SITE_FOLDER/web/sites/default
5656
chmod 0444 settings.php
5757
chmod 0444 default.settings.php
58-
58+
5959
# Bye bye.
6060
echo "Exit in 3 seconds!"
6161
sleep 3

0 commit comments

Comments
 (0)