Fix metadata structure for api
diff --git a/aptly/files/default-aptly-api b/aptly/files/default-aptly-api
index aa1c292..630e396 100644
--- a/aptly/files/default-aptly-api
+++ b/aptly/files/default-aptly-api
@@ -1,3 +1,3 @@
-{%- from "aptly/map.jinja" import api with context %}
-LISTEN_HOST={{ api.bind.host }}
-LISTEN_PORT={{ api.bind.port }}
+{%- from "aptly/map.jinja" import server with context %}
+LISTEN_HOST={{ server.api.bind.host }}
+LISTEN_PORT={{ server.api.bind.port }}
diff --git a/aptly/map.jinja b/aptly/map.jinja
index 402bfaf..751ade0 100644
--- a/aptly/map.jinja
+++ b/aptly/map.jinja
@@ -11,5 +11,4 @@
},
}, merge=salt['pillar.get']('aptly:server')) %}
-{%- set api=salt['pillar.get']('aptly:api') %}
{%- set publisher=salt['pillar.get']('aptly:publisher') %}
diff --git a/aptly/meta/sphinx.yml b/aptly/meta/sphinx.yml
index 1d90acb..9d6fd5b 100644
--- a/aptly/meta/sphinx.yml
+++ b/aptly/meta/sphinx.yml
@@ -6,14 +6,14 @@
server:
name: server
param:
- {%- endif %}
- {%- if pillar.aptly.api is defined %}
+ {%- if pillar.aptly.server.api is defined %}
api:
name: api
param: {}
+ {%- endif %}
{%- endif %}
{%- if pillar.aptly.publisher is defined %}
publisher:
name: publisher
param: {}
- {%- endif %}
\ No newline at end of file
+ {%- endif %}
diff --git a/aptly/server/api.sls b/aptly/server/api.sls
index 64337e4..b7a635f 100644
--- a/aptly/server/api.sls
+++ b/aptly/server/api.sls
@@ -1,5 +1,5 @@
-{%- from "aptly/map.jinja" import api with context %}
-{%- if api.enabled %}
+{%- from "aptly/map.jinja" import server with context %}
+{%- if server.api.enabled %}
include:
- aptly.server
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index d87c685..7d6b642 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -11,10 +11,10 @@
enabled: true
hour: '*/12'
minute: 0
- api:
- enabled: true
- bind:
- host: 127.0.0.1
- port: 8080
+ api:
+ enabled: true
+ bind:
+ host: 127.0.0.1
+ port: 8080
publisher:
enabled: true