diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-11-17 08:53:57 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-11-24 17:44:57 +0100 |
| commit | 1d3e83b0b3d2cf229e78874b3ed842f9c107dde8 (patch) | |
| tree | de76bbe2c3e3018401408bb203e2898dd9f3a71b /conf/generate-unit-conf | |
| parent | b5c95cf683a396f1b8dbd0f3edd093f2f1edf838 (diff) | |
afm-unit.conf: Fix missing @ in service name
Regression introduced by commit:
c7db705 Generate afm-unit.conf using m4
Change-Id: Ibeeaf14b697e79cb2a95154b50b2ac775f93d529
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/generate-unit-conf')
| -rw-r--r-- | conf/generate-unit-conf/afm-unit | 6 | ||||
| -rw-r--r-- | conf/generate-unit-conf/service.inc | 5 |
2 files changed, 5 insertions, 6 deletions
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') diff --git a/conf/generate-unit-conf/service.inc b/conf/generate-unit-conf/service.inc index be1f7aa..ab8dff5 100644 --- a/conf/generate-unit-conf/service.inc +++ b/conf/generate-unit-conf/service.inc @@ -11,12 +11,7 @@ Description={{description}} X-AFM-description={{description}} X-AFM-name={{name.content}} X-AFM-shortname={{name.short}} -#*************** -# use X-AFM-id={{:id}}--{{:ver}}--{{:#target}} -# instead of: X-AFM-id=TARGET -# when home screen will use real ids -#************** X-AFM-version={{:version}} X-AFM-author={{author.content}} X-AFM-author-email={{author.email}} |