Skip to content

Commit 160d16d

Browse files
iofqneolynx
authored andcommitted
docs: Update JFrog Artifactory documentation in config
1 parent 4655f10 commit 160d16d

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

debian/aptly.conf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ filesystem_publish_endpoints:
202202
# aptly can be configured to publish repositories directly to JFrog Artifactory. First,
203203
# publishing endpoints should be described in the aptly configuration file.
204204
#
205+
# The destination Artifactory repo should be of the "generic" type, not "debian".
206+
#
205207
# In order to publish to JFrog, specify endpoint as `jfrog:endpoint-name:` before
206208
# publishing prefix on the command line, e.g.:
207209
#
@@ -214,10 +216,14 @@ jfrog_publish_endpoints:
214216
# url: "https://artifactory.example.com/artifactory/"
215217
# # Repository
216218
# repository: apt-local
217-
# # Username
219+
# # Jfrog credentials to authenticate to Artifactory. If not supplied, the
220+
# # environment variables `JFROG_USERNAME`, `JFROG_PASSWORD`, `JFROG_APIKEY`,
221+
# # and `JFROG_ACCESSTOKEN` can be used
222+
# # Authentication requires one of: user+pass, api key, or access token
218223
# username: admin
219-
# # Password
220224
# password: password
225+
# api_key: api_key
226+
# access_token: access_token
221227

222228
s3_publish_endpoints:
223229
# # Endpoint Name

man/aptly.1.ronn.tmpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ The legacy json configuration is still supported (and also supports comments):
360360
// aptly could be configured to publish repository directly to JFrog Artifactory. First,
361361
// endpoints should be described in aptly.conf:
362362
//
363+
// The destination Artifactory repo should be of the "generic" type, not "debian".
364+
// Authentication requires one of: user+pass, api key, or access token
365+
//
363366
// In order to publish to JFrog, specify endpoint as `jfrog:endpoint-name:` before
364367
// publishing prefix on the command line, e.g.:
365368
//
@@ -370,7 +373,9 @@ The legacy json configuration is still supported (and also supports comments):
370373
"url": "https://artifactory.example.com/artifactory/",
371374
"repository": "apt-local",
372375
"username": "admin",
373-
"password": "password"
376+
"password": "password",
377+
"api_key": "api_key",
378+
"access_token": "access_token"
374379
}
375380
}
376381

0 commit comments

Comments
 (0)