diff --git a/build-scripts/drupal7os/docker-entrypoint-d7os.sh b/build-scripts/drupal7os/docker-entrypoint-d7os.sh index 46007117fa3e53ebf4c147820683972fcd00d03e..b609ef6f926d4f329d517495924b01645393bd17 100644 --- a/build-scripts/drupal7os/docker-entrypoint-d7os.sh +++ b/build-scripts/drupal7os/docker-entrypoint-d7os.sh @@ -12,7 +12,7 @@ if [ -f /run/apache2/apache2.pid ]; then fi # Allow the Apache docroot to be overridden. -APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/drupal7}" +APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/drupal7os}" if [ -n "$APACHE_DOCROOT_DIR" ]; then sed -i 's@^\s*DocumentRoot.*@'" DocumentRoot ${APACHE_DOCROOT_DIR}"'@' /etc/apache2/sites-available/000-default.conf fi @@ -35,7 +35,7 @@ fi ## Change permissions on /var/www/drupal7os chown -R vagrant:www-data /var/www/drupal7os -chmod -R g+w /var/www/drupal7 +chmod -R g+w /var/www/drupal7os # Now that we're set up, run whatever command was passed to the entrypoint. exec "$@" diff --git a/build-scripts/drupal7os/settings.conf b/build-scripts/drupal7os/settings.conf index c6b0089f70fbcddcae461b91040fee24e86baf03..559cbccbdb06f00049b570b651040f198dd8520b 100644 --- a/build-scripts/drupal7os/settings.conf +++ b/build-scripts/drupal7os/settings.conf @@ -1,7 +1,7 @@ <?php // Server domain name. -$UWhost = 'wcms-docker:4443'; +$UWhost = 'wcms-docker:4445'; // Path to site root. $UWpref = 'fdsu1'; // Name of site database. diff --git a/build-scripts/drupal8/settings.conf b/build-scripts/drupal8/settings.conf index ed598f14714e66c2dda1d22bbd5df56b0a6bb984..745c70b75f59cfb31b1668f4fadf77640c8e8ac6 100644 --- a/build-scripts/drupal8/settings.conf +++ b/build-scripts/drupal8/settings.conf @@ -1,6 +1,6 @@ <?php // Server domain name. -$UWhost = 'wcms-docker:4444'; +$UWhost = 'wcms-docker:4446'; // Path to site root. $UWpref = 'fdsu1'; // Name of site database. diff --git a/build-scripts/wcms7.2/settings.conf b/build-scripts/wcms7.2/settings.conf index 1fde89bf446ecda14848beae538050ad5a30577f..e23424ddf7b2e6c13eb6c00c4930bbe988d43748 100644 --- a/build-scripts/wcms7.2/settings.conf +++ b/build-scripts/wcms7.2/settings.conf @@ -1,7 +1,7 @@ <?php // Server domain name. -$UWhost = 'wcms-docker:4443'; +$UWhost = 'wcms-docker:4444'; // Path to site root. $UWpref = 'fdsu1'; // Name of site database.