diff --git a/unit-files/backup@.timer b/unit-files/backup@.timer index 9d875f8e621ecc97c695e7080062ff904b3965af..7ee6955faa359a161439314ee9f7f2f5608d24b0 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 bdcee54992b31a78b3c5c3539f3a4968ad810d72..c8d46284bcc8b683a7cb601f9110a0c9a7b55d95 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 98166d378f9a2affcbff6d5987763222d66ea8f1..c192c416e5b57aada7793b984a6a7353f0ccc20a 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