From 6008a3ec4d1c0ed5df338b7c5f0775585ab51cfb Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 3 Dec 2019 15:02:57 +0100 Subject: Enforce numeric application IDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change allows to index applications numerically. This can be used for various purposes. One of it is to compute the HTTP port. Bug-AGL: SPEC-2968 Change-Id: I74531781f3a39d5d4b09eeb907f57f36822e38f0 Signed-off-by: José Bollo --- conf/unit/macros.inc | 2 ++ conf/unit/service.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/unit/macros.inc b/conf/unit/macros.inc index ca72b95..f21dee5 100644 --- a/conf/unit/macros.inc +++ b/conf/unit/macros.inc @@ -44,6 +44,7 @@ define( `IF_NOT_VALUE', `MUSTACH_IF_NOT(value=$1)') -- use TARGET={{:id}}--{{:ver}}--{{:#target}} -- instead of TARGET={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} -------------------------------------------------------------------------------- +define( `AFID', `{{:#metatarget.afid}}') define( `SMACKLABEL', `User::App::{{:id}}') define( `TARGET', `{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}') define( `NEWTARGET', `{{:id}}--{{:ver}}--{{:#target}}') @@ -74,6 +75,7 @@ define( `PLATFORM_API_PATH_LINK', `PLATFORM_API_PATH/link') define( `USER_API_PATH', `USER_RUN_DIR/apis') define( `USER_API_PATH_WS', `USER_API_PATH/ws') define( `USER_API_PATH_LINK', `USER_API_PATH/link') + -------------------------------------------------------------------------------- -- AGL_DEVEL SPECIFIC PARTS -------------------------------------------------------------------------------- diff --git a/conf/unit/service.inc b/conf/unit/service.inc index 64e6e5f..0036cae 100644 --- a/conf/unit/service.inc +++ b/conf/unit/service.inc @@ -28,7 +28,7 @@ X-AFM-height={{height}} {{#icon}} X-AFM-icon={{:#metadata.install-dir}}/{{:src}} {{/icon}} -X-AFM--ID={{:id}} +X-AFM--ID=AFID X-AFM--target-name={{:#target}} X-AFM--content={{content.src}} X-AFM--type={{content.type}} -- cgit 1.2.3-korg