| 1 |
jpp |
1.1 |
diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl smeserver-php-scl-0.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl |
| 2 |
|
|
--- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl 2018-12-22 22:11:17.507000000 -0500 |
| 3 |
|
|
+++ smeserver-php-scl-0.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl 2018-12-22 22:20:55.238000000 -0500 |
| 4 |
|
|
@@ -131,4 +131,44 @@ |
| 5 |
|
|
|
| 6 |
|
|
} |
| 7 |
|
|
|
| 8 |
|
|
+ my $horde = $horde{'status'}; |
| 9 |
|
|
+ if ($horde eq 'enabled') |
| 10 |
|
|
+ { |
| 11 |
|
|
+ my $php_version ='default'; |
| 12 |
|
|
+ $php_version = ($php54{PhpModule} eq "enabled" )? 'php54' : $php_version; |
| 13 |
|
|
+ $php_version = ($php55{PhpModule} eq "enabled" )? 'php55' : $php_version; |
| 14 |
|
|
+ $php_version = ($php56{PhpModule} eq "enabled" )? 'php56' : $php_version; |
| 15 |
|
|
+ $php_version = ($php70{PhpModule} eq "enabled" )? 'php70' : $php_version; |
| 16 |
|
|
+ $php_version = ($php71{PhpModule} eq "enabled" )? 'php71' : $php_version; |
| 17 |
|
|
+ $php_version = ($php72{PhpModule} eq "enabled" )? 'php72' : $php_version; |
| 18 |
|
|
+ $php_version = ($php73{PhpModule} eq "enabled" )? 'php73' : $php_version; |
| 19 |
|
|
+ $OUT .= "\n"; |
| 20 |
|
|
+ $OUT .= "\n"; |
| 21 |
|
|
+ $OUT .= "#### Horde php-scl cgi to php56 if needed\n"; |
| 22 |
|
|
+ |
| 23 |
|
|
+ # check Horde version; not needed if Horde 5 is installed |
| 24 |
|
|
+ my $cmd = "rpm -q horde --queryformat \"%{VERSION}\n\""; |
| 25 |
|
|
+ my $result = `$cmd`; |
| 26 |
|
|
+ |
| 27 |
|
|
+ if ( ($result le 3.9) && ($php_version eq 'php70' || $php_version eq 'php71' || $php_version eq 'php72' || $php_version eq 'php73')) |
| 28 |
|
|
+ { |
| 29 |
|
|
+ |
| 30 |
|
|
+ # write the configuration |
| 31 |
|
|
+ |
| 32 |
|
|
+ $OUT .= "\n"; |
| 33 |
|
|
+ $OUT .= "\n"; |
| 34 |
|
|
+ $OUT .= "<Directory /home/httpd/html/horde>\n"; |
| 35 |
|
|
+ $OUT .= " # use PHP56 SCL from Remi repository instead of the default PHP as horde 3 does not support php 7\n"; |
| 36 |
|
|
+ $OUT .= " AddHandler phpscl-cgi .php\n"; |
| 37 |
|
|
+ $OUT .= " Action phpscl-cgi /phpscl-cgi/php56_REMI\n"; |
| 38 |
|
|
+ $OUT .= "</Directory>\n"; |
| 39 |
|
|
+ $OUT .= "\n"; |
| 40 |
|
|
+ $OUT .= "\n"; |
| 41 |
|
|
+ |
| 42 |
|
|
+ } |
| 43 |
|
|
+ else |
| 44 |
|
|
+ { |
| 45 |
|
|
+ $OUT .= "#Not needed php mod value < php70\n"; |
| 46 |
|
|
+ } |
| 47 |
|
|
+ } |
| 48 |
|
|
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
