/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11918-migrateloudDomain2VirtualHost.patch
ViewVC logotype

Annotation of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11918-migrateloudDomain2VirtualHost.patch

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


Revision 1.1 - (hide annotations) (download)
Fri Jul 8 01:38:06 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-22_el7_sme, smeserver-nextcloud-1_2_0-19_el7_sme, smeserver-nextcloud-1_2_0-26_el7_sme, smeserver-nextcloud-1_2_0-27_el7_sme, smeserver-nextcloud-1_2_0-31_el7_sme, smeserver-nextcloud-1_2_0-24_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-17_el7_sme, smeserver-nextcloud-1_2_0-25_el7_sme, smeserver-nextcloud-1_2_0-20_el7_sme, smeserver-nextcloud-1_2_0-16_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-21_el7_sme, smeserver-nextcloud-1_2_0-18_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, HEAD
* Thu Jul 07 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-16.sme
- migrate property CloudDomain to VirtualHost [SME: 11918]
-

1 jpp 1.1 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/db/configuration/migrate/nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/db/configuration/migrate/nextcloud
2     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/db/configuration/migrate/nextcloud 2018-03-30 16:04:52.000000000 -0400
3     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/db/configuration/migrate/nextcloud 2022-07-07 21:35:37.020000000 -0400
4     @@ -6,6 +6,10 @@
5     $nextcloud->set_prop('DbPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`);
6     my $dbAdminPass = $nextcloud->prop('AdminPassword') ||
7     $nextcloud->set_prop('AdminPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`);
8     +
9     +if (my $CloudDomain = $DB->get_prop_and_delete('nextcloud', 'CloudDomain')) {
10     + $nextcloud->merge_props('VirtualHost', $CloudDomain);
11     + }
12    
13     }
14    
15     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf
16     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-07-07 21:26:47.694000000 -0400
17     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-07-07 21:28:58.842000000 -0400
18     @@ -104,8 +104,8 @@
19     OCC "config:system:set trusted_domains $i --value=".$_;
20     $i++;
21     }
22     -my $CloudDomain = $cdb->get_prop('nextcloud','CloudDomain') || '';
23     -OCC "config:system:set trusted_domains 99 --value=$CloudDomain" unless $CloudDomain eq "";
24     +my $VirtualHost = $cdb->get_prop('nextcloud','VirtualHost') || '';
25     +OCC "config:system:set trusted_domains 99 --value=$VirtualHost" unless $VirtualHost eq "";
26    
27     # enable files_external and allow auto refresh
28     OCC "app:enable files_external";
29     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud
30     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud 2022-07-07 21:26:47.684000000 -0400
31     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud 2022-07-07 21:30:28.286000000 -0400
32     @@ -3,7 +3,7 @@
33     #
34    
35     {
36     - my $CloudDomain = $nextcloud{'CloudDomain'} || 'none';
37     + my $CloudDomain = $nextcloud{'VirtualHost'} || 'none';#using CloudDomain, not to confuse for the template virtualHost variable
38     $OUT = '';
39     if ((${'nextcloud'}{'status'} || 'disabled') eq 'enabled' ){
40    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed