diff --git a/debian/aptly.conf b/debian/aptly.conf index 98e75bce..043b46eb 100644 --- a/debian/aptly.conf +++ b/debian/aptly.conf @@ -202,6 +202,8 @@ filesystem_publish_endpoints: # aptly can be configured to publish repositories directly to JFrog Artifactory. First, # publishing endpoints should be described in the aptly configuration file. # +# The destination Artifactory repo should be of the "generic" type, not "debian". +# # In order to publish to JFrog, specify endpoint as `jfrog:endpoint-name:` before # publishing prefix on the command line, e.g.: # @@ -214,10 +216,14 @@ jfrog_publish_endpoints: # url: "https://artifactory.example.com/artifactory/" # # Repository # repository: apt-local - # # Username + # # Jfrog credentials to authenticate to Artifactory. If not supplied, the + # # environment variables `JFROG_USERNAME`, `JFROG_PASSWORD`, `JFROG_APIKEY`, + # # and `JFROG_ACCESSTOKEN` can be used + # # Authentication requires one of: user+pass, api key, or access token # username: admin - # # Password # password: password + # api_key: api_key + # access_token: access_token s3_publish_endpoints: # # Endpoint Name diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index acfcc612..2119e40a 100644 --- a/man/aptly.1.ronn.tmpl +++ b/man/aptly.1.ronn.tmpl @@ -360,6 +360,9 @@ The legacy json configuration is still supported (and also supports comments): // aptly could be configured to publish repository directly to JFrog Artifactory. First, // endpoints should be described in aptly.conf: // + // The destination Artifactory repo should be of the "generic" type, not "debian". + // Authentication requires one of: user+pass, api key, or access token + // // In order to publish to JFrog, specify endpoint as `jfrog:endpoint-name:` before // publishing prefix on the command line, e.g.: // @@ -370,7 +373,9 @@ The legacy json configuration is still supported (and also supports comments): "url": "https://artifactory.example.com/artifactory/", "repository": "apt-local", "username": "admin", - "password": "password" + "password": "password", + "api_key": "api_key", + "access_token": "access_token" } }