From b3b78c6bc0986da7950c60381d8f7177a381ecf3 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Tue, 11 Nov 2014 17:16:22 +0000
Subject: [PATCH] Fixes 41, mysql re-import + some timing issues
---
unit-files/backup@.timer | 2 +-
unit-files/mysql-importer@.service | 20 ++++++++++----------
unit-files/wordpress-importer@.service | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/unit-files/backup@.timer b/unit-files/backup@.timer
index 9d875f8..7ee6955 100644
--- a/unit-files/backup@.timer
+++ b/unit-files/backup@.timer
@@ -2,7 +2,7 @@
Description=Hourly backup of www and mysql content to a git repo
[Timer]
-OnActiveSec=0
+OnActiveSec=10
OnUnitActiveSec=10min
[Install]
diff --git a/unit-files/mysql-importer@.service b/unit-files/mysql-importer@.service
index bdcee54..c8d4628 100644
--- a/unit-files/mysql-importer@.service
+++ b/unit-files/mysql-importer@.service
@@ -12,16 +12,16 @@ Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/bash -euxc ' \
mysql_folder=/data/domains/%i/mysql; \
- if [ ! -d $mysql_folder ]; then \
- mkdir -p $mysql_folder; \
- pass=`echo $RANDOM ${date} | md5sum | base64 | cut -c-10`; \
- echo MYSQL_PASS=$pass > $mysql_folder/.env; \
- fi; \
- if [ -f $mysql_folder/dump.sql ]; then \
- echo develop import mysql feature; \
- exit 1; \
- else \
- mkdir -p /data/runtime/domains/%i/mysql/db_files; \
+ if [ ! -d /data/runtime/domains/%i/mysql ]; then \
+ if [ -d $mysql_folder ]; then \
+ echo develop import mysql feature; \
+ exit 1; \
+ else \
+ mkdir -p $mysql_folder; \
+ pass=`echo $RANDOM ${date} | md5sum | base64 | cut -c-10`; \
+ echo MYSQL_PASS=$pass > $mysql_folder/.env; \
+ mkdir -p /data/runtime/domains/%i/mysql; \
+ fi; \
fi'
[Install]
diff --git a/unit-files/wordpress-importer@.service b/unit-files/wordpress-importer@.service
index 98166d3..c192c41 100644
--- a/unit-files/wordpress-importer@.service
+++ b/unit-files/wordpress-importer@.service
@@ -2,7 +2,7 @@
Description=WordPress importer
# Dependency ordering
-After=mysql-importer@%i.service
+After=mysql@%i.service
Before=wordpress@%i.service
Before=backup@%i.timer
--
GitLab