updated kopia state

states/kopia/templates/kopia_backup.py.j2

@@ -5,23 +5,32 @@
 import argparse
 import subprocess
 
+from subprocess import Popen
+
+
 KOPIA_BUCKET="kopia"
 KOPIA_PASSWORD="{{ params.password|default('') }}"
 KOPIA_CONFIG_PATH="/etc/kopia/{{ name }}/{{ name }}.config"
 KOPIA_KEEP_LAST=7
 
+ENV = {
+        "KOPIA_PASSWORD": KOPIA_PASSWORD,
+        "KOPIA_CONFIG_PATH": KOPIA_CONFIG_PATH,
+}
+
 parser = argparse.ArgumentParser(prog='{{ name }} backup')
 
+
 def init(mode="filesystem", path=None, prefix=None, gateway=None, region=None, ak=None, sak=None):
   if mode == "filesystem" and path:
-    repo_connect = subprocess.Popen(f"kopia repository connect filesystem --config-file={KOPIA_CONFIG_PATH} --path={path} -p {KOPIA_PASSWORD}", shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    repo_connect = Popen(f"kopia repository connect filesystem --config-file={KOPIA_CONFIG_PATH} --path={path} -p {KOPIA_PASSWORD}", shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    repo_create = subprocess.Popen(f"kopia repository create filesystem --config-file={KOPIA_CONFIG_PATH} --path={path} -p {KOPIA_PASSWORD}" , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    repo_create = Popen(f"kopia repository create filesystem --config-file={KOPIA_CONFIG_PATH} --path={path} -p {KOPIA_PASSWORD}" , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   elif mode == "s3" and prefix and gateway and region and ak and sak:
     cmd_create = f"kopia repository create s3 --config-file={KOPIA_CONFIG_PATH} --bucket={KOPIA_BUCKET} --prefix={prefix}/ --endpoint={gateway} --region={region} --access-key={ak} --secret-access-key={sak} -p {KOPIA_PASSWORD} --no-check-for-updates --description='{{ name }} repository'"
     cmd_connect = f"kopia repository connect s3 --config-file={KOPIA_CONFIG_PATH} --bucket={KOPIA_BUCKET} --prefix={prefix}/ --endpoint={gateway} --region={region} --access-key={ak} --secret-access-key={sak} -p {KOPIA_PASSWORD} --no-check-for-updates --description='{{ name }} repository'"
-    run_create = subprocess.Popen(cmd_create, shell=True)
+    run_create = Popen(cmd_create, shell=True)
     run_create.wait()
-    run_connect = subprocess.Popen(cmd_connect, shell=True)
+    run_connect = Popen(cmd_connect, shell=True)
     run_connect.wait()
   else:
     print("no valid mode or missing informations")
@@ -31,14 +40,14 @@ def init(mode="filesystem", path=None, prefix=None, gateway=None, region=None, a
 
 def set_policy(compression="zstd"):
   cmd_policy = f"kopia policy set --global --config-file={KOPIA_CONFIG_PATH} --compression={compression} --keep-latest={KOPIA_KEEP_LAST} --keep-hourly 0 --keep-daily {{ params.keep_daily|default(7) }} --keep-weekly {{ params.keep_weekly|default(4) }} --keep-monthly {{ params.keep_monthly|default(6) }} --keep-annual 0 --one-file-system=true"
-  run_policy = subprocess.Popen(cmd_policy, shell=True)
+  run_policy = Popen(cmd_policy, shell=True)
   run_policy.wait()
   return
 
 
 def run():
   cmd_launch = f"kopia snapshot create {% for dir in params.dirs %}{{ dir.path }} {% endfor %} --config-file={KOPIA_CONFIG_PATH}"
-  run_launch = subprocess.Popen(cmd_launch, shell=True)
+  run_launch = Popen(cmd_launch, shell=True)
   run_launch.wait()
   return
 

states/kopia/templates/kopiaignore.j2

@@ -1,4 +1,4 @@
 {%- from "kopia/map.jinja" import kopia with context -%}
-{% for ign in ignore -%}
+{%- for ign in ignore -%}
 {{ ign }}
-{%- endfor %}
+{% endfor -%}