1 |
brianr |
1.1 |
diff -urN smeserver-wordpress-1.2.old/createlinks smeserver-wordpress-1.2/createlinks |
2 |
|
|
--- smeserver-wordpress-1.2.old/createlinks 2015-02-10 08:27:41.000000000 +0000 |
3 |
|
|
+++ smeserver-wordpress-1.2/createlinks 2021-03-07 10:52:34.204917921 +0000 |
4 |
|
|
@@ -2,6 +2,30 @@ |
5 |
|
|
|
6 |
|
|
use esmith::Build::CreateLinks qw(:all); |
7 |
|
|
|
8 |
|
|
+# our event specific for updating with yum without reboot |
9 |
|
|
+$event = "smeserver-wordpress-update"; #not needed, but here for completion and edification! |
10 |
|
|
+#add here the path to your templates needed to expand |
11 |
|
|
+#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event |
12 |
|
|
+# Not needed if no task to be started. |
13 |
|
|
+# |
14 |
|
|
+#foreach my $file (qw( |
15 |
|
|
+# #/etc/systemd/system-preset/49-koozali.preset |
16 |
|
|
+# |
17 |
|
|
+#)) |
18 |
|
|
+#{ |
19 |
|
|
+# templates2events( $file, $event ); |
20 |
|
|
+#} |
21 |
|
|
+# |
22 |
|
|
+#action needed in case we have a systemd unit |
23 |
|
|
+#event_link("systemd-default", $event, "10"); |
24 |
|
|
+#event_link("systemd-reload", $event, "50"); |
25 |
|
|
+ |
26 |
|
|
+#action specific to this package |
27 |
|
|
+#event_link("wordpress-update", $event, "30"); |
28 |
|
|
+#services we need to restart |
29 |
|
|
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
30 |
|
|
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
31 |
|
|
+ |
32 |
|
|
#################### |
33 |
|
|
# links to add |
34 |
|
|
|
35 |
|
|
@@ -11,6 +35,7 @@ |
36 |
|
|
console-save |
37 |
|
|
conf-wordpress |
38 |
|
|
wordpress-update |
39 |
|
|
+smeserver-wordpress-update |
40 |
|
|
)) |
41 |
|
|
{ |
42 |
|
|
templates2events( "/etc/wordpress/wp-config.php" , $event ); |
43 |
|
|
@@ -21,6 +46,7 @@ |
44 |
|
|
for my $event (qw( |
45 |
|
|
conf-wordpress |
46 |
|
|
wordpress-update |
47 |
|
|
+smeserver-wordpress-update |
48 |
|
|
)) |
49 |
|
|
{ |
50 |
|
|
templates2events( "/etc/httpd/conf/httpd.conf", $event ); |
51 |
|
|
@@ -31,9 +57,10 @@ |
52 |
|
|
for my $event (qw( |
53 |
|
|
conf-wordpress |
54 |
|
|
wordpress-update |
55 |
|
|
+smeserver-wordpress-update |
56 |
|
|
)) |
57 |
|
|
{ |
58 |
|
|
- safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
59 |
|
|
+ safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
60 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
61 |
|
|
} |
62 |
|
|
|
63 |
|
|
@@ -43,6 +70,7 @@ |
64 |
|
|
console-save |
65 |
|
|
conf-wordpress |
66 |
|
|
wordpress-update |
67 |
|
|
+smeserver-wordpress-update |
68 |
|
|
)) |
69 |
|
|
{ |
70 |
|
|
safe_symlink("../actions/wordpress", "root/etc/e-smith/events/$event/20wordpress"); |
71 |
|
|
diff -urN smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress |
72 |
|
|
--- smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2021-03-06 07:40:35.017795130 +0000 |
73 |
|
|
+++ smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2021-03-07 07:37:07.772466275 +0000 |
74 |
|
|
@@ -64,8 +64,15 @@ |
75 |
|
|
|
76 |
|
|
$OUT .= "\n"; |
77 |
|
|
$OUT .= "<Directory /usr/share/wordpress>\n"; |
78 |
|
|
+ |
79 |
|
|
+$version = "73"; |
80 |
|
|
+$OUT .= "<FilesMatch \.php\$\>\n"; |
81 |
|
|
+$OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n"; |
82 |
|
|
+$OUT .= "</FilesMatch>\n"; |
83 |
|
|
+ |
84 |
|
|
+ |
85 |
|
|
$OUT .= " AddType application/x-httpd-php .php\n"; |
86 |
|
|
- $OUT .= " php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n"; |
87 |
|
|
+ $OUT .= " #php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n"; |
88 |
|
|
$OUT .= " Options "; |
89 |
|
|
$OUT .= " FollowSymLinks " if ( ($wordpress{'SymLinks'} || 'disabled') eq 'enabled'); |
90 |
|
|
$OUT .= " Indexes " if ( ($wordpress{'Indexes'} || 'disabled') eq 'enabled'); |
91 |
|
|
@@ -74,10 +81,10 @@ |
92 |
|
|
$OUT .= "\n order deny,allow\n"; |
93 |
|
|
$OUT .= " deny from all\n"; |
94 |
|
|
$OUT .= " allow from $allow\n"; |
95 |
|
|
- $OUT .= " php_value mysql.default_host $wordpress{DbName}\n"; |
96 |
|
|
- $OUT .= " php_value mysql.default_user $wordpress{DbUser}\n"; |
97 |
|
|
- $OUT .= " php_value mysql.default_password $wordpress{DbPassword}\n"; |
98 |
|
|
- $OUT .= " php_admin_value upload_tmp_dir /tmp\n"; |
99 |
|
|
+ $OUT .= " #php_value mysql.default_host $wordpress{DbName}\n"; |
100 |
|
|
+ $OUT .= " #php_value mysql.default_user $wordpress{DbUser}\n"; |
101 |
|
|
+ $OUT .= " #php_value mysql.default_password $wordpress{DbPassword}\n"; |
102 |
|
|
+ $OUT .= " #php_admin_value upload_tmp_dir /tmp\n"; |
103 |
|
|
if ($pass) |
104 |
|
|
{ |
105 |
|
|
$OUT .= " AuthName \"$name\"\n"; |