From 95266f913674d24691eb77af2ca3a3ebb0f95487 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:38:13 +0200
Subject: [PATCH 01/31] Update init.sls

Remove mysql cron and backup
---
 salt/backup/init.sls | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/salt/backup/init.sls b/salt/backup/init.sls
index c4e5b92..fcb688a 100644
--- a/salt/backup/init.sls
+++ b/salt/backup/init.sls
@@ -19,13 +19,18 @@
       backup_dir: {{ pillar['backup_dir'] }}
       backup_site_list: {{ pillar['backup_sites'] | join(' ') }}
 
+#backup-mysql:
+#  cron.present:
+#    - name: /root/backup_mysql.sh
+#    - user: root
+#    - minute: random
+#    - hour: 1
+#    - identifier: backup-mysql
+    
 backup-mysql:
-  cron.present:
+  cron.absent:
     - name: /root/backup_mysql.sh
     - user: root
-    - minute: random
-    - hour: 1
-    - identifier: backup-mysql
 
 backup-site:
   cron.present:
@@ -35,18 +40,22 @@ backup-site:
     - hour: 2
     - identifier: backup-site
 
-{{ pillar['backup_dir'] }}/mysql:
-  file.directory:
-    - user: root
-    - group: root
-    - dir_mode: 750
-    - file_mode: 640
-    - makedirs: True
-    - recurse:
-      - user
-      - group
-      - mode
+#{{ pillar['backup_dir'] }}/mysql:
+# file.directory:
+#   - user: root
+#   - group: root
+#   - dir_mode: 750
+#   - file_mode: 640
+#   - makedirs: True
+#   - recurse:
+#     - user
+#     - group
+#     - mode
 
+{{pillar['backup_dir']}}/mysql:
+  file.absent:
+    - name: {{pillar['backup_dir']}}/mysql
+    
 {{ pillar['backup_dir'] }}/sites:
   file.directory:
     - user: root

From 85e4bae38177def7b74afb0a73ede8cacc851be5 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:41:59 +0200
Subject: [PATCH 02/31] Change xml to modules

---
 pillar/prod/php74.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pillar/prod/php74.sls b/pillar/prod/php74.sls
index 6bf8355..e1f1d67 100644
--- a/pillar/prod/php74.sls
+++ b/pillar/prod/php74.sls
@@ -13,7 +13,7 @@ php:
       cli:
         - php7.4-cli
         - php7.4-common
-      xml:
+      modules:
         - php7.4-xml
       soap:
         - php7.4-soap

From 15796bed41aefc1ebad4c1f55ff2d823b52c6108 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:13:02 +0200
Subject: [PATCH 03/31] SSL certificate check in HTTP mode too (error in soft)

---
 .../files/git-auto-deploy-opensourcewebsite.org.conf.json        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json b/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
index c402b20..9fca91d 100644
--- a/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
+++ b/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
@@ -3,6 +3,7 @@
   "http-host": "0.0.0.0",
   "http-port": 8005,
   "pid-file": "/www/opensourcewebsite.org/tmp/.gitautodeploy.pid",
+  "ssl-cert": "/etc/git-auto-deploy/cert.pem",
 
   "repositories": [{
     "url": "git@github.com:opensourcewebsite-org/opensourcewebsite-org.git",

From 99ef4b8fab3c7f0b76974588550a428707b36cd8 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 09:09:33 +0200
Subject: [PATCH 04/31] Update users.sls

---
 pillar/prod/users.sls | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pillar/prod/users.sls b/pillar/prod/users.sls
index 6fff673..c79d65d 100644
--- a/pillar/prod/users.sls
+++ b/pillar/prod/users.sls
@@ -4,7 +4,10 @@ users:
   www-data:
     groups:
       - opensourcewebsite.org
-
+  git-auto-deploy:
+    groups:
+      - opensourcewebsite.org
+  
   opensourcewebsite.org:
     fullname: opensourcewebsite org
     enforce_password: false

From df77b3bcd3d0a8ac0f2b2d5a246f183d43591f3d Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:14:05 +0200
Subject: [PATCH 05/31] Update git-auto-deploy-opensourcewebsite.org.conf.json

---
 .../files/git-auto-deploy-opensourcewebsite.org.conf.json       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json b/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
index 9fca91d..7dcc21d 100644
--- a/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
+++ b/salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json
@@ -6,7 +6,7 @@
   "ssl-cert": "/etc/git-auto-deploy/cert.pem",
 
   "repositories": [{
-    "url": "git@github.com:opensourcewebsite-org/opensourcewebsite-org.git",
+    "url": "https://github.com/opensourcewebsite-org/opensourcewebsite-org.git",
     "branch": "master",
     "remote": "origin",
     "path": "/www/opensourcewebsite.org/htdocs/",

From da29e6be2ee95085fc918aeb9297b87b7b422a50 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:15:18 +0200
Subject: [PATCH 06/31] Delete .keep

---
 salt/users/files/opensourcewebsite.org/htdocs/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 salt/users/files/opensourcewebsite.org/htdocs/.keep

diff --git a/salt/users/files/opensourcewebsite.org/htdocs/.keep b/salt/users/files/opensourcewebsite.org/htdocs/.keep
deleted file mode 100644
index e69de29..0000000

From 86b854f62e0ad68803359eb6eaa68357065551be Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:28:13 +0200
Subject: [PATCH 07/31] Create htdocs.sls

---
 salt/users/htdocs.sls | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 salt/users/htdocs.sls

diff --git a/salt/users/htdocs.sls b/salt/users/htdocs.sls
new file mode 100644
index 0000000..ec4b135
--- /dev/null
+++ b/salt/users/htdocs.sls
@@ -0,0 +1,7 @@
+/www/opensourcewebsite.org/htdocs/:
+  file.directory:
+    - mode: 775
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+  

From e518ac965cff16fb0c5bb66b63e99db7ee5ad919 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:47:12 +0200
Subject: [PATCH 08/31] Update and rename htdocs.sls to directory.sls

---
 salt/users/directory.sls | 20 ++++++++++++++++++++
 salt/users/htdocs.sls    |  7 -------
 2 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 salt/users/directory.sls
 delete mode 100644 salt/users/htdocs.sls

diff --git a/salt/users/directory.sls b/salt/users/directory.sls
new file mode 100644
index 0000000..50129f4
--- /dev/null
+++ b/salt/users/directory.sls
@@ -0,0 +1,20 @@
+/www/opensourcewebsite.org/htdocs/:
+  file.directory:
+    - mode: 775
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+    
+/www/opensourcewebsite.org/logs/:
+  file.directory:
+    - mode: 775
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+    
+/www/opensourcewebsite.org/tmp/:
+  file.directory:
+    - mode: 775
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
diff --git a/salt/users/htdocs.sls b/salt/users/htdocs.sls
deleted file mode 100644
index ec4b135..0000000
--- a/salt/users/htdocs.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-/www/opensourcewebsite.org/htdocs/:
-  file.directory:
-    - mode: 775
-    - user: opensourcewebsite.org
-    - group: opensourcewebsite.org
-    - makedirs: True
-  

From c757160a25575a2bf6d850f78ce69e6827bbd4db Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:47:58 +0200
Subject: [PATCH 09/31] Delete .keep

---
 salt/users/files/opensourcewebsite.org/logs/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 salt/users/files/opensourcewebsite.org/logs/.keep

diff --git a/salt/users/files/opensourcewebsite.org/logs/.keep b/salt/users/files/opensourcewebsite.org/logs/.keep
deleted file mode 100644
index e69de29..0000000

From 7a70982534db068cf48e4889252bf186aeccfa74 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:48:36 +0200
Subject: [PATCH 10/31] Delete .keep

---
 salt/users/files/opensourcewebsite.org/tmp/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 salt/users/files/opensourcewebsite.org/tmp/.keep

diff --git a/salt/users/files/opensourcewebsite.org/tmp/.keep b/salt/users/files/opensourcewebsite.org/tmp/.keep
deleted file mode 100644
index e69de29..0000000

From 89f231bd4524a2a43924badff5388652d0b49338 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 11:29:25 +0200
Subject: [PATCH 11/31] Update users.sls

---
 pillar/prod/users.sls | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pillar/prod/users.sls b/pillar/prod/users.sls
index c79d65d..6fff673 100644
--- a/pillar/prod/users.sls
+++ b/pillar/prod/users.sls
@@ -4,10 +4,7 @@ users:
   www-data:
     groups:
       - opensourcewebsite.org
-  git-auto-deploy:
-    groups:
-      - opensourcewebsite.org
-  
+
   opensourcewebsite.org:
     fullname: opensourcewebsite org
     enforce_password: false

From ef03e266f48a1bf8796082e3e9b977d44b5d8314 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 11:30:21 +0200
Subject: [PATCH 12/31] Update directory.sls

---
 salt/users/directory.sls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/users/directory.sls b/salt/users/directory.sls
index 50129f4..5217011 100644
--- a/salt/users/directory.sls
+++ b/salt/users/directory.sls
@@ -1,20 +1,20 @@
 /www/opensourcewebsite.org/htdocs/:
   file.directory:
-    - mode: 775
+    - mode: 770
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - makedirs: True
     
 /www/opensourcewebsite.org/logs/:
   file.directory:
-    - mode: 775
+    - mode: 770
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - makedirs: True
     
 /www/opensourcewebsite.org/tmp/:
   file.directory:
-    - mode: 775
+    - mode: 770
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - makedirs: True

From 753dd5033af9d6b5368498fcf035b4c0dfa0feb1 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 11:49:37 +0200
Subject: [PATCH 13/31] Update users.sls

---
 pillar/prod/users.sls | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pillar/prod/users.sls b/pillar/prod/users.sls
index 6fff673..30c967b 100644
--- a/pillar/prod/users.sls
+++ b/pillar/prod/users.sls
@@ -4,6 +4,9 @@ users:
   www-data:
     groups:
       - opensourcewebsite.org
+  git-auto-deploy:
+    groups:
+      - opensourcewebsite.org
 
   opensourcewebsite.org:
     fullname: opensourcewebsite org

From bf3bb66b09a29b73e57b1803a908d328093e8388 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 11:58:22 +0200
Subject: [PATCH 14/31] Update directory.sls

---
 salt/users/directory.sls | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/salt/users/directory.sls b/salt/users/directory.sls
index 5217011..bdc9b8c 100644
--- a/salt/users/directory.sls
+++ b/salt/users/directory.sls
@@ -4,7 +4,21 @@
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - makedirs: True
-    
+
+/www/opensourcewebsite.org/htdocs/runtime/:
+  file.directory:
+    - mode: 770
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+
+/www/opensourcewebsite.org/htdocs/runtime/logs/:
+  file.directory:
+    - mode: 770
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+
 /www/opensourcewebsite.org/logs/:
   file.directory:
     - mode: 770

From 0095c6bb4d77bc79ede0f4e39c64f9233c2ec3da Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 12:08:27 +0200
Subject: [PATCH 15/31] Update directory.sls

---
 salt/users/directory.sls | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/salt/users/directory.sls b/salt/users/directory.sls
index bdc9b8c..8419424 100644
--- a/salt/users/directory.sls
+++ b/salt/users/directory.sls
@@ -5,20 +5,6 @@
     - group: opensourcewebsite.org
     - makedirs: True
 
-/www/opensourcewebsite.org/htdocs/runtime/:
-  file.directory:
-    - mode: 770
-    - user: opensourcewebsite.org
-    - group: opensourcewebsite.org
-    - makedirs: True
-
-/www/opensourcewebsite.org/htdocs/runtime/logs/:
-  file.directory:
-    - mode: 770
-    - user: opensourcewebsite.org
-    - group: opensourcewebsite.org
-    - makedirs: True
-
 /www/opensourcewebsite.org/logs/:
   file.directory:
     - mode: 770

From acd3407389d5fb33df249b47c6b25859ac60d670 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 12:39:11 +0200
Subject: [PATCH 16/31] Create .gitignore

---
 .../opensourcewebsite.org/htdocs/.gitignore   | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 salt/users/files/opensourcewebsite.org/htdocs/.gitignore

diff --git a/salt/users/files/opensourcewebsite.org/htdocs/.gitignore b/salt/users/files/opensourcewebsite.org/htdocs/.gitignore
new file mode 100644
index 0000000..a8a487e
--- /dev/null
+++ b/salt/users/files/opensourcewebsite.org/htdocs/.gitignore
@@ -0,0 +1,48 @@
+
+# phpstorm project files
+.idea
+
+# netbeans project files
+nbproject
+
+# zend studio for eclipse project files
+.buildpath
+.project
+.settings
+
+# vscode project files
+.vscode
+
+# windows thumbnail cache
+Thumbs.db
+
+# composer vendor dir
+/vendor
+
+# composer itself is not needed
+composer.phar
+
+# Mac DS_Store Files
+.DS_Store
+
+# phpunit itself is not needed
+phpunit.phar
+# local phpunit config
+/phpunit.xml
+
+tests/_output/*
+tests/_support/_generated
+
+# local configs
+.env
+.env.test
+/config/web-local.php
+/config/params.php
+
+*views/layouts/analytics.php
+
+# php-cs-fixer itself is not needed
+php-cs-fixer.phar
+
+# cache for php-cs-fixer
+.php-cs-fixer.cache

From 171760b94b0081be0ae0ed763156546232d859d6 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 12:40:38 +0200
Subject: [PATCH 17/31] Create .gitignore

---
 .../files/opensourcewebsite.org/htdocs/runtime/.gitignore   | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore

diff --git a/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore b/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore
new file mode 100644
index 0000000..29e0fb0
--- /dev/null
+++ b/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore
@@ -0,0 +1,6 @@
+*
+!.gitignore
+!cache
+!debug
+!logs
+!mail

From 671bf575072745f9e89d41ba2c76410c094373ce Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 13:06:06 +0200
Subject: [PATCH 18/31] Delete .gitignore

---
 .../files/opensourcewebsite.org/htdocs/runtime/.gitignore   | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore

diff --git a/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore b/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore
deleted file mode 100644
index 29e0fb0..0000000
--- a/salt/users/files/opensourcewebsite.org/htdocs/runtime/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*
-!.gitignore
-!cache
-!debug
-!logs
-!mail

From 9337408d9a75627650c710d74e471a90cd35fbed Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 13:06:25 +0200
Subject: [PATCH 19/31] Delete .gitignore

---
 .../opensourcewebsite.org/htdocs/.gitignore   | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 salt/users/files/opensourcewebsite.org/htdocs/.gitignore

diff --git a/salt/users/files/opensourcewebsite.org/htdocs/.gitignore b/salt/users/files/opensourcewebsite.org/htdocs/.gitignore
deleted file mode 100644
index a8a487e..0000000
--- a/salt/users/files/opensourcewebsite.org/htdocs/.gitignore
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# phpstorm project files
-.idea
-
-# netbeans project files
-nbproject
-
-# zend studio for eclipse project files
-.buildpath
-.project
-.settings
-
-# vscode project files
-.vscode
-
-# windows thumbnail cache
-Thumbs.db
-
-# composer vendor dir
-/vendor
-
-# composer itself is not needed
-composer.phar
-
-# Mac DS_Store Files
-.DS_Store
-
-# phpunit itself is not needed
-phpunit.phar
-# local phpunit config
-/phpunit.xml
-
-tests/_output/*
-tests/_support/_generated
-
-# local configs
-.env
-.env.test
-/config/web-local.php
-/config/params.php
-
-*views/layouts/analytics.php
-
-# php-cs-fixer itself is not needed
-php-cs-fixer.phar
-
-# cache for php-cs-fixer
-.php-cs-fixer.cache

From ffc97d19108b9d3301c6bc8c0d78676376ff677e Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 13:24:38 +0200
Subject: [PATCH 20/31] Update supervisor.sls

---
 pillar/prod/supervisor.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pillar/prod/supervisor.sls b/pillar/prod/supervisor.sls
index 9d20943..bfbaf6d 100644
--- a/pillar/prod/supervisor.sls
+++ b/pillar/prod/supervisor.sls
@@ -35,8 +35,8 @@ supervisor:
         -q /www/opensourcewebsite.org/htdocs/yii cron > runtime/logs/cron.log
       numprocs: '1'
       directory: '/www/opensourcewebsite.org'
-      stdout_logfile: '/www/opensourcewebsite.org/htdocs/runtime/logs/cron-stdout.log'
-      stderr_logfile: '/www/opensourcewebsite.org/htdocs/runtime/logs/cron-stderr.log'
+      stdout_logfile: '/www/opensourcewebsite.org/logs/cron-stdout.log'
+      stderr_logfile: '/www/opensourcewebsite.org/logs/cron-stderr.log'
       user: 'opensourcewebsite.org'
       stopsignal: 'KILL'
 

From beb3722aaef168ba2c77ae9f5fc3c852783c84cf Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Sun, 30 Jan 2022 13:25:35 +0200
Subject: [PATCH 21/31] Update init.sls

---
 salt/supervisord/init.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/supervisord/init.sls b/salt/supervisord/init.sls
index ee5a7a1..1d56974 100644
--- a/salt/supervisord/init.sls
+++ b/salt/supervisord/init.sls
@@ -40,7 +40,7 @@ include:
 
 chown_log_file:
   file.managed:
-    - name: /www/opensourcewebsite.org/htdocs/runtime/logs/cron-stdout.log
+    - name: /www/opensourcewebsite.org/logs/cron-stdout.log
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - mode: 644
@@ -52,7 +52,7 @@ chown_log_file:
 
 chown_log_file2:
   file.managed:
-    - name: /www/opensourcewebsite.org/htdocs/runtime/logs/cron-stderr.log
+    - name: /www/opensourcewebsite.org/logs/cron-stderr.log
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - mode: 644

From 6fb3d7ed93b847690c963757eb6f4f8c1e9aa4c0 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:22:19 +0200
Subject: [PATCH 22/31] Update php81.sls

---
 pillar/prod/php81.sls | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pillar/prod/php81.sls b/pillar/prod/php81.sls
index 24ad550..f279b49 100644
--- a/pillar/prod/php81.sls
+++ b/pillar/prod/php81.sls
@@ -13,9 +13,10 @@ php:
       cli:
         - php8.1-cli
         - php8.1-common
-      xml:
+      modules:
         - php8.1-xml
-
+        - php8.1-soap
+        - php8.1-bcmath
     fpm:
       conf: /etc/php/8.1/fpm/php-fpm.conf
       ini: /etc/php/8.1/fpm/php.ini

From 8deda5caea8e233d61f5925a36408f7e11aa2d14 Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:22:42 +0200
Subject: [PATCH 23/31] Update php81.sls

---
 pillar/prod/php81.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pillar/prod/php81.sls b/pillar/prod/php81.sls
index f279b49..5992e44 100644
--- a/pillar/prod/php81.sls
+++ b/pillar/prod/php81.sls
@@ -17,6 +17,7 @@ php:
         - php8.1-xml
         - php8.1-soap
         - php8.1-bcmath
+        
     fpm:
       conf: /etc/php/8.1/fpm/php-fpm.conf
       ini: /etc/php/8.1/fpm/php.ini

From c61cf3f8a97177f5da894ab113b7a374149aecde Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:22:55 +0200
Subject: [PATCH 24/31] Update php80.sls

---
 pillar/prod/php80.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pillar/prod/php80.sls b/pillar/prod/php80.sls
index ce57510..c8105fb 100644
--- a/pillar/prod/php80.sls
+++ b/pillar/prod/php80.sls
@@ -13,9 +13,11 @@ php:
       cli:
         - php8.0-cli
         - php8.0-common
-      xml:
+      modules:
         - php8.0-xml
-
+        - php8.0-soap
+        - php8.0-bcmath
+        
     fpm:
       conf: /etc/php/8.0/fpm/php-fpm.conf
       ini: /etc/php/8.0/fpm/php.ini

From 66c5cde3ffb2c693a0eb131eba250e69fa68a27d Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:35:59 +0200
Subject: [PATCH 25/31] remove php's version dependent pkg

---
 salt/packages/init.sls | 2 --
 1 file changed, 2 deletions(-)

diff --git a/salt/packages/init.sls b/salt/packages/init.sls
index 9edc6ea..6a7622e 100644
--- a/salt/packages/init.sls
+++ b/salt/packages/init.sls
@@ -41,8 +41,6 @@ packages:
       - python3.7
       - apache2-utils
       - php-xdebug
-      - php7.4-soap
-      - php7.4-bcmath
 
 #NAME:
 #  pkg.purged

From c1f4eea267b618b039bd2432a7b46ecd237c9d5b Mon Sep 17 00:00:00 2001
From: Roman Sasin <86407758+mycelium3@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:52:43 +0200
Subject: [PATCH 26/31] Add support php 8.0 and 8.1

---
 pillar/prod/logrotate.sls | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pillar/prod/logrotate.sls b/pillar/prod/logrotate.sls
index 7eb1fc4..497cb49 100644
--- a/pillar/prod/logrotate.sls
+++ b/pillar/prod/logrotate.sls
@@ -105,6 +105,26 @@ logrotate:
         - postrotate
         - /usr/lib/php/php7.4-fpm-reopenlogs
         - endscript
+    php8.0-fpm:
+      path:
+        - /var/log/php8.0-fpm.log
+      config:
+        - missingok
+        - notifempty
+        - sharedscripts
+        - postrotate
+        - /usr/lib/php/php8.0-fpm-reopenlogs
+        - endscript
+    php8.1-fpm:
+      path:
+        - /var/log/php8.1-fpm.log
+      config:
+        - missingok
+        - notifempty
+        - sharedscripts
+        - postrotate
+        - /usr/lib/php/php8.1-fpm-reopenlogs
+        - endscript       
     salt-common:
       path:
         - /var/log/salt/master

From 3eea126c2569b7d69a8f8c3f5435e7a97bb9b9b9 Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Fri, 15 Jul 2022 18:14:33 +0300
Subject: [PATCH 27/31] Remove `php8.0`

---
 pillar/prod/logrotate.sls |  12 +---
 pillar/prod/php74.sls     |   2 +-
 pillar/prod/php80.sls     | 131 --------------------------------------
 pillar/prod/php81.sls     |   2 +-
 salt/backup/init.sls      |   8 +--
 salt/packages/init.sls    |   2 +
 salt/users/directory.sls  |   2 +-
 7 files changed, 10 insertions(+), 149 deletions(-)
 delete mode 100644 pillar/prod/php80.sls

diff --git a/pillar/prod/logrotate.sls b/pillar/prod/logrotate.sls
index 497cb49..165d309 100644
--- a/pillar/prod/logrotate.sls
+++ b/pillar/prod/logrotate.sls
@@ -105,16 +105,6 @@ logrotate:
         - postrotate
         - /usr/lib/php/php7.4-fpm-reopenlogs
         - endscript
-    php8.0-fpm:
-      path:
-        - /var/log/php8.0-fpm.log
-      config:
-        - missingok
-        - notifempty
-        - sharedscripts
-        - postrotate
-        - /usr/lib/php/php8.0-fpm-reopenlogs
-        - endscript
     php8.1-fpm:
       path:
         - /var/log/php8.1-fpm.log
@@ -124,7 +114,7 @@ logrotate:
         - sharedscripts
         - postrotate
         - /usr/lib/php/php8.1-fpm-reopenlogs
-        - endscript       
+        - endscript
     salt-common:
       path:
         - /var/log/salt/master
diff --git a/pillar/prod/php74.sls b/pillar/prod/php74.sls
index e1f1d67..6bf8355 100644
--- a/pillar/prod/php74.sls
+++ b/pillar/prod/php74.sls
@@ -13,7 +13,7 @@ php:
       cli:
         - php7.4-cli
         - php7.4-common
-      modules:
+      xml:
         - php7.4-xml
       soap:
         - php7.4-soap
diff --git a/pillar/prod/php80.sls b/pillar/prod/php80.sls
deleted file mode 100644
index c8105fb..0000000
--- a/pillar/prod/php80.sls
+++ /dev/null
@@ -1,131 +0,0 @@
-# vim: ft=yaml
----
-php:
-  use_external_repo: true
-  external_repo_name: 'ondrej/php'
-
-  version: '8.0'
-  lookup:
-    pkgs:
-      curl:
-        - php8.0-curl
-        - curl
-      cli:
-        - php8.0-cli
-        - php8.0-common
-      modules:
-        - php8.0-xml
-        - php8.0-soap
-        - php8.0-bcmath
-        
-    fpm:
-      conf: /etc/php/8.0/fpm/php-fpm.conf
-      ini: /etc/php/8.0/fpm/php.ini
-      pools: /etc/php/8.0/fpm/pool.d
-      service: php8.0-fpm.service
-
-      defaults:
-        global:
-          pid: /run/php/php8.0-fpm.pid
-
-    cli:
-      ini: /etc/php/8.0/cli/php.ini
-
-  fpm:
-    service:
-      enabled: true
-      opts:
-        reload: true
-
-    config:
-      ini:
-        opts:
-          recurse: true
-        settings:
-          PHP:
-            engine: 'On'
-            expose_php: 'Off'
-            extension_dir: '/usr/lib/php/20200930/'
-      conf:
-        opts:
-          recurse: true
-        settings:
-          global:
-            pid: /run/php/php8.0-fpm.pid
-            error_log: /var/log/php8.0-fpm.log
-
-    # settings for fpm-pools
-    pools:
-      'opensourcewebsite.org.conf':
-        enabled: true
-        opts:
-          replace: true
-
-        settings:
-          opensourcewebsite.org:
-            user: opensourcewebsite.org
-            group: opensourcewebsite.org
-            listen: /run/php/php8.0-opensourcewebsite.org.sock
-            listen.owner: opensourcewebsite.org
-            listen.group: opensourcewebsite.org
-            listen.mode: '0660'
-            pm: dynamic
-            pm.max_children: 5
-            pm.start_servers: 2
-            pm.min_spare_servers: 2
-            pm.max_spare_servers: 5
-            slowlog: /www/opensourcewebsite.org/logs/slow.log
-            request_slowlog_timeout: 5s
-            'php_admin_value[memory_limit]': 4096M
-
-      'www.conf':
-        enabled: true
-        opts:
-          replace: true
-
-        settings:
-          www:
-            user: www-data
-            group: www-data
-            listen: /run/php/php8.0-fpm.sock
-            listen.owner: www-data
-            listen.group: www-data
-            listen.mode: '0660'
-            pm: dynamic
-            pm.max_children: 5
-            pm.start_servers: 2
-            pm.min_spare_servers: 2
-            pm.max_spare_servers: 5
-            slowlog: /var/log/php8.0-fpm.slow.log
-            request_slowlog_timeout: 5s
-            'php_admin_value[memory_limit]': 128M
-
-  # php-cli settings
-  cli:
-    ini:
-      opts:
-        replace: false
-      settings:
-        PHP:
-          engine: 'On'
-          expose_php: 'Off'
-
-  # global php.ini settings
-  ini:
-    defaults:
-      PHP:
-        engine: 'On'
-        output_buffering: 4096
-        disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_wait
-        post_max_size: '210M'
-        upload_max_filesize: '200M'
-        max_execution_time: 360
-        max_input_time: 360
-        default_socket_timeout: 360
-      'CLI Server':
-        cli_server_color: 'On'
-      'Date':
-        'date.timezone': 'UTC'
diff --git a/pillar/prod/php81.sls b/pillar/prod/php81.sls
index 5992e44..10d115b 100644
--- a/pillar/prod/php81.sls
+++ b/pillar/prod/php81.sls
@@ -17,7 +17,7 @@ php:
         - php8.1-xml
         - php8.1-soap
         - php8.1-bcmath
-        
+
     fpm:
       conf: /etc/php/8.1/fpm/php-fpm.conf
       ini: /etc/php/8.1/fpm/php.ini
diff --git a/salt/backup/init.sls b/salt/backup/init.sls
index fcb688a..7ae6387 100644
--- a/salt/backup/init.sls
+++ b/salt/backup/init.sls
@@ -26,7 +26,7 @@
 #    - minute: random
 #    - hour: 1
 #    - identifier: backup-mysql
-    
+
 backup-mysql:
   cron.absent:
     - name: /root/backup_mysql.sh
@@ -52,10 +52,10 @@ backup-site:
 #     - group
 #     - mode
 
-{{pillar['backup_dir']}}/mysql:
+{{ pillar['backup_dir'] }}/mysql:
   file.absent:
-    - name: {{pillar['backup_dir']}}/mysql
-    
+    - name: {{ pillar['backup_dir'] }}/mysql
+
 {{ pillar['backup_dir'] }}/sites:
   file.directory:
     - user: root
diff --git a/salt/packages/init.sls b/salt/packages/init.sls
index 6a7622e..9edc6ea 100644
--- a/salt/packages/init.sls
+++ b/salt/packages/init.sls
@@ -41,6 +41,8 @@ packages:
       - python3.7
       - apache2-utils
       - php-xdebug
+      - php7.4-soap
+      - php7.4-bcmath
 
 #NAME:
 #  pkg.purged
diff --git a/salt/users/directory.sls b/salt/users/directory.sls
index 8419424..c5c1cae 100644
--- a/salt/users/directory.sls
+++ b/salt/users/directory.sls
@@ -11,7 +11,7 @@
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - makedirs: True
-    
+
 /www/opensourcewebsite.org/tmp/:
   file.directory:
     - mode: 770

From 29b4fa3d042450730214d4ba8ed268cd858f2833 Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Sat, 16 Jul 2022 23:07:44 +0300
Subject: [PATCH 28/31] Add `users.directory` state include to `top.sls`

---
 salt/top.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/top.sls b/salt/top.sls
index 604bfbc..5b4c9d7 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -12,6 +12,7 @@ base:
     - sysctl
     - users.log_acl
     - update_motd_d
+    - users.directory
     - users.selected_editor
   'opensourcewebsite.org or osw-devops-ci':
     - match: compound

From a6a07c632bb6f95359d44e3d4249b905226b246d Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Sat, 16 Jul 2022 23:54:45 +0300
Subject: [PATCH 29/31] Revert "Update init.sls"

This reverts commit beb3722aaef168ba2c77ae9f5fc3c852783c84cf.
---
 salt/supervisord/init.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/supervisord/init.sls b/salt/supervisord/init.sls
index 1d56974..ee5a7a1 100644
--- a/salt/supervisord/init.sls
+++ b/salt/supervisord/init.sls
@@ -40,7 +40,7 @@ include:
 
 chown_log_file:
   file.managed:
-    - name: /www/opensourcewebsite.org/logs/cron-stdout.log
+    - name: /www/opensourcewebsite.org/htdocs/runtime/logs/cron-stdout.log
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - mode: 644
@@ -52,7 +52,7 @@ chown_log_file:
 
 chown_log_file2:
   file.managed:
-    - name: /www/opensourcewebsite.org/logs/cron-stderr.log
+    - name: /www/opensourcewebsite.org/htdocs/runtime/logs/cron-stderr.log
     - user: opensourcewebsite.org
     - group: opensourcewebsite.org
     - mode: 644

From 5cf3379fa9bd26e4f104a48df1b32dcd67500f2d Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Sat, 16 Jul 2022 23:55:17 +0300
Subject: [PATCH 30/31] Revert "Update supervisor.sls"

This reverts commit ffc97d19108b9d3301c6bc8c0d78676376ff677e.
---
 pillar/prod/supervisor.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pillar/prod/supervisor.sls b/pillar/prod/supervisor.sls
index bfbaf6d..9d20943 100644
--- a/pillar/prod/supervisor.sls
+++ b/pillar/prod/supervisor.sls
@@ -35,8 +35,8 @@ supervisor:
         -q /www/opensourcewebsite.org/htdocs/yii cron > runtime/logs/cron.log
       numprocs: '1'
       directory: '/www/opensourcewebsite.org'
-      stdout_logfile: '/www/opensourcewebsite.org/logs/cron-stdout.log'
-      stderr_logfile: '/www/opensourcewebsite.org/logs/cron-stderr.log'
+      stdout_logfile: '/www/opensourcewebsite.org/htdocs/runtime/logs/cron-stdout.log'
+      stderr_logfile: '/www/opensourcewebsite.org/htdocs/runtime/logs/cron-stderr.log'
       user: 'opensourcewebsite.org'
       stopsignal: 'KILL'
 

From 040c4394223f6b6e0ad0cba48691913b7e842758 Mon Sep 17 00:00:00 2001
From: A1EF <a1ef@hotmail.com>
Date: Sat, 16 Jul 2022 23:59:06 +0300
Subject: [PATCH 31/31] Remove `backup_mysql.sh` from `cron_entries` in tests

---
 test/integration/default/controls/cron.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/integration/default/controls/cron.rb b/test/integration/default/controls/cron.rb
index 840dd3d..2b42535 100644
--- a/test/integration/default/controls/cron.rb
+++ b/test/integration/default/controls/cron.rb
@@ -3,8 +3,7 @@
 control 'osw cron entries' do
   title 'The cron entries should be present'
 
-  cron_entries = ['^\d{1,2} 1 \* \* \* /root/backup_mysql.sh$',
-                  '^\d{1,2} 2 \* \* \* /root/backup_site.sh$']
+  cron_entries = ['^\d{1,2} 2 \* \* \* /root/backup_site.sh$']
 
   cron_entries.each do |c|
     describe cron do