Remove MySQL backups, change nginx restart method

pillar/prod/logrotate.sls

@@ -103,6 +103,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

pillar/prod/php74.sls

@@ -11,10 +11,10 @@ php:
       cli:
         - php7.4-cli
         - php7.4-common
-      xml:
+      modules:
         - php7.4-xml
-      - php7.4-soap
-      - php7.4-bcmath
+        - php7.4-soap
+        - php7.4-bcmath
 
     fpm:
       conf: /etc/php/7.4/fpm/php-fpm.conf

pillar/prod/php80.sls

@@ -11,9 +11,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

pillar/prod/php81.sls

@@ -11,9 +11,11 @@ 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

pillar/prod/supervisor.sls

@@ -26,8 +26,8 @@ supervisor:
       command: '/usr/bin/php -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'
 

pillar/prod/users.sls

@@ -2,6 +2,9 @@ users:
   www-data:
     groups:
       - opensourcewebsite.org
+  git-auto-deploy:
+    groups:
+      - opensourcewebsite.org
 
   opensourcewebsite.org:
     fullname: opensourcewebsite org

salt/backup/files/backup_site.sh

@@ -22,4 +22,4 @@ done
 
 tar czf ${BACKUP_DIR}/configs.tgz -C / `echo ${CONFIGS} | paste`
 
-find ${BACKUP_DIR}/ -maxdepth 1 -type d -ctime +${ROTATE} -exec rm -rf {} \;
+find ${BACKUP_DIR}/ -maxdepth 1 -type d -mtime +${ROTATE} -exec rm -rf {} \;

salt/backup/init.sls

@@ -20,13 +20,18 @@
       backup_site_list: {{pillar['backup_sites'] | join(' ') }}
       backup_config_list: {{pillar['backup_configs'] | 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:
@@ -36,18 +41,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

salt/certbot/renew.sls

@@ -1,4 +1,4 @@
 cerbot-renew-cert:
   file.append:
     - name: /etc/letsencrypt/cli.ini
-    - text: deploy-hook = systemctl reload nginx
+    - text: deploy-hook = nginx -s reload

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/packages/init.sls

@@ -41,8 +41,6 @@ packages:
       - python3.7
       - apache2-utils
       - php-xdebug
-      - php7.4-soap
-      - php7.4-bcmath
 
 #NAME:
 #  pkg.purged

salt/supervisord/init.sls

@@ -40,15 +40,15 @@ 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
     - create: False
 
 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

salt/top.sls

@@ -13,6 +13,7 @@ base:
     - users.log_acl
     - update_motd_d
     - users.selected_editor
+    - users.directory
   'opensourcewebsite.org':
     - nginx
     - php.fpm

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