aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile9
-rw-r--r--mysql/my.cnf6
-rw-r--r--mysql/my.cnf.mi511
4 files changed, 22 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index c4a552f8..34a350ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,4 +160,6 @@ gnupg/gpg.conf
gnupg/gpg.conf.m4
include/mktd.m4
man/man7/dotfiles.7df
+mysql/my.cnf
+mysql/my.cnf.m4
urxvt/ext/select
diff --git a/Makefile b/Makefile
index 8818e524..e513d045 100644
--- a/Makefile
+++ b/Makefile
@@ -247,6 +247,8 @@ clean distclean:
gnupg/gpg.conf.m4 \
include/mktd.m4 \
man/man8/dotfiles.7df \
+ mysql/my.cnf \
+ mysql/my.cnf.m4 \
urxvt/ext/select
.awk:
@@ -303,6 +305,13 @@ man/man7/dotfiles.7df: README.markdown man/man7/dotfiles.7df.header
cat man/man7/dotfiles.7df.header README.markdown | \
pandoc -sS -t man -o $@
+mysql/my.cnf: mysql/my.cnf.m4
+ m4 \
+ -D MYSQL_HOST=$(MYSQL_HOST) \
+ -D MYSQL_USER=$(MYSQL_USER) \
+ -D MYSQL_PASSWORD=$(MYSQL_PASSWORD) \
+ mysql/my.cnf.m4 > $@
+
MAILDIR = $(HOME)/Mail
install: install-bin \
diff --git a/mysql/my.cnf b/mysql/my.cnf
deleted file mode 100644
index 900cf1a9..00000000
--- a/mysql/my.cnf
+++ /dev/null
@@ -1,6 +0,0 @@
-[mysql]
-default-character-set=utf8
-no-auto-rehash
-prompt='(\u@\h:\d) mysql> '
-safe-updates
-skip-pager
diff --git a/mysql/my.cnf.mi5 b/mysql/my.cnf.mi5
new file mode 100644
index 00000000..810f5165
--- /dev/null
+++ b/mysql/my.cnf.mi5
@@ -0,0 +1,11 @@
+[mysql]
+default-character-set=utf8
+no-auto-rehash
+prompt='(\u@\h:\d) mysql> '
+safe-updates
+skip-pager
+
+[client]
+<% ifdef(`MYSQL_HOST', ``host='MYSQL_HOST', `dnl') %>
+<% ifdef(`MYSQL_USER', ``user='MYSQL_USER', `dnl') %>
+<% ifdef(`MYSQL_PASSWORD', ``password='MYSQL_PASSWORD', `dnl') %>