Commit b1c29c37 authored by Paul Barker's avatar Paul Barker

Merge branch 'pbarker/0.2.5' into 'master'

Changes fro v0.2.5

See merge request !12
parents 49a65d23 27814d73
Copyright (C) 2017, Togán Labs
Copyright (C) 2017-2018, Togán Labs
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
# oryx-apps Makefile
#
# Copyright (C) 2017 Togán Labs
# Copyright (C) 2017-2018 Togán Labs
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
......@@ -22,11 +22,12 @@
#
PACKAGE_NAME := oryx-apps
PACKAGE_VERSION := 0.2.4
PACKAGE_VERSION := 0.2.5
PREFIX := /usr/local
sbindir := $(PREFIX)/sbin
sysconfdir := /etc
syslibdir := /lib
APPS := bin/oryxcmd bin/oryxcmd-test
......@@ -40,8 +41,8 @@ bin/%: src/%.py Makefile
install: $(APPS)
install -d "$(DESTDIR)$(sbindir)"
install -m 755 $(APPS) "$(DESTDIR)$(sbindir)"
install -d "$(DESTDIR)$(sysconfdir)/init.d"
install -m 755 src/oryx-guests-initscript "$(DESTDIR)$(sysconfdir)/init.d/oryx-guests"
install -d "$(DESTDIR)$(syslibdir)/systemd/system"
install -m 644 src/oryx-guests.service "$(DESTDIR)$(syslibdir)/systemd/system/oryx-guests.service"
clean:
rm -rf bin
......
#! /bin/sh
# oryx-guests service file
#
# oryx-guests initscript
#
# Copyright (C) 2017 Togán Labs
# Copyright (C) 2018 Togán Labs
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
......@@ -23,20 +21,16 @@
# DEALINGS IN THE SOFTWARE.
#
set -e
[Unit]
Description=Auto start and stop enabled oryx guests
After=network.target
[Service]
Type=oneshot
ExecStart=/sbin/oryxcmd autostart_all
RemainAfterExit=true
ExecStop=/sbin/oryxcmd autostop_all
StandardOutput=journal
case "$1" in
start)
oryxcmd autostart_all
;;
stop)
oryxcmd autostop_all
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: $0 {start|stop|restart}"
exit 1
esac
[Install]
WantedBy=multi-user.target
......@@ -2,7 +2,7 @@
#
# oryxcmd
#
# Copyright (C) 2017 Togán Labs
# Copyright (C) 2017-2018 Togán Labs
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment