Merge branch 'master' of ssh://git.paulbsd.com:2222/paulbsd/paulbsd-salt

states/gobackup/config.sls

@@ -16,6 +16,5 @@ gobackup-task-schedule:
     - function: cmd.run
     - job_args:
       - gobackup perform
-    - hours: {{ gobackup.schedule.hours }}
+    - cron: '{{ gobackup.schedule }}'
-    - minutes: {{ gobackup.schedule.minutes }}
     - run_on_start: false

states/gobackup/defaults.yaml

@@ -6,9 +6,7 @@ gobackup:
   config_dir: /etc/gobackup
   os: linux
   arch: amd64
-  schedule:
+  schedule: "10 23 * * *"
-    hours: 3
-    minutes: 3
   config:
     models:
       gobackup:

states/nginx/config.sls

@@ -58,6 +58,7 @@ nginx-sites-available-{{ key }}:
       root_dir: {{ vhost.root_dir|default(None) }}
       internal_access: {{ vhost.internal_access|default(false) }}
       dirs: {{ vhost.dirs|default([]) }}
+      php_socket_file: {{ nginx.config.php_socket_file }}
 
 nginx-site-enabled-{{ key }}:
   file.symlink:

states/nginx/templates/ssl_params.j2

@@ -4,7 +4,7 @@ ssl_certificate /etc/acme/certs/paulbsd.com.cert;
 ssl_certificate_key /etc/acme/keys/paulbsd.com.key;
 ssl_session_timeout 5m;
 #ssl_protocols SSLv2 SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-ssl_protocols TLSv1.2;
+ssl_protocols TLSv1.3 TLSv1.2;
 #ssl_ciphers	HIGH:!aNULL:!MD5;
 #ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
 ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20;

states/nginx/templates/types/rainloop.j2

@@ -23,7 +23,7 @@ server {
 
   location ~ \.php?$ {
     include         fastcgi_params;
-    fastcgi_pass    unix:{{ nginx.config.php_socket_file }};
+    fastcgi_pass    unix:{{ php_socket_file }};
     fastcgi_index   index.php;
     fastcgi_param   SCRIPT_FILENAME  $document_root/$fastcgi_script_name;
   }