Skip to content

Commit 3eea126

Browse files
committed
Remove php8.0
1 parent c1f4eea commit 3eea126

File tree

7 files changed

+10
-149
lines changed

7 files changed

+10
-149
lines changed

pillar/prod/logrotate.sls

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,6 @@ logrotate:
105105
- postrotate
106106
- /usr/lib/php/php7.4-fpm-reopenlogs
107107
- endscript
108-
php8.0-fpm:
109-
path:
110-
- /var/log/php8.0-fpm.log
111-
config:
112-
- missingok
113-
- notifempty
114-
- sharedscripts
115-
- postrotate
116-
- /usr/lib/php/php8.0-fpm-reopenlogs
117-
- endscript
118108
php8.1-fpm:
119109
path:
120110
- /var/log/php8.1-fpm.log
@@ -124,7 +114,7 @@ logrotate:
124114
- sharedscripts
125115
- postrotate
126116
- /usr/lib/php/php8.1-fpm-reopenlogs
127-
- endscript
117+
- endscript
128118
salt-common:
129119
path:
130120
- /var/log/salt/master

pillar/prod/php74.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ php:
1313
cli:
1414
- php7.4-cli
1515
- php7.4-common
16-
modules:
16+
xml:
1717
- php7.4-xml
1818
soap:
1919
- php7.4-soap

pillar/prod/php80.sls

Lines changed: 0 additions & 131 deletions
This file was deleted.

pillar/prod/php81.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ php:
1717
- php8.1-xml
1818
- php8.1-soap
1919
- php8.1-bcmath
20-
20+
2121
fpm:
2222
conf: /etc/php/8.1/fpm/php-fpm.conf
2323
ini: /etc/php/8.1/fpm/php.ini

salt/backup/init.sls

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# - minute: random
2727
# - hour: 1
2828
# - identifier: backup-mysql
29-
29+
3030
backup-mysql:
3131
cron.absent:
3232
- name: /root/backup_mysql.sh
@@ -52,10 +52,10 @@ backup-site:
5252
# - group
5353
# - mode
5454

55-
{{pillar['backup_dir']}}/mysql:
55+
{{ pillar['backup_dir'] }}/mysql:
5656
file.absent:
57-
- name: {{pillar['backup_dir']}}/mysql
58-
57+
- name: {{ pillar['backup_dir'] }}/mysql
58+
5959
{{ pillar['backup_dir'] }}/sites:
6060
file.directory:
6161
- user: root

salt/packages/init.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ packages:
4141
- python3.7
4242
- apache2-utils
4343
- php-xdebug
44+
- php7.4-soap
45+
- php7.4-bcmath
4446

4547
#NAME:
4648
# pkg.purged

salt/users/directory.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- user: opensourcewebsite.org
1212
- group: opensourcewebsite.org
1313
- makedirs: True
14-
14+
1515
/www/opensourcewebsite.org/tmp/:
1616
file.directory:
1717
- mode: 770

0 commit comments

Comments
 (0)