/[smecontribs]/rpms/smeserver-wsdd/contribs10/smeserver-wsdd-0.2-bz11386.patch
ViewVC logotype

Contents of /rpms/smeserver-wsdd/contribs10/smeserver-wsdd-0.2-bz11386.patch

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


Revision 1.2 - (show annotations) (download)
Tue Feb 23 22:11:29 2021 UTC (3 years, 2 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-wsdd-0_2-5_el7_sme, HEAD
Changes since 1.1: +7 -14 lines
* Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 0.2-5.sme
- improve update event to restart service and expand all necessary elements [SME: 11209]
  also add post-action for wsdd
- move templated service file as dropin [SME: 11386]

1 diff -Nur smeserver-wsdd-0.2.old/createlinks smeserver-wsdd-0.2/createlinks
2 --- smeserver-wsdd-0.2.old/createlinks 2021-02-23 16:44:55.262000000 -0500
3 +++ smeserver-wsdd-0.2/createlinks 2021-02-23 16:47:37.927000000 -0500
4 @@ -7,7 +7,7 @@
5 # wsdd-update
6
7 foreach (qw(
8 - /usr/lib/systemd/system/wsdd.service
9 + /usr/lib/systemd/system/wsdd.service.d/50-koozali.conf
10 ))
11
12 {
13 @@ -31,7 +31,7 @@
14 ));
15
16 event_templates($event, qw(
17 - /usr/lib/systemd/system/wsdd.service
18 + /usr/lib/systemd/system/wsdd.service.d/50-koozali.conf
19 /etc/systemd/system-preset/49-koozali.preset
20 /etc/rc.d/init.d/masq
21 ));
22 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/10Unit smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/10Unit
23 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/10Unit 2020-07-06 06:54:46.000000000 -0400
24 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/10Unit 1969-12-31 19:00:00.000000000 -0500
25 @@ -1,8 +0,0 @@
26 -[Unit]
27 -Description=Web Services Dynamic Discovery host daemon
28 -; Start after the network has been configured
29 -After=bootstrap-console.service
30 -Wants=network-online.target
31 -; After=network-online.target
32 -; It makes sense to have Samba running when wsdd starts, but is not required
33 -; Wants=smb.service
34 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/20Service smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/20Service
35 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/20Service 2020-07-06 07:39:17.000000000 -0400
36 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/20Service 1969-12-31 19:00:00.000000000 -0500
37 @@ -1,10 +0,0 @@
38 -[Service]
39 -Type=simple
40 -; ExecStartPre=/bin/sleep 30
41 -
42 -{
43 - $OUT .= "ExecStart=/usr/bin/wsdd -4 -i $InternalInterface{Name} -w $smb{Workgroup} -s";
44 -}
45 -
46 -User=wsdd
47 -Group=wsdd
48 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/30Install smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/30Install
49 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/30Install 2021-02-23 16:44:55.255000000 -0500
50 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service/30Install 1969-12-31 19:00:00.000000000 -0500
51 @@ -1,2 +0,0 @@
52 -[Install]
53 -WantedBy=sme-server.target
54 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/10Unit smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/10Unit
55 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/10Unit 1969-12-31 19:00:00.000000000 -0500
56 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/10Unit 2021-02-23 17:04:27.240000000 -0500
57 @@ -0,0 +1,4 @@
58 +[Unit]
59 +After=bootstrap-console.service
60 +Wants=
61 +Wants=network-online.target
62 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/20Service smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/20Service
63 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/20Service 1969-12-31 19:00:00.000000000 -0500
64 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/20Service 2021-02-23 17:09:23.809000000 -0500
65 @@ -0,0 +1,7 @@
66 +[Service]
67 +ExecStartPre=
68 +ExecStart=
69 +
70 +{
71 + $OUT .= "ExecStart=/usr/bin/wsdd -4 -i $InternalInterface{Name} -w $smb{Workgroup} -s";
72 +}
73 diff -Nur smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/30Install smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/30Install
74 --- smeserver-wsdd-0.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/30Install 1969-12-31 19:00:00.000000000 -0500
75 +++ smeserver-wsdd-0.2/root/etc/e-smith/templates/usr/lib/systemd/system/wsdd.service.d/50-koozali.conf/30Install 2021-02-23 16:44:55.255000000 -0500
76 @@ -0,0 +1,2 @@
77 +[Install]
78 +WantedBy=sme-server.target
79 diff -Nur smeserver-wsdd-0.2.old/root/etc/yum/post-actions/wsdd smeserver-wsdd-0.2/root/etc/yum/post-actions/wsdd
80 --- smeserver-wsdd-0.2.old/root/etc/yum/post-actions/wsdd 1969-12-31 19:00:00.000000000 -0500
81 +++ smeserver-wsdd-0.2/root/etc/yum/post-actions/wsdd 2021-02-23 16:51:02.243000000 -0500
82 @@ -0,0 +1 @@
83 +wsdd:any:/sbin/e-smith/signal-event smeserver-wsdd-update

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