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

Diff 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 | View Patch Patch

Revision 1.2 by jpp, Tue Aug 2 03:52:06 2022 UTC Revision 1.5 by jpp, Tue Aug 2 04:14:22 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-webshare-1.0.0.old/createlinks smeserver-webshare-1.0.0/createlinks  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  --- smeserver-webshare-1.0.0.old/createlinks    2002-05-05 22:44:40.000000000 -0400
3  +++ smeserver-webshare-1.0.0/createlinks        2022-08-01 23:51:24.447000000 -0400  +++ smeserver-webshare-1.0.0/createlinks        2022-08-01 23:57:14.361000000 -0400
4  @@ -2,6 +2,7 @@  @@ -2,20 +2,25 @@
5   # This script creates the symlinks needed by this RPM   # This script creates the symlinks needed by this RPM
6   # Specific support exists to create symlinks within e-smith web "panels"   # Specific support exists to create symlinks within e-smith web "panels"
7   # and for links from named "events" directories into the "actions" directory   # and for links from named "events" directories into the "actions" directory
8    -
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  +use esmith::Build::CreateLinks qw(:all);  +use esmith::Build::CreateLinks qw(:all);
20    
21   sub panel_link   #--------------------------------------------------
22   {   # functions for user and manager panel
 @@ -19,3 +20,18 @@  
23   #--------------------------------------------------   #--------------------------------------------------
24   my $panel = "manager";   my $panel = "manager";
25   panel_link("webshare", $panel);   panel_link("webshare", $panel);
# Line 43  diff -Nur --no-dereference smeserver-web Line 53  diff -Nur --no-dereference smeserver-web
53           $OUT .= "<\/Directory>\n";           $OUT .= "<\/Directory>\n";
54           $OUT .= "\n";           $OUT .= "\n";
55       }       }
56    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    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";

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed