/[smecontribs]/rpms/smeserver-webshare/contribs10/smeserver-webshare-1.0.0-sme10-backup.patch
ViewVC logotype

Annotation of /rpms/smeserver-webshare/contribs10/smeserver-webshare-1.0.0-sme10-backup.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.5 - (hide annotations) (download)
Tue Aug 2 04:14:22 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-webshare-1_0_0-13_el7_sme, HEAD
Changes since 1.4: +11 -0 lines 
* Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-13.sme
- update to httpd 2.4 access syntax [SME: 12066]
  thanks to Vasarhelyi Zsolt
- add to core backup [SME: 12030]
- add update event, use php-fpm [SME: 11078]
  might need its dedicated pool
1 jpp 1.1 diff -Nur --no-dereference smeserver-webshare-1.0.0.old/createlinks smeserver-webshare-1.0.0/createlinks
2     --- smeserver-webshare-1.0.0.old/createlinks 2002-05-05 22:44:40.000000000 -0400
3 jpp 1.3 +++ smeserver-webshare-1.0.0/createlinks 2022-08-01 23:57:14.361000000 -0400
4     @@ -2,20 +2,25 @@
5 jpp 1.2 # This script creates the symlinks needed by this RPM
6     # Specific support exists to create symlinks within e-smith web "panels"
7     # and for links from named "events" directories into the "actions" directory
8 jpp 1.3 -
9     -sub panel_link
10     -{
11     - my ($function, $panel) = @_;
12     -
13     - unlink "root/etc/e-smith/web/panels/$panel/cgi-bin/$function";
14     - symlink("../../../functions/$function",
15     - "root/etc/e-smith/web/panels/$panel/cgi-bin/$function")
16     - or die "Can't symlink to root/etc/e-smith/web/panels/$panel".
17     - "/cgi-bin/$function: $!";
18     -}
19 jpp 1.2 +use esmith::Build::CreateLinks qw(:all);
20    
21 jpp 1.3 #--------------------------------------------------
22     # functions for user and manager panel
23 jpp 1.1 #--------------------------------------------------
24     my $panel = "manager";
25     panel_link("webshare", $panel);
26     +
27     +my $event = "smeserver-webshare-update";
28     +event_templates($event, qw(
29     +/etc/httpd/conf/httpd.conf
30     +));
31     +
32     +event_services($event, qw(
33     + php-fpm restart
34     + httpd-e-smith restart
35     +));
36     +
37     +use esmith::Build::Backup qw(:all);
38     +backup_includes("smeserver-webshare", qw(
39     +/opt/webshare
40     +));
41     diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias
42     --- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-01 23:41:07.957000000 -0400
43     +++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-01 23:43:13.776000000 -0400
44     @@ -27,8 +27,9 @@
45     $OUT .= " AuthUserFile \/home\/e-smith\/db\/webshare\/htpasswd.$key\n";
46     $OUT .= " Require valid-user\n";
47     $OUT .= " AddType application\/x-httpd-php \.php \.php3\n";
48     - $OUT .= " php_flag magic_quotes_gpc on\n";
49     - $OUT .= " php_flag track_vars on\n";
50     + $OUT .= " <FilesMatch .php>\n";
51     + $OUT .= ' SetHandler "proxy:unix:/var/run/php-fpm/php.sock|fcgi://localhost"'."\n";
52     + $OUT .= " </FilesMatch>\n";
53     $OUT .= "<\/Directory>\n";
54     $OUT .= "\n";
55     }
56 jpp 1.4 diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile
57     --- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile 2022-08-02 00:02:54.839000000 -0400
58     +++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile 1969-12-31 19:00:00.000000000 -0500
59     @@ -1,4 +0,0 @@
60     -{
61     - $OUT .= load_modules(qw(auth_basic));
62     - $OUT .= load_modules(qw(authn_file));
63     -}
64     diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias
65     --- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:02:54.856000000 -0400
66     +++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:05:30.150000000 -0400
67     @@ -9,16 +9,7 @@
68     $OUT .= "# webshare\/$key\n";
69     $OUT .= "Alias \/webshare\/$key \/opt\/webshare\/$key\n";
70     $OUT .= "<Directory \/opt\/webshare\/$key>\n";
71     - {
72     - use esmith::util;
73     - my $release = esmith::util::determineRelease();
74     - if ( "$release" ge "7.0" ) {
75     - $OUT .= " SSLRequireSSL\n";
76     - }
77     - else {
78     - $OUT .= " RequireSSL on\n";
79     - }
80     - }
81     + $OUT .= " SSLRequireSSL\n";
82     $OUT .= " Options +Indexes\n";
83     $OUT .= " AllowOverride None\n";
84     $OUT .= " Require all granted\n";
85 jpp 1.5 diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias
86     --- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:06:23.070000000 -0400
87     +++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:12:14.761000000 -0400
88     @@ -12,7 +12,6 @@
89     $OUT .= " SSLRequireSSL\n";
90     $OUT .= " Options +Indexes\n";
91     $OUT .= " AllowOverride None\n";
92     - $OUT .= " Require all granted\n";
93     $OUT .= " AuthName \"Restricted $key access only\"\n";
94     $OUT .= " AuthType Basic\n";
95     $OUT .= " AuthUserFile \/home\/e-smith\/db\/webshare\/htpasswd.$key\n";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed