From 1d24cdc5962575086a82a12e26db33ca54bcbe42 Mon Sep 17 00:00:00 2001 From: Thomas Merkel Date: Mon, 11 Aug 2014 19:05:18 +0200 Subject: [PATCH] add missing slash for httpd, and be sure script run only once --- copy/opt/local/etc/httpd/vhosts/01-kumquat.conf | 4 ++-- copy/var/zoneinit/includes/50-kumquat.sh | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/copy/opt/local/etc/httpd/vhosts/01-kumquat.conf b/copy/opt/local/etc/httpd/vhosts/01-kumquat.conf index 41f01e6..929cc73 100644 --- a/copy/opt/local/etc/httpd/vhosts/01-kumquat.conf +++ b/copy/opt/local/etc/httpd/vhosts/01-kumquat.conf @@ -13,8 +13,8 @@ ProxyPreserveHost On - ProxyPass http://127.0.0.1:9000 - ProxyPassReverse http://127.0.0.1:9000 + ProxyPass http://127.0.0.1:9000/ + ProxyPassReverse http://127.0.0.1:9000/ SSLEngine On diff --git a/copy/var/zoneinit/includes/50-kumquat.sh b/copy/var/zoneinit/includes/50-kumquat.sh index ea064de..6630540 100644 --- a/copy/var/zoneinit/includes/50-kumquat.sh +++ b/copy/var/zoneinit/includes/50-kumquat.sh @@ -8,6 +8,12 @@ MYSQL_KUMQUAT=${MYSQL_KUMQUAT:-$(mdata-get mysql_kumquat_pw 2>/dev/null)} || \ MYSQL_KUMQUAT=$(od -An -N8 -x /dev/random | head -1 | tr -d ' '); mdata-put mysql_kumquat_pw "${MYSQL_KUMQUAT}" +# check if database exists already +if [ -d /var/mysql/kumquat ]; then + echo 'Database already exists, maybe some migration script will run in the future.' + exit 0 +fi + # create kumquat mysql database, user and privileges KUMQUAT_INIT="CREATE DATABASE IF NOT EXISTS kumquat; CREATE USER 'kumquat'@'localhost' IDENTIFIED BY '${MYSQL_KUMQUAT}'; @@ -51,8 +57,8 @@ DATABASES = { KUMQUAT_CERT_PATH = '/opt/local/etc/httpd/ssl/' KUMQUAT_VHOST_CONFIG = '/opt/local/etc/httpd/vhosts/vhosts.conf' KUMQUAT_VHOST_ROOT = '/var/www/' -KUMQUAT_VHOST_UID = www -KUMQUAT_VHOST_GID = www +KUMQUAT_VHOST_UID = 'www' +KUMQUAT_VHOST_GID = 'www' KUMQUAT_USE_ZFS = ${USE_ZFS} KUMQUAT_VHOST_DATASET = "${VHOST_DATASET}" KUMQUAT_WEBSERVER_RELOAD = 'svcadm refresh apache'