From 385e486e900299d27c8f6701d37857927937b2b5 Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sat, 17 Dec 2022 23:26:26 +0100 Subject: [PATCH] moved burp state to old --- states/{ => old}/burp/burp.conf.j2 | 2 +- states/{ => old}/burp/burp.conf.j2.sample | 4 ++-- .../{ => old}/burp/client/burp-backup.service.j2 | 2 +- .../{ => old}/burp/client/burp-backup.timer.j2 | 2 +- states/{ => old}/burp/client/config.sls | 0 states/{ => old}/burp/client/service.sls | 0 states/{ => old}/burp/defaults.yaml | 16 ++++++++-------- states/{ => old}/burp/init.sls | 0 states/{ => old}/burp/install.sls | 0 states/{ => old}/burp/map.jinja | 2 +- states/{ => old}/burp/pkg.sls | 0 states/{ => old}/burp/server/burp.service.j2 | 2 +- states/{ => old}/burp/server/config.sls | 0 states/{ => old}/burp/server/service.sls | 0 14 files changed, 15 insertions(+), 15 deletions(-) rename states/{ => old}/burp/burp.conf.j2 (90%) rename states/{ => old}/burp/burp.conf.j2.sample (99%) rename states/{ => old}/burp/client/burp-backup.service.j2 (89%) rename states/{ => old}/burp/client/burp-backup.timer.j2 (90%) rename states/{ => old}/burp/client/config.sls (100%) rename states/{ => old}/burp/client/service.sls (100%) rename states/{ => old}/burp/defaults.yaml (88%) rename states/{ => old}/burp/init.sls (100%) rename states/{ => old}/burp/install.sls (100%) rename states/{ => old}/burp/map.jinja (97%) rename states/{ => old}/burp/pkg.sls (100%) rename states/{ => old}/burp/server/burp.service.j2 (87%) rename states/{ => old}/burp/server/config.sls (100%) rename states/{ => old}/burp/server/service.sls (100%) diff --git a/states/burp/burp.conf.j2 b/states/old/burp/burp.conf.j2 similarity index 90% rename from states/burp/burp.conf.j2 rename to states/old/burp/burp.conf.j2 index 1b7c49d..7b56b77 100644 --- a/states/burp/burp.conf.j2 +++ b/states/old/burp/burp.conf.j2 @@ -1,4 +1,4 @@ ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} {%- for key, value in burp.config.items() %} {{ key }} = {{ value }} -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/burp/burp.conf.j2.sample b/states/old/burp/burp.conf.j2.sample similarity index 99% rename from states/burp/burp.conf.j2.sample rename to states/old/burp/burp.conf.j2.sample index 76dba65..54287cb 100644 --- a/states/burp/burp.conf.j2.sample +++ b/states/old/burp/burp.conf.j2.sample @@ -71,7 +71,7 @@ ssl_cert = /etc/burp/ssl_cert-client.pem ssl_key = /etc/burp/ssl_cert-client.key # Client SSL ciphers -#ssl_ciphers = +#ssl_ciphers = # Client SSL compression. Default is zlib5. Set to zlib0 to turn it off. #ssl_compression = zlib5 @@ -128,4 +128,4 @@ exclude_comp=gz #atime=1 # When enabled, this causes problems in the phase1 scan (such as an 'include' # being missing) to be treated as fatal errors. The default is 0. -#scan_problem_raises_error=1 \ No newline at end of file +#scan_problem_raises_error=1 diff --git a/states/burp/client/burp-backup.service.j2 b/states/old/burp/client/burp-backup.service.j2 similarity index 89% rename from states/burp/client/burp-backup.service.j2 rename to states/old/burp/client/burp-backup.service.j2 index c5ae19a..74889a6 100644 --- a/states/burp/client/burp-backup.service.j2 +++ b/states/old/burp/client/burp-backup.service.j2 @@ -9,4 +9,4 @@ Type=simple ExecStart=/usr/sbin/burp -ab [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/states/burp/client/burp-backup.timer.j2 b/states/old/burp/client/burp-backup.timer.j2 similarity index 90% rename from states/burp/client/burp-backup.timer.j2 rename to states/old/burp/client/burp-backup.timer.j2 index 653ad46..b947315 100644 --- a/states/burp/client/burp-backup.timer.j2 +++ b/states/old/burp/client/burp-backup.timer.j2 @@ -9,4 +9,4 @@ OnCalendar=Mon-Sun 23:30 Persistent=true [Install] -WantedBy=timers.target \ No newline at end of file +WantedBy=timers.target diff --git a/states/burp/client/config.sls b/states/old/burp/client/config.sls similarity index 100% rename from states/burp/client/config.sls rename to states/old/burp/client/config.sls diff --git a/states/burp/client/service.sls b/states/old/burp/client/service.sls similarity index 100% rename from states/burp/client/service.sls rename to states/old/burp/client/service.sls diff --git a/states/burp/defaults.yaml b/states/old/burp/defaults.yaml similarity index 88% rename from states/burp/defaults.yaml rename to states/old/burp/defaults.yaml index 82ec592..2b4d55f 100644 --- a/states/burp/defaults.yaml +++ b/states/old/burp/defaults.yaml @@ -23,10 +23,10 @@ burp: ssl_cert: /etc/burp/ssl_cert-client.pem ssl_key: /etc/burp/ssl_cert-client.key ssl_peer_cn: burpserver - exclude_fs: sysfs - exclude_fs: tmpfs - exclude_comp: bz2 - exclude_comp: gz + #exclude_fs: sysfs + #exclude_fs: tmpfs + #exclude_comp: bz2 + #exclude_comp: gz nobackup: .nobackup clients: - name: thinkpad.paulbsd.com @@ -59,8 +59,8 @@ burp: ssl_cert: /etc/burp/ssl_cert-client.pem ssl_key: /etc/burp/ssl_cert-client.key ssl_peer_cn: burpserver - exclude_fs: sysfs - exclude_fs: tmpfs - exclude_comp: bz2 - exclude_comp: gz + #exclude_fs: sysfs + #exclude_fs: tmpfs + #exclude_comp: bz2 + #exclude_comp: gz nobackup: .nobackup diff --git a/states/burp/init.sls b/states/old/burp/init.sls similarity index 100% rename from states/burp/init.sls rename to states/old/burp/init.sls diff --git a/states/burp/install.sls b/states/old/burp/install.sls similarity index 100% rename from states/burp/install.sls rename to states/old/burp/install.sls diff --git a/states/burp/map.jinja b/states/old/burp/map.jinja similarity index 97% rename from states/burp/map.jinja rename to states/old/burp/map.jinja index 2b73e3a..1ad37b5 100644 --- a/states/burp/map.jinja +++ b/states/old/burp/map.jinja @@ -5,4 +5,4 @@ default=defaults.burp, merge=True ) --%} \ No newline at end of file +-%} diff --git a/states/burp/pkg.sls b/states/old/burp/pkg.sls similarity index 100% rename from states/burp/pkg.sls rename to states/old/burp/pkg.sls diff --git a/states/burp/server/burp.service.j2 b/states/old/burp/server/burp.service.j2 similarity index 87% rename from states/burp/server/burp.service.j2 rename to states/old/burp/server/burp.service.j2 index f165edb..879a1ca 100644 --- a/states/burp/server/burp.service.j2 +++ b/states/old/burp/server/burp.service.j2 @@ -7,4 +7,4 @@ OnStartupSec=600 #OnCalendar=Mon-Sun 22:00 [Install] -WantedBy=timers.target \ No newline at end of file +WantedBy=timers.target diff --git a/states/burp/server/config.sls b/states/old/burp/server/config.sls similarity index 100% rename from states/burp/server/config.sls rename to states/old/burp/server/config.sls diff --git a/states/burp/server/service.sls b/states/old/burp/server/service.sls similarity index 100% rename from states/burp/server/service.sls rename to states/old/burp/server/service.sls