diff -urN smeserver-geneweb-2.3.0.old/createlinks smeserver-geneweb-2.3.0/createlinks --- smeserver-geneweb-2.3.0.old/createlinks 2020-11-05 20:15:06.000000000 +0400 +++ smeserver-geneweb-2.3.0/createlinks 2021-03-02 12:58:42.609000000 +0400 @@ -2,33 +2,38 @@ use esmith::Build::CreateLinks qw(:all); -# Panel Link -panel_link('geneweb', 'manager'); +#-------------------------------------------------- +# functions for manager panel +#-------------------------------------------------- +my $panel = "manager"; +panel_link("geneweb", $panel); -my $gw = "/opt/geneweb/gw/gw"; -my $srv = "/var/service"; +#-------------------------------------------------- +# actions for geneweb-modify event +#-------------------------------------------------- -templates2events("$gw/only.txt", - qw( geneweb-modify bootstrap-console-save console-save )); -templates2events("$srv/geneweb/run", - qw( geneweb-modify bootstrap-console-save console-save )); -templates2events("$srv/gwsetup/run", - qw( geneweb-modify bootstrap-console-save console-save )); -templates2events("/etc/rc.d/init.d/geneweb", - qw( geneweb-modify bootstrap-console-save console-save )); -templates2events("/etc/rc.d/init.d/gwsetup", - qw( geneweb-modify bootstrap-console-save console-save)); -templates2events("/etc/httpd/conf/httpd.conf", - qw( geneweb-modify bootstrap-console-save console-save)); - -safe_symlink("sigusr1", - "root/etc/e-smith/events/geneweb-modify/services2adjust/httpd-e-smith"); -safe_symlink("restart", - "root/etc/e-smith/events/geneweb-modify/services2adjust/geneweb"); -safe_symlink("restart", - "root/etc/e-smith/events/geneweb-modify/services2adjust/gwsetup"); - -for my $event (qw(post-upgrade)) { - event_link("geneweb-restart", $event, "05"); - event_link("gwsetup-restart", $event, "05"); -} +$event = "geneweb-modify"; + +templates2events("/opt/geneweb/gw/gw/only.txt", $event); +templates2events("/etc/httpd/conf/httpd.conf", $event); + +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/geneweb"); +safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/gwsetup"); + +#-------------------------------------------------- +# actions for smeserver-geneweb-update event +#-------------------------------------------------- + +my $event = "smeserver-geneweb-update"; + +templates2events("/opt/geneweb/gw/gw/only.txt", $event); +templates2events("/etc/httpd/conf/httpd.conf", $event); + +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/geneweb"); +safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/gwsetup"); +templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); +event_link("systemd-default", $event, "06"); + +#-------------------------------------------------- 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 --- 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 +++ 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 @@ -1,59 +0,0 @@ -#!/bin/sh -# chkconfig: 345 99 01 -# -# geneweb: Starts the genealogy Server -# -# Version: @(#) /etc/rc.d/init.d/geneweb 1.0 -# -# description: Starts and stops the genealogy Server at boot time and shutdown. -# -# processname: geneweb -# hide: true - -# Source function library. -if [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -fi - -GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') -BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") -HD="/opt/geneweb/gw/gw" -BIN=$HD/gwd - -start() \{ - echo -n "Starting GeneWeb Services (geneweb):" - $BIN -daemon -hd $HD -bd $BD -lang $GWLANG -# daemon $BIN -daemon -lang $GWLANG -log /var/log/geneweb.log -hd $HD -bd $BD - touch /var/lock/subsys/geneweb -\} - -stop() \{ - echo -n "Shutting down GeneWeb Service (geneweb): " - killproc $BIN - rm -f /var/lock/subsys/geneweb - echo "" -\} - -restart() \{ - echo "Restarting GeneWeb Service (geneweb): " - stop - sleep 1 - start -\} - -# See how we were called. -cd $BD - -case "$1" in - start|stop|restart) - $1 - ;; - status) - status $BIN - ;; - *) - echo "*** Usage: geneweb \{start|stop|status|restart\}" - exit 1 -esac - -exit 0 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 --- 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 +++ 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 @@ -1,68 +0,0 @@ -#!/bin/sh -# chkconfig: 345 99 01 -# -# gwsetup: Starts the genealogy Server Administration service -# -# Version: @(#) /etc/rc.d/init.d/gwsetup 1.0 -# -# description: Starts and stops the genealogy Server Administration service at boot time and shutdown. -# -# processname: gwsetup -# hide: true - -# Source function library. -if [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -fi - -HD="/opt/geneweb/gw/gw" -BIN="$\{HD\}/gwsetup" - -USER="root" #geneweb" -GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') - -BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") -TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort) - -#OPTIONS="-lang $GWLANG -gd $HD -bindir $HD -p $TcpPort" - -start() \{ - echo -n "Starting GeneWeb Setup service (gwsetup):" - $HD/gwsetup -daemon -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG -# daemon --user $USER $BIN -daemon -lang $GWLANG -gd $HD -bindir $HD -p $TcpPort -# daemon --user $USER $BIN $OPTIONS -# 1>> /var/log/gwsetup.log 2>&1 -# daemon --check $servicename --user $USER $BIN $OPTIONS - touch /var/lock/subsys/gwsetup -\} - -stop() \{ - echo -n "Shutting down GeneWeb Setup service (gwsetup):" - killproc $BIN - rm -f /var/lock/subsys/gwsetup - echo "" -\} - -restart() \{ - echo "Restarting GeneWeb Setup service (gwsetup): " - stop - sleep 1 - start -\} - -# See how we were called. -cd $BD - -case "$1" in - start|stop|restart) - $1 - ;; - status) - status $BIN - ;; - *) - echo "*** Usage: gwsetup \{start|stop|status|restart\}" - exit 1 -esac - -exit 0 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 --- 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 +++ 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 @@ -0,0 +1,14 @@ +# geneweb specific service +{ +$status = $geneweb{status} || 'disabled'; +$status = ($status eq "enabled") ? "enable" : "disable"; +$OUT .= "$status geneweb.service\n"; +} + +# gwsetup specific service +{ +$status = $gwsetup{status} || 'disabled'; +$status = ($status eq "enabled") ? "enable" : "disable"; +$OUT .= "$status gwsetup.service\n"; +} + 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/01run_ALL 1970-01-01 04:00:00.000000000 +0400 @@ -1,14 +0,0 @@ -exec 2>&1 - -BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo '/opt/geneweb/bases') - -TcpPort=$(/sbin/e-smith/db configuration getprop geneweb TCPPort || echo '2317') - -GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') - -HD="/opt/geneweb/gw/gw" - -BIN=$HD/gwd - -exec $BIN -hd $HD -bd $BD -lang $GWLANG -p $TcpPort -setup_link - 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-begin 1970-01-01 04:00:00.000000000 +0400 @@ -1 +0,0 @@ -#!/bin/sh 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/geneweb/run/template-end 1970-01-01 04:00:00.000000000 +0400 @@ -1,2 +0,0 @@ - -# end \ Pas de fin de ligne à la fin du fichier 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/01run_ALL 1970-01-01 04:00:00.000000000 +0400 @@ -1,14 +0,0 @@ - -exec 2>&1 - -USER="root" #geneweb" - -BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo '/opt/geneweb/bases') -TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort || echo '2316') -GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') - -HD="/opt/geneweb/gw/gw" -BIN="$HD/gwsetup" - -cd $BD -exec $BIN -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-begin 1970-01-01 04:00:00.000000000 +0400 @@ -1 +0,0 @@ -#!/bin/sh 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 --- 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 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates/var/service/gwsetup/run/template-end 1970-01-01 04:00:00.000000000 +0400 @@ -1,2 +0,0 @@ - -# end \ Pas de fin de ligne à la fin du fichier 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 --- 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 +++ 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 @@ -1,3 +0,0 @@ -UID="root" -GID="root" -PERMS=0755 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 --- 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 +++ 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 @@ -1,3 +0,0 @@ -UID="root" -GID="root" -PERMS=0755 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 --- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/geneweb/run 2020-11-05 20:15:06.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/geneweb/run 1970-01-01 04:00:00.000000000 +0400 @@ -1,3 +0,0 @@ -UID="root" -GID="root" -PERMS=0755 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 --- smeserver-geneweb-2.3.0.old/root/etc/e-smith/templates.metadata/var/service/gwsetup/run 2020-11-05 20:15:06.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/etc/e-smith/templates.metadata/var/service/gwsetup/run 1970-01-01 04:00:00.000000000 +0400 @@ -1,3 +0,0 @@ -UID="root" -GID="root" -PERMS=0755 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 --- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/geneweb.service 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/geneweb.service 2020-11-08 21:26:37.000000000 +0400 @@ -0,0 +1,14 @@ +[Unit] +Description=Geneweb Service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +## Is geneweb service enabled in config db ? +ExecStartPre=/sbin/e-smith/service-status geneweb +ExecStart=/bin/bash /usr/lib/systemd/systemd-geneweb start +RemainAfterExit=yes + +[Install] +WantedBy=sme-server.target 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 --- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/system/gwsetup.service 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/system/gwsetup.service 2020-11-08 21:21:02.000000000 +0400 @@ -0,0 +1,14 @@ +[Unit] +Description=Geneweb administration Service (gwsetup) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +## Is geneweb service enabled in config db ? +ExecStartPre=/sbin/e-smith/service-status gwsetup +ExecStart=/bin/bash /usr/lib/systemd/systemd-gwsetup start +RemainAfterExit=yes + +[Install] +WantedBy=sme-server.target 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 --- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-geneweb 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-geneweb 2020-11-08 23:35:32.392000000 +0400 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# geneweb: Starts the genealogy Server +# description: Starts and stops the genealogy Server at boot time and shutdown. +# + +GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') +BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") +HD="/opt/geneweb/gw/gw" +BIN=$HD/gwd + +start() { + echo -n "Starting GeneWeb Services (geneweb):" + $BIN -daemon -hd $HD -bd $BD -lang $GWLANG +} + +cd $BD + +case "$1" in + start) + $1 + ;; + *) + echo "*** Usage: geneweb {start}" + exit 1 + ;; +esac + +exit 0 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 --- smeserver-geneweb-2.3.0.old/root/usr/lib/systemd/systemd-gwsetup 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/usr/lib/systemd/systemd-gwsetup 2020-11-08 23:36:01.072000000 +0400 @@ -0,0 +1,30 @@ +#!/bin/sh +# +# gwsetup: Starts the genealogy Server +# description: Starts and stops the genealogy adminstration Service +# + +GWLANG=$(/sbin/e-smith/db configuration getprop sysconfig Language | sed -e 's/_.*$//') +BD=$(/sbin/e-smith/db configuration getprop geneweb DBDir || echo "/opt/geneweb/bases") +TcpPort=$(/sbin/e-smith/db configuration getprop gwsetup TCPPort) + +HD="/opt/geneweb/gw/gw" +BIN=$HD/gwsetup + +start() { + echo -n "Starting gwsetup Services (gwsetup):" + $BIN -daemon -gd $HD -bindir $HD -p $TcpPort -lang $GWLANG +} + +cd $BD + +case "$1" in + start) + $1 + ;; + *) + echo "*** Usage: gwsetup {start}" + exit 1 +esac + +exit 0 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 --- 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 +++ smeserver-geneweb-2.3.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm 2020-11-08 23:42:35.697000000 +0400 @@ -111,7 +111,7 @@ $cdb->set_prop("gwsetup", "status", $n_gws_st); $cdb->set_prop("gwsetup", "access", $n_gws_ac); - return ( system ( "/sbin/e-smith/signal-event", "geneweb-modify" ) ) ? + return ( system ( "/sbin/e-smith/signal-event", "geneweb-update" ) ) ? $self->error("ERROR_UPDATING") : $self->success("SUCCESS"); } 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 --- smeserver-geneweb-2.3.0.old/root/var/service/geneweb/log/run 2020-11-05 20:15:06.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/var/service/geneweb/log/run 1970-01-01 04:00:00.000000000 +0400 @@ -1,6 +0,0 @@ -#!/bin/sh - -exec \ - /usr/local/bin/setuidgid smelog \ - /usr/local/bin/multilog t s5000000 \ - /var/log/geneweb 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 --- smeserver-geneweb-2.3.0.old/root/var/service/gwsetup/log/run 2020-11-05 20:15:06.000000000 +0400 +++ smeserver-geneweb-2.3.0/root/var/service/gwsetup/log/run 1970-01-01 04:00:00.000000000 +0400 @@ -1,6 +0,0 @@ -#!/bin/sh - -exec \ - /usr/local/bin/setuidgid smelog \ - /usr/local/bin/multilog t s5000000 \ - /var/log/gwsetup