Edited PR from mycelium3

pillar/prod/logrotate.sls

@@ -105,6 +105,16 @@ logrotate:
         - postrotate
         - /usr/lib/php/php7.4-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

pillar/prod/php81.sls

@@ -13,8 +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

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

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,17 +40,21 @@ 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
+  file.absent:
+    - name: {{ pillar['backup_dir'] }}/mysql
 
 {{ pillar['backup_dir'] }}/sites:
   file.directory:

salt/gitautodeploy/files/git-auto-deploy-opensourcewebsite.org.conf.json

@@ -3,9 +3,10 @@
   "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",
+    "url": "https://github.com/opensourcewebsite-org/opensourcewebsite-org.git",
     "branch": "master",
     "remote": "origin",
     "path": "/www/opensourcewebsite.org/htdocs/",

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

salt/users/directory.sls

@@ -0,0 +1,20 @@
+/www/opensourcewebsite.org/htdocs/:
+  file.directory:
+    - mode: 770
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+
+/www/opensourcewebsite.org/logs/:
+  file.directory:
+    - mode: 770
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True
+
+/www/opensourcewebsite.org/tmp/:
+  file.directory:
+    - mode: 770
+    - user: opensourcewebsite.org
+    - group: opensourcewebsite.org
+    - makedirs: True

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