Page MenuHomeGRNET
Files F324377

No OneTemporary
Actions

File Metadata

Created
Mon, Nov 25, 7:37 PM

View Options

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a8eec94
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+env
+data/mysql/
+data/webdns/
diff --git a/.gitingore b/.gitingore
deleted file mode 100644
index 0a764a4..0000000
--- a/.gitingore
+++ /dev/null
@@ -1 +0,0 @@
-env
diff --git a/powerdns/entrypoint.sh b/powerdns/entrypoint.sh
index cca8888..41c9c43 100644
--- a/powerdns/entrypoint.sh
+++ b/powerdns/entrypoint.sh
@@ -1,28 +1,28 @@
#!/bin/bash
if [ -z "${MYSQL_HOST}" ]; then
echo "You need to specify a MySQL host."
exit
fi
MYSQL_DATABASE=${MYSQL_DATABASE-dns}
-MYSQL_USERNAME=${MYSQL_USERNAME-dns}
+MYSQL_USER=${MYSQL_USER-dns}
MYSQL_PORT=${MYSQL_PORT-3306}
MYSQL_PASSWORD=${MYSQL_PASSWORD-12345}
echo "Settings up pdns config."
cat <<EOF > /etc/powerdns/pdns.d/pdns.local.gmysql.conf
# MySQL Configuration
launch+=gmysql
# gmysql parameters
gmysql-host=${MYSQL_HOST}
gmysql-port=3306
gmysql-dbname=${MYSQL_DATABASE}
-gmysql-user=${MYSQL_USERNAME}
+gmysql-user=${MYSQL_USER}
gmysql-password=${MYSQL_PASSWORD}
gmysql-dnssec=no
EOF
echo "Waiting for the db to come up and webdns to run initial migration."
sleep 10
echo "Starting powerdns"
/usr/sbin/pdns_server --daemon=no
diff --git a/webdns/entrypoint.sh b/webdns/entrypoint.sh
index c4190cf..fec68fd 100644
--- a/webdns/entrypoint.sh
+++ b/webdns/entrypoint.sh
@@ -1,29 +1,29 @@
#!/bin/bash
if [ -z "${MYSQL_HOST}" ]; then
echo "You need to specify a mysql host."
exit
fi
MYSQL_DATABASE=${MYSQL_DATABASE-dns}
-MYSQL_USERNAME=${MYSQL_USERNAME-dns}
+MYSQL_USER=${MYSQL_USER-dns}
MYSQL_PORT=${MYSQL_PORT-3306}
MYSQL_PASSWORD=${MYSQL_PASSWORD-12345}
sleep 20
cat << EOF > /srv/webdns/config/database.yml
development:
database: ${MYSQL_DATABASE}
adapter: mysql2
encoding: utf8
- username: ${MYSQL_USERNAME}
+ username: ${MYSQL_USER}
password: ${MYSQL_PASSWORD}
host: ${MYSQL_HOST}
EOF
/usr/bin/rake db:migrate
/usr/bin/rails runner /seeds_users.rb
#/usr/bin/rails runner seeds_policies.rb
cd /srv/webdns
rails server

Event Timeline