From 38d7b021defa7b6ebd29e7a5da4bba06224705b1 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 4 Dec 2020 15:52:41 +0100
Subject: [PATCH] Fixed php pkg list and SeLinux

---
 CoreModules/generic/conf.sh         |  2 +-
 SubModules/php-fpm/apt.pkg.list     |  1 +
 SubModules/php-fpm/conf.sh          | 15 ++++++++++++++-
 SubModules/php-fpm/dnf.pkg.list     |  1 +
 SubModules/php-fpm/generic.pkg.list |  2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 SubModules/php-fpm/apt.pkg.list
 create mode 100644 SubModules/php-fpm/dnf.pkg.list

diff --git a/CoreModules/generic/conf.sh b/CoreModules/generic/conf.sh
index febc5d1..8dccf3c 100644
--- a/CoreModules/generic/conf.sh
+++ b/CoreModules/generic/conf.sh
@@ -6,7 +6,7 @@ if [ "$shortdist" = "cent8" ]; then
     semanage port -a -t ssh_port_t -p tcp 4242
     systemctl enable ufw > $OUTPUT 2>&1
     mkdir /var/www > $OUTPUT 2>&1
-    semanage fcontext -a -t httpd_sys_content_t /var/www/ > $OUTPUT 2>&1
+    semanage fcontext -a -t httpd_sys_rw_content_t /var/www/ > $OUTPUT 2>&1
     restorecon -vr /var/www/ > $OUTPUT 2>&1
 
     #Motd
diff --git a/SubModules/php-fpm/apt.pkg.list b/SubModules/php-fpm/apt.pkg.list
new file mode 100644
index 0000000..7521d75
--- /dev/null
+++ b/SubModules/php-fpm/apt.pkg.list
@@ -0,0 +1 @@
+php-pear
\ No newline at end of file
diff --git a/SubModules/php-fpm/conf.sh b/SubModules/php-fpm/conf.sh
index ac4e59a..c0820fc 100644
--- a/SubModules/php-fpm/conf.sh
+++ b/SubModules/php-fpm/conf.sh
@@ -14,5 +14,18 @@ sed -i 's/; max_input_vars = 1000/max_input_vars = 10000/g' "$phpMainConf"
 sed -i 's/upload_max_filesize = 2/upload_max_filesize = 128/g' "$phpMainConf"
 sed -i 's/post_max_size = 8/post_max_size = 64/g' "$phpMainConf"
 
+
+if [ "$shortdist" = "cent8" ]; then
+# Centos Mysql config
+echo "pdo_mysql.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+echo "mysql.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+echo "mysqli.default_socket = '/var/run/mysqld/mysqld.sock'" >> /etc/opt/remi/php${phpver//.}/php.d/60-mysql_sock.ini
+#Centos php Bin 
+sudo ln -s /usr/bin/php${phpver//.} /usr/bin/php
+#Centos SeLinux
+setsebool -P httpd_can_network_connect 1
+fi
+
 systemctl start $phpFPMService
-systemctl enable $phpFPMService
\ No newline at end of file
+systemctl enable $phpFPMService
+
diff --git a/SubModules/php-fpm/dnf.pkg.list b/SubModules/php-fpm/dnf.pkg.list
new file mode 100644
index 0000000..8ccb20f
--- /dev/null
+++ b/SubModules/php-fpm/dnf.pkg.list
@@ -0,0 +1 @@
+PHPprefix-pear PHPprefix
\ No newline at end of file
diff --git a/SubModules/php-fpm/generic.pkg.list b/SubModules/php-fpm/generic.pkg.list
index 3238593..40d3c6b 100644
--- a/SubModules/php-fpm/generic.pkg.list
+++ b/SubModules/php-fpm/generic.pkg.list
@@ -1 +1 @@
-PHPprefix-imagick php-pear PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-mysql PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-xmlrpc PHPprefix-zip 
\ No newline at end of file
+PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-mysql PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-xmlrpc PHPprefix-zip 
\ No newline at end of file