From 4366ed5748357f44d121925c6939040c17d92564 Mon Sep 17 00:00:00 2001
From: mnshantz <mnshantz@uwaterloo.ca>
Date: Wed, 13 Feb 2019 16:01:44 -0500
Subject: [PATCH] Fixed port numbers in settings files.
---
build-scripts/drupal7os/docker-entrypoint-d7os.sh | 4 ++--
build-scripts/drupal7os/settings.conf | 2 +-
build-scripts/drupal8/settings.conf | 2 +-
build-scripts/wcms7.2/settings.conf | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build-scripts/drupal7os/docker-entrypoint-d7os.sh b/build-scripts/drupal7os/docker-entrypoint-d7os.sh
index 4600711..b609ef6 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 c6b0089..559cbcc 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 ed598f1..745c70b 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 1fde89b..e23424d 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.
--
GitLab