Merge "afm-unit.conf: cleanup of generation"

1 files changed, 22 insertions, 72 deletions

diff --git a/conf/unit/generate-unit-conf/afm-unit b/conf/unit/generate-unit-conf/afm-unit
index 47ba469..2a91067 100644
--- a/conf/unit/generate-unit-conf/afm-unit
+++ b/conf/unit/generate-unit-conf/afm-unit
@@ -1,74 +1,12 @@
 divert(-1)
+--------------------------------------------------------------------------------
 dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
------------------------------------------------------------------------
+include(macros.inc)
 -- Set the comment character of m4 to ; instead of #
 -- This is needed for substitution within lines starting with #
 changecom( ';')
-
------------------------------------------------------------------------
--- 
-define( `X_EMITS', 1)
-define( `X_DIVERTS', `divert(eval(-!X_EMITS()))')
-define( `X_PUSH_DIVERTS', `pushdef(`X_EMITS', eval(X_EMITS() && $1))X_DIVERTS()')
-
-define( `X_IF', `pushdef(`X_COND', $1)X_PUSH_DIVERTS($1)')
-define( `X_ELSE', `popdef(`X_EMITS')X_PUSH_DIVERTS(eval(!X_COND))')
-define( `X_ELIF', `X_ELSE()X_IF($1)')
-define( `X_ENDIF', `popdef(`X_EMITS')popdef(`X_COND')X_DIVERTS()')
-
-define( `IF', `pushdef(`ELSE',`X_ELSE()')pushdef(`ELIF',`X_ELIF($1)')pushdef(`ENDIF',`X_ENDIF()popdef(`ELSE',`ELIF',`ENDIF')')X_IF($1)')
-
------------------------------------------------------------------------
--- 
-define( `MUSTACH_ON', `ifelse(`$2',,,`{{#$1}}`$2'{{/$1}}')ifelse(`$3',,,`{{^$1}}`$3'{{/$1}}')')
-define( `MUSTACH_IF', `{{#$1}}pushdef(`ELSE',`{{/$1}}{{^$1}}')pushdef(`ENDIF',`{{/$1}}popdef(`ELSE',`ENDIF')')')
-define( `MUSTACH_IF_NOT', `{{^$1}}pushdef(`ELSE',`{{/$1}}{{#$1}}')pushdef(`ENDIF',`{{/$1}}popdef(`ELSE',`ENDIF')')')
-
------------------------------------------------------------------------
--- 
-define( `PERM', `@afm_prefix@permission:$1')
-define( `REQPERM', `required-permission.PERM($1)')
-
-define( `ON_PERM', `MUSTACH_ON(REQPERM($1),$2,$3)')
-define( `IF_PERM', `MUSTACH_IF(REQPERM($1))')
-define( `IF_NOT_PERM', `MUSTACH_IF_NOT(REQPERM($1))')
-
-define( `ON_CONTENT', `MUSTACH_ON(content.type=$1,$2,$3)')
-define( `IF_CONTENT', `MUSTACH_IF(content.type=$1)')
-define( `IF_NOT_CONTENT', `MUSTACH_IF_NOT(content.type=$1)')
-
-define( `ON_VALUE', `MUSTACH_ON(value=$1,$2,$3)')
-define( `IF_VALUE', `MUSTACH_IF(value=$1)')
-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_SERVICE', `UNIT_NAME_BASE%i.service')
-define( `UNIT_NAME_API_BASE', `afm-api-$1')
-define( `UNIT_NAME_API_SERVICE', `UNIT_NAME_API_BASE($1)@$2.service')
-define( `UNIT_NAME_API_SOCKET', `UNIT_NAME_API_BASE($1)@$2.socket')
-define( `UNIT_NAME_BINDING_BASE', `afm-link-$1')
-define( `UNIT_NAME_BINDING_SERVICE', `UNIT_NAME_BINDING_BASE($1)@$2.service')
-define( `APP_DATA_DIR', `/home/%i/app-data')
-define( `USER_RUN_DIR', `@afm_users_rundir@/%i')
-define( `DEBUGGING_DIR', `@afm_platform_rundir@/debug')
-define( `API_PATH', `USER_RUN_DIR/apis')
-define( `API_PATH_WS', `API_PATH/ws')
-define( `API_PATH_LINK', `API_PATH/link')
-
------------------------------------------------------------------------
--- 
-define( `ON_AGL_DEVEL', `ifdef(`AGL_DEVEL', $1, $2)')
-define( `IF_AGL_DEVEL', `IF(ON_AGL_DEVEL(1,0))')
-
 divert(0)dnl
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 ; File:
 ;
 ;    afm-unit.conf
@@ -144,16 +82,28 @@ divert(0)dnl
 ;              Records the installation directory path in the field "wgtdir"
 ;              of the private object only.
 ;
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;----        F O R E A C H   T A R G E T                                    ----
+;-------------------------------------------------------------------------------
 {{#targets}}
-
+;-------------------------------------------------------------------------------
 include(service.inc)
-
+;-------------------------------------------------------------------------------
+;----        F O R E A C H   P R O V I D E D   A P I S                      ----
+;-------------------------------------------------------------------------------
+{{#provided-api}}
+{{#value=ws|auto}}
 include(provided-api.inc)
-
+{{/value=ws|auto}}
+{{/provided-api}}
+;-------------------------------------------------------------------------------
+;----        F O R E A C H   P R O V I D E D   B I N D I N G                ----
+;-------------------------------------------------------------------------------
+{{#provided-binding}}
 include(provided-binding.inc)
-
+{{/provided-binding}}
+;-------------------------------------------------------------------------------
 {{/targets}}
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
 ; End of file afm-unit.conf mode ON_AGL_DEVEL(DEVEL, RELEASE)
-;---------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------