From c0a243e8e1cb4ebd7db0f034578bddb8a4d7dac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 14 Jan 2016 14:11:45 +0000 Subject: [PATCH] Move datadir to /var/lib/proxysql Move datadir from /var/run/proxysql to /var/lib/proxysql Closes #465 --- Makefile | 4 ++-- docker/1backend-complex-config/proxysql/Dockerfile | 4 ++-- docker/images/proxysql/debian-7.8-build/proxysql.ctl | 2 +- docker/images/proxysql/debian-8.2-build/proxysql.ctl | 2 +- docker/images/proxysql/proxysql/Dockerfile | 4 ++-- docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl | 2 +- etc/init.d/proxysql | 10 +++++++++- etc/proxysql.cnf | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ef7bc2846..9f3632308 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ install: src/proxysql install -m 0755 src/proxysql /usr/local/bin install -m 0600 etc/proxysql.cnf /etc install -m 0755 etc/init.d/proxysql /etc/init.d - if [ ! -d /var/run/proxysql ]; then mkdir /var/run/proxysql ; fi + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi update-rc.d proxysql defaults .PHONY: install @@ -180,6 +180,6 @@ uninstall: rm /etc/init.d/proxysql rm /etc/proxysql.cnf rm /usr/local/bin/proxysql - rmdir /var/run/proxysql 2>/dev/null || true + rmdir /var/lib/proxysql 2>/dev/null || true update-rc.d proxysql remove .PHONY: uninstall diff --git a/docker/1backend-complex-config/proxysql/Dockerfile b/docker/1backend-complex-config/proxysql/Dockerfile index 97696b791..8aafcf146 100644 --- a/docker/1backend-complex-config/proxysql/Dockerfile +++ b/docker/1backend-complex-config/proxysql/Dockerfile @@ -19,8 +19,8 @@ RUN cd /opt; git clone https://github.com/akopytov/sysbench.git RUN cd /opt/sysbench; ./autogen.sh; ./configure --bindir=/usr/bin; make; make install ADD ./proxysql.cnf /etc/ -RUN mkdir -p /var/run/proxysql +RUN mkdir -p /var/lib/proxysql ADD ./compile_and_start_proxysql.sh /tmp/ RUN chmod +x /tmp/compile_and_start_proxysql.sh -CMD ["/tmp/compile_and_start_proxysql.sh"] \ No newline at end of file +CMD ["/tmp/compile_and_start_proxysql.sh"] diff --git a/docker/images/proxysql/debian-7.8-build/proxysql.ctl b/docker/images/proxysql/debian-7.8-build/proxysql.ctl index 95e890a9d..86d339028 100644 --- a/docker/images/proxysql/debian-7.8-build/proxysql.ctl +++ b/docker/images/proxysql/debian-7.8-build/proxysql.ctl @@ -18,5 +18,5 @@ Description: High performance MySQL proxy It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface. File: postinst #!/bin/sh -e - if [ ! -d /var/run/proxysql ]; then mkdir /var/run/proxysql ; fi + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi update-rc.d proxysql defaults diff --git a/docker/images/proxysql/debian-8.2-build/proxysql.ctl b/docker/images/proxysql/debian-8.2-build/proxysql.ctl index 95e890a9d..86d339028 100644 --- a/docker/images/proxysql/debian-8.2-build/proxysql.ctl +++ b/docker/images/proxysql/debian-8.2-build/proxysql.ctl @@ -18,5 +18,5 @@ Description: High performance MySQL proxy It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface. File: postinst #!/bin/sh -e - if [ ! -d /var/run/proxysql ]; then mkdir /var/run/proxysql ; fi + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi update-rc.d proxysql defaults diff --git a/docker/images/proxysql/proxysql/Dockerfile b/docker/images/proxysql/proxysql/Dockerfile index ff3f72833..cc3f7d969 100644 --- a/docker/images/proxysql/proxysql/Dockerfile +++ b/docker/images/proxysql/proxysql/Dockerfile @@ -25,8 +25,8 @@ RUN cd /opt; git clone https://github.com/akopytov/sysbench.git RUN cd /opt/sysbench; ./autogen.sh; ./configure --bindir=/usr/bin; make; make install ADD ./proxysql.cnf /etc/ -RUN mkdir -p /var/run/proxysql +RUN mkdir -p /var/lib/proxysql ADD ./compile_and_start_proxysql.sh /tmp/ RUN chmod +x /tmp/compile_and_start_proxysql.sh -CMD ["/tmp/compile_and_start_proxysql.sh"] \ No newline at end of file +CMD ["/tmp/compile_and_start_proxysql.sh"] diff --git a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl index 95e890a9d..86d339028 100644 --- a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl @@ -18,5 +18,5 @@ Description: High performance MySQL proxy It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface. File: postinst #!/bin/sh -e - if [ ! -d /var/run/proxysql ]; then mkdir /var/run/proxysql ; fi + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi update-rc.d proxysql defaults diff --git a/etc/init.d/proxysql b/etc/init.d/proxysql index d45f4dda4..9b4263b8e 100755 --- a/etc/init.d/proxysql +++ b/etc/init.d/proxysql @@ -10,7 +10,8 @@ # It provides advanced features like connection pool, query routing and rewrite, # firewalling, throttling, real time analysis, error-free failover -DATADIR="/var/run/proxysql" +OLDDATADIR="/var/run/proxysql" +DATADIR="/var/proxysql/proxysql" OPTS="-c /etc/proxysql.cnf -D $DATADIR" PIDFILE="$DATADIR/proxysql.pid" @@ -62,6 +63,13 @@ start() { getpid if [ "X$pid" = "X" ] then + if [ -f $OLDDATADIR/proxysql.db ] + then + if [ ! -f $DATADIR/proxysql.db ] + then + mv -iav $OLDDATADIR/proxysql.db $DATADIR/proxysql.db + fi + fi proxysql $OPTS if [ "$?" = "0" ]; then echo "DONE!" diff --git a/etc/proxysql.cnf b/etc/proxysql.cnf index 34798adfd..8dec5158a 100644 --- a/etc/proxysql.cnf +++ b/etc/proxysql.cnf @@ -6,7 +6,7 @@ -datadir="/var/run/proxysql" +datadir="/var/lib/proxysql" admin_variables= {