| 1 |
diff -urN smeserver-geneweb-2.3.0.old/createlinks smeserver-geneweb-2.3.0/createlinks |
| 2 |
--- smeserver-geneweb-2.3.0.old/createlinks 2020-11-05 20:15:06.000000000 +0400 |
| 3 |
+++ smeserver-geneweb-2.3.0/createlinks 2021-03-02 12:58:42.609000000 +0400 |
| 4 |
@@ -2,33 +2,38 @@ |
| 5 |
|
| 6 |
use esmith::Build::CreateLinks qw(:all); |
| 7 |
|
| 8 |
-# Panel Link |
| 9 |
-panel_link('geneweb', 'manager'); |
| 10 |
+#-------------------------------------------------- |
| 11 |
+# functions for manager panel |
| 12 |
+#-------------------------------------------------- |
| 13 |
+my $panel = "manager"; |
| 14 |
+panel_link("geneweb", $panel); |
| 15 |
|
| 16 |
-my $gw = "/opt/geneweb/gw/gw"; |
| 17 |
-my $srv = "/var/service"; |
| 18 |
+#-------------------------------------------------- |
| 19 |
+# actions for geneweb-modify event |
| 20 |
+#-------------------------------------------------- |
| 21 |
|
| 22 |
-templates2events("$gw/only.txt", |
| 23 |
- qw( geneweb-modify bootstrap-console-save console-save )); |
| 24 |
-templates2events("$srv/geneweb/run", |
| 25 |
- qw( geneweb-modify bootstrap-console-save console-save )); |
| 26 |
-templates2events("$srv/gwsetup/run", |
| 27 |
- qw( geneweb-modify bootstrap-console-save console-save )); |
| 28 |
-templates2events("/etc/rc.d/init.d/geneweb", |
| 29 |
- qw( geneweb-modify bootstrap-console-save console-save )); |
| 30 |
-templates2events("/etc/rc.d/init.d/gwsetup", |
| 31 |
- qw( geneweb-modify bootstrap-console-save console-save)); |
| 32 |
-templates2events("/etc/httpd/conf/httpd.conf", |
| 33 |
- qw( geneweb-modify bootstrap-console-save console-save)); |
| 34 |
- |
| 35 |
-safe_symlink("sigusr1", |
| 36 |
- "root/etc/e-smith/events/geneweb-modify/services2adjust/httpd-e-smith"); |
| 37 |
-safe_symlink("restart", |
| 38 |
- "root/etc/e-smith/events/geneweb-modify/services2adjust/geneweb"); |
| 39 |
-safe_symlink("restart", |
| 40 |
- "root/etc/e-smith/events/geneweb-modify/services2adjust/gwsetup"); |
| 41 |
- |
| 42 |
-for my $event (qw(post-upgrade)) { |
| 43 |
- event_link("geneweb-restart", $event, "05"); |
| 44 |
- event_link("gwsetup-restart", $event, "05"); |
| 45 |
-} |
| 46 |
+$event = "geneweb-modify"; |
| 47 |
+ |
| 48 |
+templates2events("/opt/geneweb/gw/gw/only.txt", $event); |
| 49 |
+templates2events("/etc/httpd/conf/httpd.conf", $event); |
| 50 |
+ |
| 51 |
+safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
| 52 |
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/geneweb"); |
| 53 |
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/gwsetup"); |
| 54 |
+ |
| 55 |
+#-------------------------------------------------- |
| 56 |
+# actions for smeserver-geneweb-update event |
| 57 |
+#-------------------------------------------------- |
| 58 |
+ |
| 59 |
+my $event = "smeserver-geneweb-update"; |
| 60 |
+ |
| 61 |
+templates2events("/opt/geneweb/gw/gw/only.txt", $event); |
| 62 |
+templates2events("/etc/httpd/conf/httpd.conf", $event); |
| 63 |
+ |
| 64 |
+safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
| 65 |
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/geneweb"); |
| 66 |
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/gwsetup"); |
| 67 |
+templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); |
| 68 |
+event_link("systemd-default", $event, "06"); |
| 69 |
+ |
| 70 |
+#-------------------------------------------------- |
| 71 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/geneweb/geneweb_ALL smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/rc.d/init.d/geneweb/geneweb_ALL |
| 72 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/geneweb/geneweb_ALL 2020-11-05 20:15:06.000000000 +0400 |
| 73 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/rc.d/init.d/geneweb/geneweb_ALL 1970-01-01 04:00:00.000000000 +0400 |
| 74 |
@@ -1,59 +0,0 @@ |
| 75 |
-#!/bin/sh |
| 76 |
-# chkconfig: 345 99 01 |
| 77 |
-# |
| 78 |
-# geneweb: Starts the genealogy Server |
| 79 |
-# |
| 80 |
-# Version: @(#) /etc/rc.d/init.d/geneweb 1.0 |
| 81 |
-# |
| 82 |
-# description: Starts and stops the genealogy Server at boot time and shutdown. |
| 83 |
-# |
| 84 |
-# processname: geneweb |
| 85 |
-# hide: true |
| 86 |
- |
| 87 |
-# Source function library. |
| 88 |
-if [ -f /etc/rc.d/init.d/functions ]; then |
| 89 |
- . /etc/rc.d/init.d/functions |
| 90 |
-fi |
| 91 |
- |
| 92 |
-GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 93 |
-BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") |
| 94 |
-HD="/opt/geneweb/gw/gw" |
| 95 |
-BIN=$HD/gwd |
| 96 |
- |
| 97 |
-start() \{ |
| 98 |
- echo -n "Starting GeneWeb Services (geneweb):" |
| 99 |
- $BIN -daemon -hd $HD -bd $BD -lang $GWLANG |
| 100 |
-# daemon $BIN -daemon -lang $GWLANG -log /var/log/geneweb.log -hd $HD -bd $BD |
| 101 |
- touch /var/lock/subsys/geneweb |
| 102 |
-\} |
| 103 |
- |
| 104 |
-stop() \{ |
| 105 |
- echo -n "Shutting down GeneWeb Service (geneweb): " |
| 106 |
- killproc $BIN |
| 107 |
- rm -f /var/lock/subsys/geneweb |
| 108 |
- echo "" |
| 109 |
-\} |
| 110 |
- |
| 111 |
-restart() \{ |
| 112 |
- echo "Restarting GeneWeb Service (geneweb): " |
| 113 |
- stop |
| 114 |
- sleep 1 |
| 115 |
- start |
| 116 |
-\} |
| 117 |
- |
| 118 |
-# See how we were called. |
| 119 |
-cd $BD |
| 120 |
- |
| 121 |
-case "$1" in |
| 122 |
- start|stop|restart) |
| 123 |
- $1 |
| 124 |
- ;; |
| 125 |
- status) |
| 126 |
- status $BIN |
| 127 |
- ;; |
| 128 |
- *) |
| 129 |
- echo "*** Usage: geneweb \{start|stop|status|restart\}" |
| 130 |
- exit 1 |
| 131 |
-esac |
| 132 |
- |
| 133 |
-exit 0 |
| 134 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/gwsetup/gwsetup_ALL smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/rc.d/init.d/gwsetup/gwsetup_ALL |
| 135 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/gwsetup/gwsetup_ALL 2020-11-05 20:15:06.000000000 +0400 |
| 136 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/rc.d/init.d/gwsetup/gwsetup_ALL 1970-01-01 04:00:00.000000000 +0400 |
| 137 |
@@ -1,68 +0,0 @@ |
| 138 |
-#!/bin/sh |
| 139 |
-# chkconfig: 345 99 01 |
| 140 |
-# |
| 141 |
-# gwsetup: Starts the genealogy Server Administration service |
| 142 |
-# |
| 143 |
-# Version: @(#) /etc/rc.d/init.d/gwsetup 1.0 |
| 144 |
-# |
| 145 |
-# description: Starts and stops the genealogy Server Administration service at boot time and shutdown. |
| 146 |
-# |
| 147 |
-# processname: gwsetup |
| 148 |
-# hide: true |
| 149 |
- |
| 150 |
-# Source function library. |
| 151 |
-if [ -f /etc/rc.d/init.d/functions ]; then |
| 152 |
- . /etc/rc.d/init.d/functions |
| 153 |
-fi |
| 154 |
- |
| 155 |
-HD="/opt/geneweb/gw/gw" |
| 156 |
-BIN="$\{HD\}/gwsetup" |
| 157 |
- |
| 158 |
-USER="root" #geneweb" |
| 159 |
-GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 160 |
- |
| 161 |
-BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") |
| 162 |
-TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort) |
| 163 |
- |
| 164 |
-#OPTIONS="-lang $GWLANG -gd $HD -bindir $HD -p $TcpPort" |
| 165 |
- |
| 166 |
-start() \{ |
| 167 |
- echo -n "Starting GeneWeb Setup service (gwsetup):" |
| 168 |
- $HD/gwsetup -daemon -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG |
| 169 |
-# daemon --user $USER $BIN -daemon -lang $GWLANG -gd $HD -bindir $HD -p $TcpPort |
| 170 |
-# daemon --user $USER $BIN $OPTIONS |
| 171 |
-# 1>> /var/log/gwsetup.log 2>&1 |
| 172 |
-# daemon --check $servicename --user $USER $BIN $OPTIONS |
| 173 |
- touch /var/lock/subsys/gwsetup |
| 174 |
-\} |
| 175 |
- |
| 176 |
-stop() \{ |
| 177 |
- echo -n "Shutting down GeneWeb Setup service (gwsetup):" |
| 178 |
- killproc $BIN |
| 179 |
- rm -f /var/lock/subsys/gwsetup |
| 180 |
- echo "" |
| 181 |
-\} |
| 182 |
- |
| 183 |
-restart() \{ |
| 184 |
- echo "Restarting GeneWeb Setup service (gwsetup): " |
| 185 |
- stop |
| 186 |
- sleep 1 |
| 187 |
- start |
| 188 |
-\} |
| 189 |
- |
| 190 |
-# See how we were called. |
| 191 |
-cd $BD |
| 192 |
- |
| 193 |
-case "$1" in |
| 194 |
- start|stop|restart) |
| 195 |
- $1 |
| 196 |
- ;; |
| 197 |
- status) |
| 198 |
- status $BIN |
| 199 |
- ;; |
| 200 |
- *) |
| 201 |
- echo "*** Usage: gwsetup \{start|stop|status|restart\}" |
| 202 |
- exit 1 |
| 203 |
-esac |
| 204 |
- |
| 205 |
-exit 0 |
| 206 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-geneweb.preset smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-geneweb.preset |
| 207 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-geneweb.preset 1970-01-01 04:00:00.000000000 +0400 |
| 208 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-geneweb.preset 2021-03-02 12:41:06.495000000 +0400 |
| 209 |
@@ -0,0 +1,14 @@ |
| 210 |
+# geneweb specific service |
| 211 |
+{ |
| 212 |
+$status = $geneweb{status} || 'disabled'; |
| 213 |
+$status = ($status eq "enabled") ? "enable" : "disable"; |
| 214 |
+$OUT .= "$status geneweb.service\n"; |
| 215 |
+} |
| 216 |
+ |
| 217 |
+# gwsetup specific service |
| 218 |
+{ |
| 219 |
+$status = $gwsetup{status} || 'disabled'; |
| 220 |
+$status = ($status eq "enabled") ? "enable" : "disable"; |
| 221 |
+$OUT .= "$status gwsetup.service\n"; |
| 222 |
+} |
| 223 |
+ |
| 224 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/01run_ALL smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/01run_ALL |
| 225 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/01run_ALL 2020-11-05 20:15:06.000000000 +0400 |
| 226 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/01run_ALL 1970-01-01 04:00:00.000000000 +0400 |
| 227 |
@@ -1,14 +0,0 @@ |
| 228 |
-exec 2>&1 |
| 229 |
- |
| 230 |
-BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo '/opt/geneweb/bases') |
| 231 |
- |
| 232 |
-TcpPort=$(/sbin/e-smith/db configuration getprop geneweb TCPPort || echo '2317') |
| 233 |
- |
| 234 |
-GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 235 |
- |
| 236 |
-HD="/opt/geneweb/gw/gw" |
| 237 |
- |
| 238 |
-BIN=$HD/gwd |
| 239 |
- |
| 240 |
-exec $BIN -hd $HD -bd $BD -lang $GWLANG -p $TcpPort -setup_link |
| 241 |
- |
| 242 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/template-begin smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-begin |
| 243 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/template-begin 2020-11-05 20:15:06.000000000 +0400 |
| 244 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-begin 1970-01-01 04:00:00.000000000 +0400 |
| 245 |
@@ -1 +0,0 @@ |
| 246 |
-#!/bin/sh |
| 247 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/template-end smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-end |
| 248 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/geneweb/run/template-end 2020-11-05 20:15:06.000000000 +0400 |
| 249 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-end 1970-01-01 04:00:00.000000000 +0400 |
| 250 |
@@ -1,2 +0,0 @@ |
| 251 |
- |
| 252 |
-# end |
| 253 |
\ Pas de fin de ligne à la fin du fichier |
| 254 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/01run_ALL smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/01run_ALL |
| 255 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/01run_ALL 2020-11-05 20:15:06.000000000 +0400 |
| 256 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/01run_ALL 1970-01-01 04:00:00.000000000 +0400 |
| 257 |
@@ -1,14 +0,0 @@ |
| 258 |
- |
| 259 |
-exec 2>&1 |
| 260 |
- |
| 261 |
-USER="root" #geneweb" |
| 262 |
- |
| 263 |
-BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo '/opt/geneweb/bases') |
| 264 |
-TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort || echo '2316') |
| 265 |
-GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 266 |
- |
| 267 |
-HD="/opt/geneweb/gw/gw" |
| 268 |
-BIN="$HD/gwsetup" |
| 269 |
- |
| 270 |
-cd $BD |
| 271 |
-exec $BIN -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG |
| 272 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/template-begin smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-begin |
| 273 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/template-begin 2020-11-05 20:15:06.000000000 +0400 |
| 274 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-begin 1970-01-01 04:00:00.000000000 +0400 |
| 275 |
@@ -1 +0,0 @@ |
| 276 |
-#!/bin/sh |
| 277 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/template-end smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-end |
| 278 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates/var/service/gwsetup/run/template-end 2020-11-05 20:15:06.000000000 +0400 |
| 279 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-end 1970-01-01 04:00:00.000000000 +0400 |
| 280 |
@@ -1,2 +0,0 @@ |
| 281 |
- |
| 282 |
-# end |
| 283 |
\ Pas de fin de ligne à la fin du fichier |
| 284 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/geneweb smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/geneweb |
| 285 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/geneweb 2020-11-05 20:15:06.000000000 +0400 |
| 286 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/geneweb 1970-01-01 04:00:00.000000000 +0400 |
| 287 |
@@ -1,3 +0,0 @@ |
| 288 |
-UID="root" |
| 289 |
-GID="root" |
| 290 |
-PERMS=0755 |
| 291 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwsetup smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwsetup |
| 292 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwsetup 2020-11-05 20:15:06.000000000 +0400 |
| 293 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwsetup 1970-01-01 04:00:00.000000000 +0400 |
| 294 |
@@ -1,3 +0,0 @@ |
| 295 |
-UID="root" |
| 296 |
-GID="root" |
| 297 |
-PERMS=0755 |
| 298 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/geneweb/run smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/geneweb/run |
| 299 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/geneweb/run 2020-11-05 20:15:06.000000000 +0400 |
| 300 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/geneweb/run 1970-01-01 04:00:00.000000000 +0400 |
| 301 |
@@ -1,3 +0,0 @@ |
| 302 |
-UID="root" |
| 303 |
-GID="root" |
| 304 |
-PERMS=0755 |
| 305 |
diff -urN smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/gwsetup/run smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/gwsetup/run |
| 306 |
--- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/gwsetup/run 2020-11-05 20:15:06.000000000 +0400 |
| 307 |
+++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/gwsetup/run 1970-01-01 04:00:00.000000000 +0400 |
| 308 |
@@ -1,3 +0,0 @@ |
| 309 |
-UID="root" |
| 310 |
-GID="root" |
| 311 |
-PERMS=0755 |
| 312 |
diff -urN smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/geneweb.service smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/geneweb.service |
| 313 |
--- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/geneweb.service 1970-01-01 04:00:00.000000000 +0400 |
| 314 |
+++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/geneweb.service 2020-11-08 21:26:37.000000000 +0400 |
| 315 |
@@ -0,0 +1,14 @@ |
| 316 |
+[Unit] |
| 317 |
+Description=Geneweb Service |
| 318 |
+After=network-online.target |
| 319 |
+Wants=network-online.target |
| 320 |
+ |
| 321 |
+[Service] |
| 322 |
+Type=simple |
| 323 |
+## Is geneweb service enabled in config db ? |
| 324 |
+ExecStartPre=/sbin/e-smith/service-status geneweb |
| 325 |
+ExecStart=/bin/bash /usr/lib/systemd/systemd-geneweb start |
| 326 |
+RemainAfterExit=yes |
| 327 |
+ |
| 328 |
+[Install] |
| 329 |
+WantedBy=sme-server.target |
| 330 |
diff -urN smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/gwsetup.service smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/gwsetup.service |
| 331 |
--- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/gwsetup.service 1970-01-01 04:00:00.000000000 +0400 |
| 332 |
+++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/gwsetup.service 2020-11-08 21:21:02.000000000 +0400 |
| 333 |
@@ -0,0 +1,14 @@ |
| 334 |
+[Unit] |
| 335 |
+Description=Geneweb administration Service (gwsetup) |
| 336 |
+After=network-online.target |
| 337 |
+Wants=network-online.target |
| 338 |
+ |
| 339 |
+[Service] |
| 340 |
+Type=simple |
| 341 |
+## Is geneweb service enabled in config db ? |
| 342 |
+ExecStartPre=/sbin/e-smith/service-status gwsetup |
| 343 |
+ExecStart=/bin/bash /usr/lib/systemd/systemd-gwsetup start |
| 344 |
+RemainAfterExit=yes |
| 345 |
+ |
| 346 |
+[Install] |
| 347 |
+WantedBy=sme-server.target |
| 348 |
diff -urN smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-geneweb smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-geneweb |
| 349 |
--- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-geneweb 1970-01-01 04:00:00.000000000 +0400 |
| 350 |
+++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-geneweb 2020-11-08 23:35:32.392000000 +0400 |
| 351 |
@@ -0,0 +1,29 @@ |
| 352 |
+#!/bin/sh |
| 353 |
+# |
| 354 |
+# geneweb: Starts the genealogy Server |
| 355 |
+# description: Starts and stops the genealogy Server at boot time and shutdown. |
| 356 |
+# |
| 357 |
+ |
| 358 |
+GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 359 |
+BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") |
| 360 |
+HD="/opt/geneweb/gw/gw" |
| 361 |
+BIN=$HD/gwd |
| 362 |
+ |
| 363 |
+start() { |
| 364 |
+ echo -n "Starting GeneWeb Services (geneweb):" |
| 365 |
+ $BIN -daemon -hd $HD -bd $BD -lang $GWLANG |
| 366 |
+} |
| 367 |
+ |
| 368 |
+cd $BD |
| 369 |
+ |
| 370 |
+case "$1" in |
| 371 |
+ start) |
| 372 |
+ $1 |
| 373 |
+ ;; |
| 374 |
+ *) |
| 375 |
+ echo "*** Usage: geneweb {start}" |
| 376 |
+ exit 1 |
| 377 |
+ ;; |
| 378 |
+esac |
| 379 |
+ |
| 380 |
+exit 0 |
| 381 |
diff -urN smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-gwsetup smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-gwsetup |
| 382 |
--- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-gwsetup 1970-01-01 04:00:00.000000000 +0400 |
| 383 |
+++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-gwsetup 2020-11-08 23:36:01.072000000 +0400 |
| 384 |
@@ -0,0 +1,30 @@ |
| 385 |
+#!/bin/sh |
| 386 |
+# |
| 387 |
+# gwsetup: Starts the genealogy Server |
| 388 |
+# description: Starts and stops the genealogy adminstration Service |
| 389 |
+# |
| 390 |
+ |
| 391 |
+GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') |
| 392 |
+BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") |
| 393 |
+TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort) |
| 394 |
+ |
| 395 |
+HD="/opt/geneweb/gw/gw" |
| 396 |
+BIN=$HD/gwsetup |
| 397 |
+ |
| 398 |
+start() { |
| 399 |
+ echo -n "Starting gwsetup Services (gwsetup):" |
| 400 |
+ $BIN -daemon -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG |
| 401 |
+} |
| 402 |
+ |
| 403 |
+cd $BD |
| 404 |
+ |
| 405 |
+case "$1" in |
| 406 |
+ start) |
| 407 |
+ $1 |
| 408 |
+ ;; |
| 409 |
+ *) |
| 410 |
+ echo "*** Usage: gwsetup {start}" |
| 411 |
+ exit 1 |
| 412 |
+esac |
| 413 |
+ |
| 414 |
+exit 0 |
| 415 |
diff -urN smeserver-geneweb-2.3.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm smeserver-geneweb-2.3.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm |
| 416 |
--- smeserver-geneweb-2.3.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm 2020-11-05 20:15:06.000000000 +0400 |
| 417 |
+++ smeserver-geneweb-2.3.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm 2020-11-08 23:42:35.697000000 +0400 |
| 418 |
@@ -111,7 +111,7 @@ |
| 419 |
$cdb->set_prop("gwsetup", "status", $n_gws_st); |
| 420 |
$cdb->set_prop("gwsetup", "access", $n_gws_ac); |
| 421 |
|
| 422 |
- return ( system ( "/sbin/e-smith/signal-event", "geneweb-modify" ) ) ? |
| 423 |
+ return ( system ( "/sbin/e-smith/signal-event", "geneweb-update" ) ) ? |
| 424 |
$self->error("ERROR_UPDATING") : $self->success("SUCCESS"); |
| 425 |
} |
| 426 |
|
| 427 |
diff -urN smeserver-geneweb-2.3.0.old/root/var/service/geneweb/log/run smeserver-geneweb-2.3.0/root/var/service/geneweb/log/run |
| 428 |
--- smeserver-geneweb-2.3.0.old/root/var/service/geneweb/log/run 2020-11-05 20:15:06.000000000 +0400 |
| 429 |
+++ smeserver-geneweb-2.3.0/root/var/service/geneweb/log/run 1970-01-01 04:00:00.000000000 +0400 |
| 430 |
@@ -1,6 +0,0 @@ |
| 431 |
-#!/bin/sh |
| 432 |
- |
| 433 |
-exec \ |
| 434 |
- /usr/local/bin/setuidgid smelog \ |
| 435 |
- /usr/local/bin/multilog t s5000000 \ |
| 436 |
- /var/log/geneweb |
| 437 |
diff -urN smeserver-geneweb-2.3.0.old/root/var/service/gwsetup/log/run smeserver-geneweb-2.3.0/root/var/service/gwsetup/log/run |
| 438 |
--- smeserver-geneweb-2.3.0.old/root/var/service/gwsetup/log/run 2020-11-05 20:15:06.000000000 +0400 |
| 439 |
+++ smeserver-geneweb-2.3.0/root/var/service/gwsetup/log/run 1970-01-01 04:00:00.000000000 +0400 |
| 440 |
@@ -1,6 +0,0 @@ |
| 441 |
-#!/bin/sh |
| 442 |
- |
| 443 |
-exec \ |
| 444 |
- /usr/local/bin/setuidgid smelog \ |
| 445 |
- /usr/local/bin/multilog t s5000000 \ |
| 446 |
- /var/log/gwsetup |
Parent Directory
| 
Revision Log
| 
Revision Graph
