/[smecontribs]/rpms/smeserver-docker/contribs10/smeserver-docker-0.4-update-createlinks1.patch
ViewVC logotype

Annotation of /rpms/smeserver-docker/contribs10/smeserver-docker-0.4-update-createlinks1.patch

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

Revision 1.1 - (hide annotations) (download)
Wed Jul 13 10:40:49 2022 UTC (2 years, 4 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-docker-0_4-4_el7_sme, smeserver-docker-0_4-7_el7_sme, smeserver-docker-0_4-5_el7_sme, smeserver-docker-0_4-3_el7_sme, smeserver-docker-0_4-6_el7_sme, HEAD 
* Tue Jul 12 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-3.sme
- Fix some createlink errors [SME: 11892]
- Update daemon.json and 50koozali.conf templates
1 jcrisp 1.1 diff -ruN smeserver-docker-0.4.old/createlinks smeserver-docker-0.4/createlinks
2     --- smeserver-docker-0.4.old/createlinks 2022-07-12 15:58:23.395817291 +0100
3     +++ smeserver-docker-0.4/createlinks 2022-07-13 08:44:30.580198568 +0100
4     @@ -8,14 +8,30 @@
5    
6     # our event specific for updating with yum without reboot
7     $event = "smeserver-docker-update";
8     +
9     #add here the path to your templates needed to expand
10     #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
11    
12     foreach my $file (qw(
13     /etc/systemd/system-preset/49-koozali.preset
14     ))
15     +
16     +{
17     + templates2events($file, $event);
18     +}
19     +
20     +foreach my $file (qw(
21     + /etc/docker/daemon.json
22     + /usr/lib/systemd/system/docker.service.d/50koozali.conf
23     +))
24     {
25     - templates2events( $file, $event );
26     + templates2events($file, qw(
27     + post-upgrade
28     + console-save
29     + bootstrap-console-save
30     + remoteaccess-update
31     + smeserver-docker-update
32     + ));
33     }
34    
35     #action needed in case we have a systemd unit
36     @@ -26,24 +42,3 @@
37     event_link("smeserver-docker-update", $event, "60");
38    
39    
40     -
41     -
42     -# Demo code below
43     -
44     -## ipsec-update
45     -#
46     -foreach (qw(
47     - /etc/docket/daemon.json
48     - /etc/sysconfig/docker
49     - /etc/sysconfig/docker-storage
50     - ))
51     -
52     -{
53     - templates2events("$_", qw(
54     - post-upgrade
55     - console-save
56     - bootstrap-console-save
57     - remoteaccess-update
58     - ));
59     -}
60     -
61     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/10iptables smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/10iptables
62     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/10iptables 2022-07-12 15:58:23.393817258 +0100
63     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/10iptables 1970-01-01 01:00:00.000000000 +0100
64     @@ -1,10 +0,0 @@
65     -{
66     -$iptables = $docker{iptables} || "true";
67     -
68     -# $OUT .= $iptables;
69     -
70     -$OUT .= "{\n";
71     -$OUT .= " \"iptables\": $iptables\n";
72     -$OUT .= "}\n";
73     -}
74     -
75     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/10start smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/10start
76     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/10start 1970-01-01 01:00:00.000000000 +0100
77     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/10start 2022-07-13 11:17:18.195078765 +0100
78     @@ -0,0 +1,3 @@
79     +{
80     + $OUT .= "\{\n";
81     +}
82     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/20directory smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/20directory
83     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/20directory 1970-01-01 01:00:00.000000000 +0100
84     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/20directory 2022-07-13 11:18:00.010773024 +0100
85     @@ -0,0 +1,5 @@
86     +{
87     + my $datadir = "/home/e-smith/files/docker/data/";
88     + $OUT .= "\"data-root\": \"$datadir\",\n";
89     +}
90     +
91     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/30dns smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/30dns
92     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/30dns 1970-01-01 01:00:00.000000000 +0100
93     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/30dns 2022-07-13 11:19:18.699079471 +0100
94     @@ -0,0 +1,10 @@
95     +{
96     + my $dockerdns = $docker{'DNS'} || ${LocalIP};
97     +
98     + my @dnsarray = split (",", $dockerdns);
99     +
100     + my $dns = join ',', map { qq/"$_"/ } @dnsarray;
101     +
102     + $OUT .= "\"dns\": \[$dns],\n";
103     +}
104     +
105     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/40dockernetwork smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/40dockernetwork
106     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/40dockernetwork 1970-01-01 01:00:00.000000000 +0100
107     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/40dockernetwork 2022-07-13 11:19:59.201751928 +0100
108     @@ -0,0 +1,6 @@
109     +{
110     + if ($dockernet = $docker{'DockerNetwork'}) {
111     + $OUT .= " \"bip\": $dockernet,\n";
112     + }
113     +}
114     +
115     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/90iptables smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/90iptables
116     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/etc/docker/daemon.json/90iptables 1970-01-01 01:00:00.000000000 +0100
117     +++ smeserver-docker-0.4/root/etc/e-smith/templates/etc/docker/daemon.json/90iptables 2022-07-13 11:20:25.826193969 +0100
118     @@ -0,0 +1,7 @@
119     +{
120     + # Last line MUST be without a comma
121     + # So we set this to always be without a comma
122     + $iptables = $docker{iptables} || "true";
123     + $OUT .= "\"iptables\": $iptables\n";
124     +}
125     +
126     diff -ruN smeserver-docker-0.4.old/root/etc/e-smith/templates/usr/lib/systemd/system/docker.service.d/50koozali.conf/40service smeserver-docker-0.4/root/etc/e-smith/templates/usr/lib/systemd/system/docker.service.d/50koozali.conf/40service
127     --- smeserver-docker-0.4.old/root/etc/e-smith/templates/usr/lib/systemd/system/docker.service.d/50koozali.conf/40service 2022-07-12 15:58:23.394817275 +0100
128     +++ smeserver-docker-0.4/root/etc/e-smith/templates/usr/lib/systemd/system/docker.service.d/50koozali.conf/40service 1970-01-01 01:00:00.000000000 +0100
129     @@ -1,13 +0,0 @@
130     -[Service]
131     -Type=notify
132     -# the default is not to use systemd for cgroups because the delegate issues still
133     -# exists and systemd currently does not support the cgroup feature set required
134     -# for containers run by docker
135     -# docker home set to /home/e-smith/files/docker
136     -ExecStart=
137     -ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock -g /home/e-smith/files/docker/data
138     -ExecReload=/bin/kill -s HUP $MAINPID
139     -TimeoutSec=0
140     -RestartSec=2
141     -Restart=always
142     -
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed