diff --git a/.pkgr.yml b/.pkgr.yml index 28c506a70..6e32b62eb 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -41,11 +41,7 @@ targets: - nginx - postgresql-server before: - - uname -a - - ruby -v - - env - - "cat Gemfile.lock" - - contrib/cleanup.sh + - contrib/packager.io/before.sh after: - contrib/packager.io/after.sh env: diff --git a/contrib/database.yml b/config/database/database.yml similarity index 63% rename from contrib/database.yml rename to config/database/database.yml index c3c4a6d33..bcb2f43a9 100644 --- a/contrib/database.yml +++ b/config/database/database.yml @@ -1,22 +1,28 @@ +# this is a database config sample for zammad ready to use with a postgresql db +# copy or symlink this file to zammads config/database.yml directory to use it + default: &default # For details on connection pooling, see Rails configuration guide # http://guides.rubyonrails.org/configuring.html#database-pooling pool: 50 timeout: 5000 encoding: utf8 - # postgresql ----------------------------------------------------------------- + + ##### postgresql config ##### + adapter: postgresql - # username: - # password: - # mysql ---------------------------------------------------------------------- + username: zammad + password: + + #### mysql config ##### + # adapter: mysql2 - # host: localhost - # username: - # password: + # username: zammad + # password: production: <<: *default - database: zammad_prod + database: zammad_production development: <<: *default diff --git a/contrib/packager.io/before.sh b/contrib/packager.io/before.sh new file mode 100644 index 000000000..73b0d2730 --- /dev/null +++ b/contrib/packager.io/before.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# packager.io before script +# + +# print environemnt +uname -a +ruby -v +env +cat Gemfile.lock + +# cleanup +script/build/cleanup.sh diff --git a/contrib/database.yml.pkgr b/contrib/packager.io/database.yml.pkgr similarity index 100% rename from contrib/database.yml.pkgr rename to contrib/packager.io/database.yml.pkgr diff --git a/contrib/packager.io/functions b/contrib/packager.io/functions index 0e3821c2d..5e68d8246 100644 --- a/contrib/packager.io/functions +++ b/contrib/packager.io/functions @@ -180,7 +180,7 @@ function update_database_yml () { sed -e "s/.*adapter:.*/ adapter: ${ADAPTER}/" \ -e "s/.*username:.*/ username: ${DB_USER}/" \ -e "s/.*password:.*/ password: ${DB_PASS}/" \ - -e "s/.*database:.*/ database: ${DB}/" < ${ZAMMAD_DIR}/contrib/database.yml.pkgr > ${ZAMMAD_DIR}/config/database.yml + -e "s/.*database:.*/ database: ${DB}/" < ${ZAMMAD_DIR}/contrib/packager.io/database.yml.pkgr > ${ZAMMAD_DIR}/config/database.yml } function initialise_database () { diff --git a/contrib/cleanup.sh b/script/build/cleanup.sh similarity index 100% rename from contrib/cleanup.sh rename to script/build/cleanup.sh diff --git a/script/build/deploy_archives.sh b/script/build/deploy_archives.sh index 10b90440f..8fe62b22d 100644 --- a/script/build/deploy_archives.sh +++ b/script/build/deploy_archives.sh @@ -8,7 +8,7 @@ if [ "$CI_BUILD_REF_NAME" != "$CI_BUILD_TAG" ]; then fi # cleanup -contrib/cleanup.sh +cleanup.sh ( find . -type d -name ".git" \ && find . -name ".gitignore" \