Merge branch 'upstream/1.6' into debian/experimental

debian/aptly-api.default

@@ -1,2 +1,11 @@
-# Default settings for aptly-api
+# Default settings for aptly-api systemd service
+
+# bind to host:port
 LISTEN_ADDRESS='localhost:8080'
+
+# aptly options:
+#   -no-lock        allow aptly commands in parallel with api service (no global database lock, but lock per request)
+
+APTLY_OPTIONS="-no-lock"
+
+

debian/aptly-api.service

@@ -9,7 +9,8 @@ Group=aptly-api
 Environment=TERM=dumb
 WorkingDirectory=~
 EnvironmentFile=/etc/default/aptly-api
-ExecStart=/usr/bin/aptly api serve -config=/etc/aptly.conf -no-lock -listen=${LISTEN_ADDRESS}
+ExecStart=/usr/bin/aptly api serve -config=/etc/aptly.conf ${APTLY_OPTIONS} -listen=${LISTEN_ADDRESS}
+LimitNOFILE=32768
 
 [Install]
 WantedBy=multi-user.target

debian/control

@@ -88,7 +88,6 @@ Package: aptly
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, gpgv, gpg
 Suggests: graphviz
-Conflicts: gnupg1, gpgv1
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Swiss army knife for Debian repository management - main package
  It offers several features making it easy to manage Debian package