From 1d3e83b0b3d2cf229e78874b3ed842f9c107dde8 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Fri, 17 Nov 2017 08:53:57 +0100 Subject: afm-unit.conf: Fix missing @ in service name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced by commit: c7db705 Generate afm-unit.conf using m4 Change-Id: Ibeeaf14b697e79cb2a95154b50b2ac775f93d529 Signed-off-by: José Bollo --- conf/generate-unit-conf/afm-unit | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'conf/generate-unit-conf/afm-unit') diff --git a/conf/generate-unit-conf/afm-unit b/conf/generate-unit-conf/afm-unit index 58fe851..3b56328 100644 --- a/conf/generate-unit-conf/afm-unit +++ b/conf/generate-unit-conf/afm-unit @@ -42,8 +42,12 @@ define( `IF_NOT_VALUE', `MUSTACH_IF_NOT(value=$1)') ----------------------------------------------------------------------- -- + when home screen will use real ids + use TARGET={{:id}}--{{:ver}}--{{:#target}} + instead of TARGET={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} + define( `TARGET', `{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}') -define( `UNIT_NAME_BASE', `afm-ON_PERM(`:public:hidden', `service', `appli')-{{:id}}--{{:ver}}--{{:#target}}') +define( `UNIT_NAME_BASE', `afm-ON_PERM(`:public:hidden', `service', `appli')-{{:id}}--{{:ver}}--{{:#target}}@') define( `UNIT_NAME_SERVICE', `UNIT_NAME_BASE%i.service') define( `UNIT_NAME_SOCKET_FOR', `afm-api-ws-$1@%i.socket') define( `APP_DATA_DIR', `/home/%i/app-data') -- cgit 1.2.3-korg