diff options
| -rw-r--r-- | conf/afm-unit-debug.conf.in | 9 | ||||
| -rw-r--r-- | conf/afm-unit.conf.in | 9 | ||||
| -rw-r--r-- | conf/generate-unit-conf/afm-unit | 6 | ||||
| -rw-r--r-- | conf/generate-unit-conf/service.inc | 5 |
4 files changed, 9 insertions, 20 deletions
diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in index 5724e69..a4c458d 100644 --- a/conf/afm-unit-debug.conf.in +++ b/conf/afm-unit-debug.conf.in @@ -87,12 +87,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={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} -# when home screen will use real ids -#************** X-AFM-version={{:version}} X-AFM-author={{author.content}} X-AFM-author-email={{author.email}} @@ -148,7 +143,7 @@ Environment=LD_LIBRARY_PATH=$ORIGIN/lib Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.env %systemd-unit system -%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}} +%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@ SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} StandardInput=null StandardOutput=journal @@ -211,7 +206,7 @@ WantedBy=default.target SmackLabel=* ListenStream=%t/apis/ws/{{name}} FileDescriptorName={{name}} -Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}%i.service +Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@%i.service %nl [Install] WantedBy=sockets.target diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index d0b60fa..07ee8a0 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -87,12 +87,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={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} -# when home screen will use real ids -#************** X-AFM-version={{:version}} X-AFM-author={{author.content}} X-AFM-author-email={{author.email}} @@ -145,7 +140,7 @@ Environment=XDG_RUNTIME_DIR=/run/user/%i Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus Environment=LD_LIBRARY_PATH=$ORIGIN/lib %systemd-unit system -%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}} +%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@ SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} StandardInput=null StandardOutput=journal @@ -211,7 +206,7 @@ WantedBy=default.target SmackLabel=* ListenStream=%t/apis/ws/{{name}} FileDescriptorName={{name}} -Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}%i.service +Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@%i.service %nl [Install] WantedBy=sockets.target 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}} |