From cdee9b398fc894cdbf2c74faad313105b5130bab Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Thu, 12 Mar 2015 19:34:13 +0000 Subject: [PATCH 1/3] Provision a bigger VM for server.test, fixes #52 #53 --- scripts/create_vultr.sh | 4 +++- scripts/start.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/create_vultr.sh b/scripts/create_vultr.sh index ebafc81..c2a1d38 100755 --- a/scripts/create_vultr.sh +++ b/scripts/create_vultr.sh @@ -20,10 +20,12 @@ LABEL=$1 echo Label: $LABEL echo API key: $VULTR_API_KEY +VPSPLANID=${2:-29} + SSHKEYID=`curl -s https://api.vultr.com/v1/sshkey/list\?api_key\=$VULTR_API_KEY | cut -d\" -f2` echo Got your ssh key ID $SSHKEYID: -SUBID=`curl -s -d "DCID=24&VPSPLANID=29&OSID=179&label=$LABEL&SSHKEYID=$SSHKEYID" https://api.vultr.com/v1/server/create\?api_key\=$VULTR_API_KEY | cut -d\" -f4` +SUBID=`curl -s -d "DCID=24&VPSPLANID=$VPSPLANID&OSID=179&label=$LABEL&SSHKEYID=$SSHKEYID" https://api.vultr.com/v1/server/create\?api_key\=$VULTR_API_KEY | cut -d\" -f4` echo Got your SUB ID $SUBID: while : diff --git a/scripts/start.sh b/scripts/start.sh index cddbe18..b0548db 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -19,7 +19,7 @@ BACKUP_IP=`cat /etc/hosts | grep backup.test | cut -d" " -f1` # Create server for tests -$ROOT_DIR/scripts/create_vultr.sh server.test +$ROOT_DIR/scripts/create_vultr.sh server.test 30 cat $ROOT_DIR/configs/server.config | sed s/##BACKUP_IP##/$BACKUP_IP/g > /tmp/server.config scp /tmp/server.config root@server.test:/var/lib/coreos-install/user_data scp $ROOT_DIR/scripts/install.sh root@server.test:/tmp/install.sh -- GitLab From da310455f6afe8fc512f0007e3c79c3447455a54 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Thu, 12 Mar 2015 19:57:19 +0000 Subject: [PATCH 2/3] Creates a proper cert for mail --- tests/email.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/email.sh b/tests/email.sh index 142af0a..00aa2d0 100755 --- a/tests/email.sh +++ b/tests/email.sh @@ -1,7 +1,7 @@ #!/bin/bash -eux mkdir -p /data/domains/mail/dovecot -mkdir -p /data/domains/mail/TLS +mkdir -p /data/domains/mail/TLS/ mkdir -p /data/domains/mail/static/www-content mkdir -p /data/runtime/domains/mail/mysql/db_files mkdir -p /data/domains/mail/mysql @@ -22,7 +22,7 @@ openssl x509 -req -days 365 \ -in /data/domains/mail/TLS/ssl_cert_sign_req.csr -signkey /data/domains/mail/TLS/ssl_private_key.pem -out /data/domains/mail/TLS/ssl_certificate.pem openssl dhparam -out /data/domains/mail/TLS/dh2048.pem 2048 -cp /data/domains/mail/TLS/ssl_certificate.pem /data/domains/mail/TLS/mail.pem +cat /data/domains/mail/TLS/ssl_certificate.pem /data/domains/mail/TLS/ssl_private_key.pem > /data/domains/mail/TLS/mail.pem systemctl enable dovecot systemctl enable postfix -- GitLab From ca234e91f5353d9bc8fd0a65ce3bb61b1b45f323 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Thu, 12 Mar 2015 19:57:50 +0000 Subject: [PATCH 3/3] Fixes email and charset error, closes #44 --- dockerfiles/services/nginx-php/Dockerfile | 1 + dockerfiles/services/owncloud/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/services/nginx-php/Dockerfile b/dockerfiles/services/nginx-php/Dockerfile index 4d0bedc..6e135cf 100644 --- a/dockerfiles/services/nginx-php/Dockerfile +++ b/dockerfiles/services/nginx-php/Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y \ sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf && \ sed -i 's/^pid/daemon off;\npid/g' /etc/nginx/nginx.conf && \ sed -i "s/.*sendmail_path.*/sendmail_path = \/usr\/sbin\/ssmtp -t/g" /etc/php5/fpm/php.ini && \ + sed -i 's/;default_charset.*/default_charset = "UTF-8"/g' /etc/php5/fpm/php.ini && \ sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini ADD basic.conf /etc/nginx/conf.d/basic.conf diff --git a/dockerfiles/services/owncloud/Dockerfile b/dockerfiles/services/owncloud/Dockerfile index cad3da9..6b1a5ec 100644 --- a/dockerfiles/services/owncloud/Dockerfile +++ b/dockerfiles/services/owncloud/Dockerfile @@ -5,8 +5,7 @@ RUN echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community curl -L http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key | apt-key add - && \ apt-get update && apt-get install -y \ owncloud \ - php5-imap \ - sendmail && \ + php5-imap && \ apt-get install -y --no-install-recommends \ libreoffice && \ rm -rf /var/lib/apt/lists/* && \ -- GitLab