Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

echo vs perl #11

Closed
wants to merge 2 commits into from
Closed

echo vs perl #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce68cb
changed startup run from echo to perl so that on restart the values are
Dec 23, 2015
282d905
uncommented connect-entry for startup script
Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dovecot/dovecot-dict-sql.conf.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#connect = host=localhost dbname=mails user=testuser password=pass
connect=

# CREATE TABLE quota (
# username varchar(100) not null,
Expand Down
2 changes: 1 addition & 1 deletion dovecot/dovecot-sql.conf.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# connect = host=sql.example.com dbname=virtual user=virtual password=blarg
# connect = /etc/dovecot/authdb.sqlite
#
#connect =
connect=

# Default password scheme.
#
Expand Down
30 changes: 15 additions & 15 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ hostname -f > /srv/haraka/config/me
hostname -f > /srv/haraka/config/host_list

# haraka plugin configs
echo host=$MYSQL_HOST >> /srv/haraka/config/auth_sql_cryptmd5.ini
echo host=$MYSQL_HOST >> /srv/haraka/config/quota.check.ini
echo host=$MYSQL_HOST >> /srv/haraka/config/aliases_mysql.ini
echo user=$MYSQL_USER >> /srv/haraka/config/auth_sql_cryptmd5.ini
echo user=$MYSQL_USER >> /srv/haraka/config/quota.check.ini
echo user=$MYSQL_USER >> /srv/haraka/config/aliases_mysql.ini
echo password=$MYSQL_PASS >> /srv/haraka/config/auth_sql_cryptmd5.ini
echo password=$MYSQL_PASS >> /srv/haraka/config/quota.check.ini
echo password=$MYSQL_PASS >> /srv/haraka/config/aliases_mysql.ini
echo database=$MYSQL_DATABASE >> /srv/haraka/config/auth_sql_cryptmd5.ini
echo database=$MYSQL_DATABASE >> /srv/haraka/config/quota.check.ini
echo database=$MYSQL_DATABASE >> /srv/haraka/config/aliases_mysql.ini
/usr/bin/perl -pi -e "s/host=.*$/host=$MYSQL_HOST/" /srv/haraka/config/auth_sql_cryptmd5.ini
/usr/bin/perl -pi -e "s/host=.*$/host=$MYSQL_HOST/" /srv/haraka/config/quota.check.ini
/usr/bin/perl -pi -e "s/host=.*$/host=$MYSQL_HOST/" /srv/haraka/config/aliases_mysql.ini
/usr/bin/perl -pi -e "s/user=.*$/user=$MYSQL_USER/" /srv/haraka/config/auth_sql_cryptmd5.ini
/usr/bin/perl -pi -e "s/user=.*$/user=$MYSQL_USER/" /srv/haraka/config/quota.check.ini
/usr/bin/perl -pi -e "s/user=.*$/user=$MYSQL_USER/" /srv/haraka/config/aliases_mysql.ini
/usr/bin/perl -pi -e "s/password=.*$/password=$MYSQL_PASS/" /srv/haraka/config/auth_sql_cryptmd5.ini
/usr/bin/perl -pi -e "s/password=.*$/password=$MYSQL_PASS/" /srv/haraka/config/quota.check.ini
/usr/bin/perl -pi -e "s/password=.*$/password=$MYSQL_PASS/" /srv/haraka/config/aliases_mysql.ini
/usr/bin/perl -pi -e "s/database=.*$/database=$MYSQL_DATABASE/" /srv/haraka/config/auth_sql_cryptmd5.ini
/usr/bin/perl -pi -e "s/database=.*$/database=$MYSQL_DATABASE/" /srv/haraka/config/quota.check.ini
/usr/bin/perl -pi -e "s/database=.*$/database=$MYSQL_DATABASE/" /srv/haraka/config/aliases_mysql.ini

if [ -f "/tls/tls_cert.pem" -a -f "/tls/tls_key.pem" ]; then
cp /tls/tls_*.pem /srv/haraka/config/
Expand All @@ -39,8 +39,8 @@ if [ -f "/tls/tls_cert.pem" -a -f "/tls/tls_key.pem" ]; then
fi

# dovecot sql && dict sql config
echo connect = host=$MYSQL_HOST dbname=$MYSQL_DATABASE user=$MYSQL_USER password=$MYSQL_PASS >> /etc/dovecot/dovecot-sql.conf.ext
echo connect = host=$MYSQL_HOST dbname=$MYSQL_DATABASE user=$MYSQL_USER password=$MYSQL_PASS >> /etc/dovecot/dovecot-dict-sql.conf.ext
/usr/bin/perl -pi -e "s/^connect=.*?$/connect=host=$MYSQL_HOST dbname=$MYSQL_DATABASE user=$MYSQL_USER password=$MYSQL_PASS" /etc/dovecot/dovecot-sql.conf.ext
/usr/bin/perl -pi -e "s/^connect=.*?$/connect=host=$MYSQL_HOST dbname=$MYSQL_DATABASE user=$MYSQL_USER password=$MYSQL_PASS" /etc/dovecot/dovecot-dict-sql.conf.ext

# start supervisor
exec supervisord
exec supervisord