/[smeserver]/rpms/e-smith-cvm-unix-local/sme10/e-smith-cvm-unix-local-2.6.0-bz11314-bz11125-systemd-update.patch
ViewVC logotype

Contents of /rpms/e-smith-cvm-unix-local/sme10/e-smith-cvm-unix-local-2.6.0-bz11314-bz11125-systemd-update.patch

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

Revision 1.1 - (show annotations) (download)
Sat Jan 9 04:55:33 2021 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-cvm-unix-local-2_6_0-2_el7_sme 
* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
- migrate to systemd [SME: 11314]
- add update event [SME: 11125]
1 diff -Nur e-smith-cvm-unix-local-2.6.0.old/createlinks e-smith-cvm-unix-local-2.6.0/createlinks
2 --- e-smith-cvm-unix-local-2.6.0.old/createlinks 1969-12-31 19:00:00.000000000 -0500
3 +++ e-smith-cvm-unix-local-2.6.0/createlinks 2021-01-08 23:08:59.523000000 -0500
4 @@ -0,0 +1,14 @@
5 +#!/usr/bin/perl -w
6 +
7 +use esmith::Build::CreateLinks qw(:all);
8 +
9 +# make cvm unix start always
10 +safe_symlink("../cvm-unix.service", "root/usr/lib/systemd/system/sme-server.target.wants/cvm-unix.service");
11 +
12 +# event e-smith-cvm-unix-local-update
13 +my $event="e-smith-cvm-unix-local-update";
14 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/cvm-unix");
15 +# systemd-specific action mandatory for this package-update event
16 +event_link("systemd-reload", $event, "89");
17 +event_link("systemd-default", $event, "88");
18 +templates2events("/etc/systemd/system-preset/49-koozali.preset",$event);
19 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-cvm-unix e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-cvm-unix
20 --- e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-cvm-unix 1969-12-31 19:00:00.000000000 -0500
21 +++ e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-cvm-unix 2021-01-08 23:06:54.395000000 -0500
22 @@ -0,0 +1,3 @@
23 +
24 +enable cvm-unix.service
25 +
26 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/usr/lib/systemd/system/cvm-unix.service e-smith-cvm-unix-local-2.6.0/root/usr/lib/systemd/system/cvm-unix.service
27 --- e-smith-cvm-unix-local-2.6.0.old/root/usr/lib/systemd/system/cvm-unix.service 1969-12-31 19:00:00.000000000 -0500
28 +++ e-smith-cvm-unix-local-2.6.0/root/usr/lib/systemd/system/cvm-unix.service 2021-01-08 23:02:04.474000000 -0500
29 @@ -0,0 +1,18 @@
30 +[Unit]
31 +Description=Credential Validation Modules
32 +Before=sme-server.target network.target network-pre.target
33 +
34 +[Service]
35 +Type=simple
36 +User=root
37 +Group=root
38 +Restart=always
39 +ExecStartPre=-/sbin/e-smith/db configuration set cvm-unix service status enabled
40 +ExecStartPre=-/sbin/e-smith/db configuration setprop cvm-unix status enabled
41 +ExecStart=/usr/bin/cvm-unix cvm-local:/var/lib/cvm/cvm-unix-local.socket
42 +ExecStopPost=-/sbin/e-smith/db configuration setprop cvm-unix status enabled
43 +TimeoutSec=0
44 +
45 +[Install]
46 +WantedBy=sme-server.target
47 +
48 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/52koozali.conf e-smith-cvm-unix-local-2.6.0/root/usr/lib/systemd/system/sme-server.target.d/52koozali.conf
49 --- e-smith-cvm-unix-local-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/52koozali.conf 1969-12-31 19:00:00.000000000 -0500
50 +++ e-smith-cvm-unix-local-2.6.0/root/usr/lib/systemd/system/sme-server.target.d/52koozali.conf 2021-01-08 22:58:07.122000000 -0500
51 @@ -0,0 +1,2 @@
52 +[Unit]
53 +Wants=cvs-unix.service
54 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/access e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/access
55 --- e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/access 1969-12-31 19:00:00.000000000 -0500
56 +++ e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/access 2021-01-08 23:43:48.516000000 -0500
57 @@ -0,0 +1 @@
58 +localhost
59 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/status e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/status
60 --- e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/status 1969-12-31 19:00:00.000000000 -0500
61 +++ e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/status 2021-01-08 23:43:30.214000000 -0500
62 @@ -0,0 +1 @@
63 +enabled
64 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/type e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/type
65 --- e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/defaults/cvm-unix/type 1969-12-31 19:00:00.000000000 -0500
66 +++ e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/defaults/cvm-unix/type 2021-01-08 23:43:37.494000000 -0500
67 @@ -0,0 +1 @@
68 +service
69 diff -Nur e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/migrate/cvm-unix e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/migrate/cvm-unix
70 --- e-smith-cvm-unix-local-2.6.0.old/root/etc/e-smith/db/configuration/migrate/cvm-unix 1969-12-31 19:00:00.000000000 -0500
71 +++ e-smith-cvm-unix-local-2.6.0/root/etc/e-smith/db/configuration/migrate/cvm-unix 2021-01-08 23:47:19.784000000 -0500
72 @@ -0,0 +1,7 @@
73 +{
74 + my $cvm = $DB->get_prop('cvm-unix', 'status');
75 + return unless defined $cvm;
76 + $DB->set_prop('cvm-unix', 'status', 'enabled') unless $cvm eq "enabled";
77 +
78 +}
79 +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed