cert import path to /data/import/example.com.pem

doc/deploying-a-server.md

@@ -37,7 +37,7 @@ Make sure you read [getting started](getting-started-as-a-hoster.md) first.
   * Unless you already have a TLS certificate for example.com, get one
     (from StartSSL or elsewhere), and concatenate the certificate
     and its unencrypted private key into one file.
-  * Make sure the TLS certificate is valid (use `scripts/check-cert.sh` for this), and scp it to `/data/import/example.com/TLS/example.com.pem` on k3.
+  * Make sure the TLS certificate is valid (use `scripts/check-cert.sh` for this), and scp it to `/data/import/example.com.pem` on k3.
   * Now ssh into k3, and if for instance 'wordpress' is the image you chose, run:
 
     systemctl enable wordpress@example.com

unit-files/static-git-importer@.service

@@ -3,6 +3,7 @@ Description=static importer
 
 # Dependency ordering
 Before=static-git@%i.service
+Before=backup@%i.timer
 
 [Service]
 Type=oneshot
@@ -11,6 +12,10 @@ Environment=DOMAIN=%i
 ExecStartPre=/data/indiehosters/scripts/backup-init.sh
 ExecStart=/bin/bash -euxc ' \
   domain_folder=/data/domains/%i; \
+  if [ -f /data/import/%i.pem ]; then \
+    mkdir -p $domain_folder/TLS; \
+    mv /data/import/%i.pem $domain_folder/TLS; \
+  fi; \
   cp $domain_folder/TLS/%i.pem /data/runtime/haproxy/approved-certs/%i.pem; \
   runtime_folder=/data/runtime/domains/%i/static-git; \
   mkdir -p $runtime_folder; \

unit-files/static-importer@.service

@@ -3,6 +3,7 @@ Description=static importer
 
 # Dependency ordering
 Before=static@%i.service
+Before=backup@%i.timer
 
 [Service]
 Type=oneshot
@@ -11,6 +12,10 @@ Environment=DOMAIN=%i
 ExecStartPre=/data/indiehosters/scripts/backup-init.sh
 ExecStart=/bin/bash -euxc ' \
   domain_folder=/data/domains/%i; \
+  if [ -f /data/import/%i.pem ]; then \
+    mkdir -p $domain_folder/TLS; \
+    mv /data/import/%i.pem $domain_folder/TLS; \
+  fi; \
   cp $domain_folder/TLS/%i.pem /data/runtime/haproxy/approved-certs/%i.pem; \
   folder=$domain_folder/static/www-content; \
   mkdir -p $folder; \

unit-files/wordpress-importer@.service

@@ -4,6 +4,7 @@ Description=WordPress importer
 # Dependency ordering
 After=mysql-importer@%i.service
 Before=wordpress@%i.service
+Before=backup@%i.timer
 
 # Dependency binding
 BindsTo=wordpress@%i.service
@@ -15,6 +16,10 @@ Environment=DOMAIN=%i
 ExecStartPre=/data/indiehosters/scripts/backup-init.sh
 ExecStart=/bin/bash -euxc ' \
   domain_folder=/data/domains/%i; \
+  if [ -f /data/import/%i.pem ]; then \
+    mkdir -p $domain_folder/TLS; \
+    mv /data/import/%i.pem $domain_folder/TLS; \
+  fi; \
   cp $domain_folder/TLS/%i.pem /data/runtime/haproxy/approved-certs/%i.pem; \
   if [ ! -d $domain_folder/wordpress/wp-content ]; then \
     mkdir -p $domain_folder/wordpress/; \