CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base checks on conf and filesystem passing

This commit is contained in:
Diego Lendoiro 2018-01-08 09:53:52 +01:00
parent 1c2d6b343e
commit e64319dbbb
3 changed files with 59 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -40,9 +40,10 @@ RUN apk add --no-cache $PHP_GNUPG_BUILD_DEPS \
&& curl -sS https://getcomposer.org/installer | php \
&& mv composer.phar /usr/local/bin/composer
RUN mkdir /var/www/passbolt \
&& curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \
&& chown -R nginx:nginx /var/www/passbolt \
COPY src/passbolt_api/ /var/www/passbolt/
# && curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \
RUN chown -R nginx:nginx /var/www/passbolt \
&& chmod -R o-w /var/www/passbolt \
&& chmod -R +w /var/www/passbolt/tmp \
&& chmod -R +w /var/www/passbolt/webroot/img/public

60
bin/docker-entrypoint.sh
View File

@ -2,34 +2,38 @@
set -eo pipefail
gpg_private_key=/var/www/passbolt/config/gpg/serverkey.private.asc
gpg_public_key=/var/www/passbolt/config/gpg/serverkey.asc
app_config='/var/www/passbolt/app/Config/app.php'
base_path='/var/www/passbolt'
gpg_private_key="$base_path/config/gpg/serverkey.private.asc"
gpg_public_key="$base_path/config/gpg/serverkey.asc"
app_config="$base_path/config/app.php"
ssl_key='/etc/ssl/certs/certificate.key'
ssl_cert='/etc/ssl/certs/certificate.crt'
gpg_gen_key() {
gpg --batch --gen-key <<EOF
Key-Type: 1
Key-Length: ${KEY_LENGTH:-2048}
Subkey-Type: 1
Subkey-Length: ${SUBKEY_LENGTH:-2048}
Name-Real: ${KEY_NAME:-Passbolt default user}
Name-Email: ${KEY_EMAIL:-passbolt@yourdomain.com}
Expire-Date: ${KEY_EXPIRATION:-0}
%commit
EOF
local key_email="${KEY_EMAIL:-passbolt@yourdomain.com}"
local key_name="${KEY_NAME:-Passbolt default user}"
local key_length="${KEY_LENGTH:-4096}"
local subkey_length="${SUBKEY_LENGTH:-4096}"
local expiration="${KEY_EXPIRATION:-0}"
gpg --armor --export-secret-keys "$KEY_EMAIL" > "$gpg_private_key"
gpg --armor --export "$KEY_EMAIL" > "$gpg_public_key"
gpg_auto_fingerprint=$(gpg --fingerprint "$KEY_EMAIL" | grep fingerprint | awk '{for(i=4;i<=NF;++i)printf \$i}')
su -m -c "gpg --batch --gen-key <<EOF
Key-Type: 1
Key-Length: $key_length
Subkey-Type: 1
Subkey-Length: $subkey_length
Name-Real: $key_name
Name-Email: $key_email
Expire-Date: $expiration
%commit
EOF" -ls /bin/bash nginx
su -m -c "gpg --armor --export-secret-keys $key_email > $gpg_private_key" -ls /bin/bash nginx
su -m -c "gpg --armor --export $key_email > $gpg_public_key" -ls /bin/bash nginx
}
gpg_import_key() {
local key_id=""
key_id=$(su -m -c "gpg --with-colons $gpg_private_key | grep sec |cut -f5 -d:" -ls /bin/bash nginx)
su -m -c "gpg --batch --import $gpg_public_key" -ls /bin/bash nginx
su -m -c "gpg -K $key_id" -ls /bin/bash nginx || su -m -c "gpg --batch --import $gpg_private_key" -ls /bin/bash nginx
}
@ -41,10 +45,12 @@ gen_ssl_cert() {
}
install() {
tables=$(mysql -u "$DATABASE_USER" -h "$DB_HOST" -P "$DB_HOST" -p -BN -e "SHOW TABLES FROM $DB_NAME" -p"$DB_PASS" |wc -l)
if [ ! -f $app_config ] && [ ! -L $app_config ]; then
cp $base_path/config/app.default.php $app_config
fi
tables=$(mysql -u "$DATABASE_USER" -h "$DB_HOST" -P "$DB_PORT" -p -BN -e "SHOW TABLES FROM $DB_NAME" -p"$DB_PASS" |wc -l)
if [ "$tables" -eq 0 ]; then
su -c "/var/www/passbolt/app/Console/cake install --send-anonymous-statistics true --no-admin" -ls /bin/bash nginx
su -c "/var/www/passbolt/bin/cake passbolt install --no-admin" -ls /bin/bash nginx
else
echo "Enjoy! ☮"
fi
@ -57,34 +63,26 @@ email_cron_job() {
local process_email="/var/www/passbolt/app/Console/cake EmailQueue.sender --quiet"
mkdir -p $cron_task_dir
echo "* * * * * run-parts $cron_task_dir" >> $root_crontab
echo "#!/bin/sh" > $cron_task
chmod +x $cron_task
echo "su -c \"$process_email\" -ls /bin/bash nginx" >> $cron_task
crond -f -c /etc/crontabs
}
if [ ! -f $gpg_private_key ] && [ ! -L $gpg_private_key ] || \
[ ! -f $gpg_public_key ] && [ ! -L $gpg_public_key ]; then
su -c "gpg --list-keys" -ls /bin/bash nginx
gpg_gen_key
gpg_import_key
else
gpg_import_key
fi
if [ ! -f $app_config ] && [ ! -L $app_config ]; then
app_setup
fi
if [ ! -f $ssl_key ] && [ ! -L $ssl_key ] && \
[ ! -f $ssl_cert ] && [ ! -L $ssl_cert ]; then
gen_ssl_cert
fi
#gpg_auto_fingerprint=$(gpg --fingerprint "$key_email" | grep fingerprint | awk '{for(i=4;i<=NF;++i)printf \$i}')
install
email_cron_job
/usr/bin/supervisord -n -c /etc/supervisord.conf

41
spec/passbolt_api/Dockerfile_spec.rb
View File

@ -3,24 +3,33 @@ require 'spec_helper'
describe 'passbolt_api service' do
before(:all) do
mysql = Docker::Container.create(
'Env' => [
'MYSQL_DATABASE=passbolt',
'MYSQL_USER=passbolt',
'MYSQL_PASSWORD=P4ssb0lt'
],
'Image' => 'mysql')
mysql.start
image = Docker::Image.build_from_dir(ROOT_DOCKERFILES)
set :docker_image, image.id
set :env, { 'DB_HOST' => '172.17.0.2' }
set :env, { 'DB_HOST' => mysql.json['NetworkSettings']['IPAddress'] }
end
let(:global_conf) { '/etc/nginx/nginx.conf' }
let(:nginx_conf) { '/etc/nginx/nginx.conf' }
let(:site_conf) { '/etc/nginx/conf.d/default.conf' }
let(:passbolt_home) { '/var/www/passbolt' }
let(:passbolt_tmp) { '/var/www/passbolt/app/tmp' }
let(:passbolt_image) { '/var/www/passbolt/app/webroot/img/public' }
let(:passbolt_owner) { 'www-data' }
let(:passbolt_tmp) { '/var/www/passbolt/tmp' }
let(:passbolt_image) { '/var/www/passbolt/webroot/img/public' }
let(:passbolt_owner) { 'nginx' }
describe "passbolt required php extension" do
describe "passbolt required php extensions" do
php_extensions = [
'curl', 'gd', 'intl', 'json', 'mcrypt', 'mysqlnd', 'xsl', 'phar',
'posix', 'xml', 'xsl', 'zlib', 'ctype', 'pdo', 'pdo_mysql', 'gnupg'
'posix', 'xml', 'xsl', 'zlib', 'ctype', 'pdo', 'gnupg'
]
php_extensions.each do |ext|
@ -31,7 +40,7 @@ end
end
describe 'supervisor' do
it 'is installed' do
xit 'is installed' do
expect(package('supervisor')).to be_installed
end
end
@ -48,13 +57,13 @@ end
end
end
describe 'global configuration' do
describe 'nginx configuration' do
it 'is installed correctly' do
expect(file(global_conf)).to exist
expect(file(nginx_conf)).to exist
end
it 'has the correct permissions' do
expect(file(global_conf)).to be_owned_by 'root'
expect(file(nginx_conf)).to be_owned_by 'root'
end
end
@ -69,27 +78,27 @@ end
end
describe 'php service' do
it 'is running supervised' do
xit 'is running supervised' do
expect(service('php-fpm')).to be_running.under('supervisor')
end
end
describe port(9000) do
it { is_expected.to be_listening.with('tcp') }
xit { is_expected.to be_listening.with('tcp') }
end
describe 'email cron' do
it 'is running supervised' do
xit 'is running supervised' do
expect(service('crond')).to be_running.under('supervisor')
end
end
describe 'web service' do
it 'is running supervised' do
xit 'is running supervised' do
expect(service('nginx')).to be_running.under('supervisor')
end
it 'is listening on port 80' do
xit 'is listening on port 80' do
expect(port(80)).to be_listening.with('tcp')
end
end