Browse Source

Use YAML formatted variable file

master
Daniel Berteaud 1 year ago
parent
commit
12948e63c5
2 changed files with 5 additions and 4 deletions
  1. +1
    -1
      WAPT/control
  2. +4
    -3
      setup.py

+ 1
- 1
WAPT/control View File

@@ -1,5 +1,5 @@
package : fws-backuppc-agent
version : 1.3.4-22
version : 1.3.4-24
architecture : all
section : base
priority : optional


+ 4
- 3
setup.py View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from setuphelpers import *
from cryptography.fernet import Fernet
import json, os, random, string, time
import os, random, string, time
from jinja2 import Environment, FileSystemLoader
uninstallkey = []
@@ -15,8 +14,10 @@ variables = {
# Read local variables file if available
if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
print('Reading local encrypted variables file')
from cryptography.fernet import Fernet
import yaml
f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
# Create a random pass for the local backup account if not defined
if not 'backup_pass' in variables:


Loading…
Cancel
Save