Allow setting more options
diff --git a/aptly/files/aptly.conf b/aptly/files/aptly.conf
index b96db5b..618ec32 100644
--- a/aptly/files/aptly.conf
+++ b/aptly/files/aptly.conf
@@ -2,11 +2,11 @@
{
"rootDir": "{{ server.root_dir }}",
"downloadConcurrency": 4,
- "architectures": [ "amd64" ],
- "dependencyFollowSuggests": false,
- "dependencyFollowRecommends": false,
- "dependencyFollowAllVariants": false,
- "dependencyFollowSource": false,
+ "architectures": [ {% for arch in server.architectures|default([]) %}"{{ arch }}"{% if not loop.last %},{% endif %}{% endfor %} ],
+ "dependencyFollowSuggests": {{ server.dependency.follow.suggests|lower }},
+ "dependencyFollowRecommends": {{ server.dependency.follow.recommends|lower }},
+ "dependencyFollowAllVariants": {{ server.dependency.follow.all_variants|lower }},
+ "dependencyFollowSource": {{ server.dependency.follow.source|lower }},
{%- if server.endpoint is defined %}
"S3PublishEndpoints": {
{%- for name, endpoint in server.endpoint.iteritems %}
@@ -42,3 +42,6 @@
"ppaDistributorID": "ubuntu",
"ppaCodename": ""
}
+{#-
+vim: syntax=jinja
+-#}
diff --git a/aptly/map.jinja b/aptly/map.jinja
index e0d4853..5538f99 100644
--- a/aptly/map.jinja
+++ b/aptly/map.jinja
@@ -1,10 +1,18 @@
{%- set server = salt['grains.filter_by']({
- 'Debian': {
+ 'default': {
'source': {
'engine': 'pkg',
'pkgs': ['aptly', 'bzip2', 'cron'],
},
+ 'dependency': {
+ 'follow': {
+ 'suggests': false,
+ 'recommends': false,
+ 'all_variants': false,
+ 'source': false,
+ }
+ },
'home_dir': '/var/lib/aptly',
'root_dir': '/srv/aptly',
'secure': True,