Updated slycrm.in (added/updated systemd service files).

diff --git a/sources/slycrm.in/c3d/firstboot/scripts/90_setupservices.sh b/sources/slycrm.in/c3d/firstboot/scripts/90_setupservices.sh
index 86b7ed7706e5c7e3419a09b14e52c15654d4ee68..cab6a24d95c088726ed711f7ce35c6daf7286c36 100755 (executable)
--- a/sources/slycrm.in/c3d/firstboot/scripts/90_setupservices.sh
+++ b/sources/slycrm.in/c3d/firstboot/scripts/90_setupservices.sh
@@ -7,6 +7,8 @@ systemctl enable gdftp.service
 systemctl start gdftp.service
 systemctl enable slycrm.service
 systemctl start slycrm.service
+systemctl enable sly-doc-processor.service
+systemctl start sly-doc-processor.service
 
 systemctl enable logrotate.timer
 systemctl start logrotate.timer

diff --git a/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/gdftp.service b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/gdftp.service
index 8250301c449446124463fd925558bab3bfa6dd0a..bfb4df76585a8871869eb814aa7bb80d36b39ac6 100644 (file)
--- a/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/gdftp.service
+++ b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/gdftp.service
@@ -1,13 +1,14 @@
 [Unit]
-Description=GDFTP
+Description=Google Drive FTP
+After=network.target
 
 [Service]
-User=root
-WorkingDirectory=/opt/slycrm/GDFTP
-ExecStart=java -DSLY-CRM-GDFTP -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006 -Xmx2G -Xms1G -jar /opt/slycrm/GDFTP/google-drive-ftp-adapter-1.6.2-jar-with-dependencies.jar
-# optional items below
+Type=exec
 Restart=always
-RestartSec=3
+RestartSec=15
+WorkingDirectory=/opt/gdftp
+ExecStart=/opt/gdftp/start.sh
+ExecStop=/opt/gdftp/stop.sh
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/sly-doc-processor.service b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/sly-doc-processor.service
new file mode 100644 (file)
index 0000000..965f8f7
--- /dev/null
+++ b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/sly-doc-processor.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=sly-doc-processor
+After=network.target
+
+[Service]
+Type=exec
+Restart=always
+RestartSec=15
+WorkingDirectory=/opt/sly-doc-processor
+ExecStart=/opt/sly-doc-processor/start.sh
+ExecStop=/opt/sly-doc-processor/stop.sh
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/slycrm.service b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/slycrm.service
index 2213d8895a41eff4ceb6adfc24886a938bcff8e5..f42bb08bf8728bfa3dd8af47ea6b6409383a110d 100644 (file)
--- a/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/slycrm.service
+++ b/sources/slycrm.in/c3d/postinstall/install-data/etc/systemd/system/slycrm.service
@@ -1,16 +1,14 @@
 [Unit]
 Description=slycrm
 After=network.target
-StartLimitIntervalSec=0
 
 [Service]
-Type=simple
+Type=exec
 Restart=always
-RestartSec=1
-KillMode=process
-User=root
+RestartSec=15
 WorkingDirectory=/opt/slycrm
-ExecStart=/usr/bin/java -DSLY-CRM-APPLICATION -jar /opt/slycrm/sly-crm-app.jar
+ExecStart=/opt/slycrm/start.sh
+ExecStop=/opt/slycrm/stop.sh
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sources/slycrm.in/c3d/postinstall/scripts/10_setupservices.sh b/sources/slycrm.in/c3d/postinstall/scripts/10_setupservices.sh
index 1b252931d4247a973856778774720ab64163d913..6f89bd14267fa563ab3bd19da2611faa3c56916c 100755 (executable)
--- a/sources/slycrm.in/c3d/postinstall/scripts/10_setupservices.sh
+++ b/sources/slycrm.in/c3d/postinstall/scripts/10_setupservices.sh
@@ -3,6 +3,7 @@
 
 systemctl disable gdftp.service
 systemctl disable slycrm.service
+systemctl disable sly-doc-processor.service
 systemctl disable NetworkManager-wait-online.service
 
 systemctl disable logrotate.timer

diff --git a/sources/slycrm.in/config b/sources/slycrm.in/config
index 9ba65011b09e8e8c075b2fd2d79ce85275b76dc5..bb7cfbf2807183e0795bd18b55d5a9da1ee21580 100644 (file)
--- a/sources/slycrm.in/config
+++ b/sources/slycrm.in/config
@@ -3,7 +3,7 @@ lxc.include = /usr/share/lxc/config/common.conf
 lxc.uts.name = slycrm.in.useribm.hu
 lxc.rootfs.path = __CONTAINER_PATH__/rootfs
 lxc.mount.auto = proc sys
-lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__ opt/slycrm none bind,create=dir 0 0
+lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__ opt none bind,create=dir 0 0
 
 lxc.net.0.type = veth
 lxc.net.0.flags = up