vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-07 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

fix json

Browse Source
This commit is contained in:
André Roth
2024-12-02 21:01:54 +01:00
parent ea80f6d49c
commit 09c56342d2
2 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/aptly.conf
Vendored
+41 -45
View File
@@ -3,11 +3,10 @@
// validate with: sed '/\/\//d' aptly.conf | json_pp // validate with: sed '/\/\//d' aptly.conf | json_pp
{ {
// General // Aptly Configuration File
/////////// ////////////////////////////
// Aptly storage directory // Aptly storage directory for:
// Directory for storing:
// - downloaded packages (`rootDir`/pool) // - downloaded packages (`rootDir`/pool)
// - database (`rootDir`/db) // - database (`rootDir`/db)
// - published repositories (`rootDir`/public) // - published repositories (`rootDir`/public)
@@ -167,13 +166,13 @@
// "test1": { // "test1": {
// // Directory for publishing // // Directory for publishing
// "rootDir": "/opt/srv/aptly_public", // "rootDir": "/opt/srv/aptly_public",
//
// // File Link Method for linking files from the internal pool to the published directory // // File Link Method for linking files from the internal pool to the published directory
// // * hardlink // // * hardlink
// // * symlink // // * symlink
// // * copy // // * copy
// "linkMethod": "hardlink", // "linkMethod": "hardlink",
//
// // File Copare Method for comparing existing links from the internal pool to the published directory // // File Copare Method for comparing existing links from the internal pool to the published directory
// // Only used when "linkMethod" is set to "copy" // // Only used when "linkMethod" is set to "copy"
// // * md5 (default: compare md5 sum) // // * md5 (default: compare md5 sum)
@@ -196,24 +195,24 @@
"S3PublishEndpoints": { "S3PublishEndpoints": {
// // Endpoint Name // // Endpoint Name
// "test": { // "test": {
//
// // Amazon region for S3 bucket // // Amazon region for S3 bucket
// "region": "us-east-1", // "region": "us-east-1",
//
// // Bucket name // // Bucket name
// "bucket": "test-bucket", // "bucket": "test-bucket",
//
// // Endpoint (optional) // // Endpoint (optional)
// // When using S3-compatible cloud storage, specify hostname of service endpoint here, // // When using S3-compatible cloud storage, specify hostname of service endpoint here,
// // region is ignored if endpoint is set (set region to some human-readable name) // // region is ignored if endpoint is set (set region to some human-readable name)
// // (should be left blank for real Amazon S3) // // (should be left blank for real Amazon S3)
// "endpoint": "", // "endpoint": "",
//
// // Prefix (optional) // // Prefix (optional)
// // publishing under specified prefix in the bucket, defaults to // // publishing under specified prefix in the bucket, defaults to
// // no prefix (bucket root) // // no prefix (bucket root)
// "prefix": "", // "prefix": "",
//
// // Default ACLs (optional) // // Default ACLs (optional)
// // assign ACL to published files (one of the canned ACLs in Amazon // // assign ACL to published files (one of the canned ACLs in Amazon
// // terminology). Useful values: `private` (default), `public-read` (public // // terminology). Useful values: `private` (default), `public-read` (public
@@ -221,24 +220,24 @@
// // HTTP endpoint (Amazon bucket should be configured for "website hosting"), // // HTTP endpoint (Amazon bucket should be configured for "website hosting"),
// // for private repositories special apt S3 transport is required. // // for private repositories special apt S3 transport is required.
// "acl": "private", // "acl": "private",
//
// // Credentials (optional) // // Credentials (optional)
// // Amazon credentials to access S3 bucket. If not supplied, // // Amazon credentials to access S3 bucket. If not supplied,
// // environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` // // environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
// // are used. // // are used.
// "awsAccessKeyID": "", // "awsAccessKeyID": "",
// "awsSecretAccessKey": "", // "awsSecretAccessKey": "",
//
// // Storage Class (optional) // // Storage Class (optional)
// // Amazon S3 storage class, defaults to `STANDARD`. Other values // // Amazon S3 storage class, defaults to `STANDARD`. Other values
// // available: `REDUCED_REDUNDANCY` (lower price, lower redundancy) // // available: `REDUCED_REDUNDANCY` (lower price, lower redundancy)
// "storageClass": "STANDARD", // "storageClass": "STANDARD",
//
// // Encryption Method (optional) // // Encryption Method (optional)
// // Server-side encryption method, defaults to none. Currently // // Server-side encryption method, defaults to none. Currently
// // the only available encryption method is `AES256` // // the only available encryption method is `AES256`
// "encryptionMethod": "none", // "encryptionMethod": "none",
//
// // Plus Workaround (optional) // // Plus Workaround (optional)
// // Workaround misbehavior in apt and Amazon S3 for files with `+` in filename by // // Workaround misbehavior in apt and Amazon S3 for files with `+` in filename by
// // creating two copies of package files with `+` in filename: one original // // creating two copies of package files with `+` in filename: one original
@@ -247,22 +246,22 @@
// // would be stored twice. aptly might not cleanup files with spaces when published // // would be stored twice. aptly might not cleanup files with spaces when published
// // repository is dropped or updated (switched) to new version of repository (snapshot) // // repository is dropped or updated (switched) to new version of repository (snapshot)
// "plusWorkaround": false, // "plusWorkaround": false,
//
// // Disable MultiDel (optional) // // Disable MultiDel (optional)
// // For S3-compatible cloud storages which do not support `MultiDel` S3 API, // // For S3-compatible cloud storages which do not support `MultiDel` S3 API,
// // enable this setting (file deletion would be slower with this setting enabled) // // enable this setting (file deletion would be slower with this setting enabled)
// "disableMultiDel": false, // "disableMultiDel": false,
//
// // ForceSig2 (optional) // // ForceSig2 (optional)
// // Disable Signature V4 support, useful with non-AWS S3-compatible object stores // // Disable Signature V4 support, useful with non-AWS S3-compatible object stores
// // which do not support SigV4, shouldn't be enabled for AWS // // which do not support SigV4, shouldn't be enabled for AWS
// "forceSigV2": false, // "forceSigV2": false,
//
// // ForceVirtualHostedStyle (optional) // // ForceVirtualHostedStyle (optional)
// // Disable path style visit, useful with non-AWS S3-compatible object stores // // Disable path style visit, useful with non-AWS S3-compatible object stores
// // which only support virtual hosted style // // which only support virtual hosted style
// "forceVirtualHostedStyle": false, // "forceVirtualHostedStyle": false,
//
// // Debug (optional) // // Debug (optional)
// // Enables detailed request/response dump for each S3 operation // // Enables detailed request/response dump for each S3 operation
// "debug": false // "debug": false
@@ -281,12 +280,12 @@
// `aptly publish snapshot jessie-main swift:test:` // `aptly publish snapshot jessie-main swift:test:`
// //
"SwiftPublishEndpoints": { "SwiftPublishEndpoints": {
// // Endpoint Name // Endpoint Name
// "test": { // "test": {
//
// // Container Name // // Container Name
// "container": "container1", // "container": "taylor1",
//
// // Prefix (optional) // // Prefix (optional)
// // Publish under specified prefix in the container, defaults to no prefix (container root) // // Publish under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // "prefix": "",
@@ -316,19 +315,19 @@
"AzurePublishEndpoints": { "AzurePublishEndpoints": {
// // Endpoint Name // // Endpoint Name
// "test": { // "test": {
//
// // Container Name // // Container Name
// "container": "container1", // "container": "container1",
//
// // Prefix (optional) // // Prefix (optional)
// // Publishing under specified prefix in the container, defaults to no prefix (container root) // // Publishing under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // "prefix": "",
//
// // Credentials // // Credentials
// // Azure storage account access key to access blob storage // // Azure storage account access key to access blob storage
// "accountName": "", // "accountName": "",
// "accountKey": "", // "accountKey": "",
//
// // Endpoint URL // // Endpoint URL
// // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string // // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string
// // defaults to "https://<accountName>.blob.core.windows.net" // // defaults to "https://<accountName>.blob.core.windows.net"
@@ -350,24 +349,21 @@
// // Azure Azure Blob Storage Pool // // Azure Azure Blob Storage Pool
// "type": "azure", // "type": "azure",
// "azure": { // "container": "pool1",
// // Container Name
// "container": "pool1", // // Prefix (optional)
// // // Publishing under specified prefix in the container, defaults to no prefix (container root)
// // Prefix (optional) // "prefix": "",
// // Publishing under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // // Credentials
// // // Azure storage account access key to access blob storage
// // Credentials // "accountName": "",
// // Azure storage account access key to access blob storage // "accountKey": "",
// "accountName": "",
// "accountKey": "", // // Endpoint URL
// // // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string
// // Endpoint URL // // defaults to "https://<accountName>.blob.core.windows.net"
// // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string // "endpoint": ""
// // defaults to "https://<accountName>.blob.core.windows.net"
// "endpoint": ""
// }
} }
// End of config // End of config
system/t02_config/CreateConfigTest_gold
+41 -45
View File
@@ -3,11 +3,10 @@
// validate with: sed '/\/\//d' aptly.conf | json_pp // validate with: sed '/\/\//d' aptly.conf | json_pp
{ {
// General // Aptly Configuration File
/////////// ////////////////////////////
// Aptly storage directory // Aptly storage directory for:
// Directory for storing:
// - downloaded packages (`rootDir`/pool) // - downloaded packages (`rootDir`/pool)
// - database (`rootDir`/db) // - database (`rootDir`/db)
// - published repositories (`rootDir`/public) // - published repositories (`rootDir`/public)
@@ -167,13 +166,13 @@
// "test1": { // "test1": {
// // Directory for publishing // // Directory for publishing
// "rootDir": "/opt/srv/aptly_public", // "rootDir": "/opt/srv/aptly_public",
//
// // File Link Method for linking files from the internal pool to the published directory // // File Link Method for linking files from the internal pool to the published directory
// // * hardlink // // * hardlink
// // * symlink // // * symlink
// // * copy // // * copy
// "linkMethod": "hardlink", // "linkMethod": "hardlink",
//
// // File Copare Method for comparing existing links from the internal pool to the published directory // // File Copare Method for comparing existing links from the internal pool to the published directory
// // Only used when "linkMethod" is set to "copy" // // Only used when "linkMethod" is set to "copy"
// // * md5 (default: compare md5 sum) // // * md5 (default: compare md5 sum)
@@ -196,24 +195,24 @@
"S3PublishEndpoints": { "S3PublishEndpoints": {
// // Endpoint Name // // Endpoint Name
// "test": { // "test": {
//
// // Amazon region for S3 bucket // // Amazon region for S3 bucket
// "region": "us-east-1", // "region": "us-east-1",
//
// // Bucket name // // Bucket name
// "bucket": "test-bucket", // "bucket": "test-bucket",
//
// // Endpoint (optional) // // Endpoint (optional)
// // When using S3-compatible cloud storage, specify hostname of service endpoint here, // // When using S3-compatible cloud storage, specify hostname of service endpoint here,
// // region is ignored if endpoint is set (set region to some human-readable name) // // region is ignored if endpoint is set (set region to some human-readable name)
// // (should be left blank for real Amazon S3) // // (should be left blank for real Amazon S3)
// "endpoint": "", // "endpoint": "",
//
// // Prefix (optional) // // Prefix (optional)
// // publishing under specified prefix in the bucket, defaults to // // publishing under specified prefix in the bucket, defaults to
// // no prefix (bucket root) // // no prefix (bucket root)
// "prefix": "", // "prefix": "",
//
// // Default ACLs (optional) // // Default ACLs (optional)
// // assign ACL to published files (one of the canned ACLs in Amazon // // assign ACL to published files (one of the canned ACLs in Amazon
// // terminology). Useful values: `private` (default), `public-read` (public // // terminology). Useful values: `private` (default), `public-read` (public
@@ -221,24 +220,24 @@
// // HTTP endpoint (Amazon bucket should be configured for "website hosting"), // // HTTP endpoint (Amazon bucket should be configured for "website hosting"),
// // for private repositories special apt S3 transport is required. // // for private repositories special apt S3 transport is required.
// "acl": "private", // "acl": "private",
//
// // Credentials (optional) // // Credentials (optional)
// // Amazon credentials to access S3 bucket. If not supplied, // // Amazon credentials to access S3 bucket. If not supplied,
// // environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` // // environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
// // are used. // // are used.
// "awsAccessKeyID": "", // "awsAccessKeyID": "",
// "awsSecretAccessKey": "", // "awsSecretAccessKey": "",
//
// // Storage Class (optional) // // Storage Class (optional)
// // Amazon S3 storage class, defaults to `STANDARD`. Other values // // Amazon S3 storage class, defaults to `STANDARD`. Other values
// // available: `REDUCED_REDUNDANCY` (lower price, lower redundancy) // // available: `REDUCED_REDUNDANCY` (lower price, lower redundancy)
// "storageClass": "STANDARD", // "storageClass": "STANDARD",
//
// // Encryption Method (optional) // // Encryption Method (optional)
// // Server-side encryption method, defaults to none. Currently // // Server-side encryption method, defaults to none. Currently
// // the only available encryption method is `AES256` // // the only available encryption method is `AES256`
// "encryptionMethod": "none", // "encryptionMethod": "none",
//
// // Plus Workaround (optional) // // Plus Workaround (optional)
// // Workaround misbehavior in apt and Amazon S3 for files with `+` in filename by // // Workaround misbehavior in apt and Amazon S3 for files with `+` in filename by
// // creating two copies of package files with `+` in filename: one original // // creating two copies of package files with `+` in filename: one original
@@ -247,22 +246,22 @@
// // would be stored twice. aptly might not cleanup files with spaces when published // // would be stored twice. aptly might not cleanup files with spaces when published
// // repository is dropped or updated (switched) to new version of repository (snapshot) // // repository is dropped or updated (switched) to new version of repository (snapshot)
// "plusWorkaround": false, // "plusWorkaround": false,
//
// // Disable MultiDel (optional) // // Disable MultiDel (optional)
// // For S3-compatible cloud storages which do not support `MultiDel` S3 API, // // For S3-compatible cloud storages which do not support `MultiDel` S3 API,
// // enable this setting (file deletion would be slower with this setting enabled) // // enable this setting (file deletion would be slower with this setting enabled)
// "disableMultiDel": false, // "disableMultiDel": false,
//
// // ForceSig2 (optional) // // ForceSig2 (optional)
// // Disable Signature V4 support, useful with non-AWS S3-compatible object stores // // Disable Signature V4 support, useful with non-AWS S3-compatible object stores
// // which do not support SigV4, shouldn't be enabled for AWS // // which do not support SigV4, shouldn't be enabled for AWS
// "forceSigV2": false, // "forceSigV2": false,
//
// // ForceVirtualHostedStyle (optional) // // ForceVirtualHostedStyle (optional)
// // Disable path style visit, useful with non-AWS S3-compatible object stores // // Disable path style visit, useful with non-AWS S3-compatible object stores
// // which only support virtual hosted style // // which only support virtual hosted style
// "forceVirtualHostedStyle": false, // "forceVirtualHostedStyle": false,
//
// // Debug (optional) // // Debug (optional)
// // Enables detailed request/response dump for each S3 operation // // Enables detailed request/response dump for each S3 operation
// "debug": false // "debug": false
@@ -281,12 +280,12 @@
// `aptly publish snapshot jessie-main swift:test:` // `aptly publish snapshot jessie-main swift:test:`
// //
"SwiftPublishEndpoints": { "SwiftPublishEndpoints": {
// // Endpoint Name // Endpoint Name
// "test": { // "test": {
//
// // Container Name // // Container Name
// "container": "container1", // "container": "taylor1",
//
// // Prefix (optional) // // Prefix (optional)
// // Publish under specified prefix in the container, defaults to no prefix (container root) // // Publish under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // "prefix": "",
@@ -316,19 +315,19 @@
"AzurePublishEndpoints": { "AzurePublishEndpoints": {
// // Endpoint Name // // Endpoint Name
// "test": { // "test": {
//
// // Container Name // // Container Name
// "container": "container1", // "container": "container1",
//
// // Prefix (optional) // // Prefix (optional)
// // Publishing under specified prefix in the container, defaults to no prefix (container root) // // Publishing under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // "prefix": "",
//
// // Credentials // // Credentials
// // Azure storage account access key to access blob storage // // Azure storage account access key to access blob storage
// "accountName": "", // "accountName": "",
// "accountKey": "", // "accountKey": "",
//
// // Endpoint URL // // Endpoint URL
// // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string // // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string
// // defaults to "https://<accountName>.blob.core.windows.net" // // defaults to "https://<accountName>.blob.core.windows.net"
@@ -350,24 +349,21 @@
// // Azure Azure Blob Storage Pool // // Azure Azure Blob Storage Pool
// "type": "azure", // "type": "azure",
// "azure": { // "container": "pool1",
// // Container Name
// "container": "pool1", // // Prefix (optional)
// // // Publishing under specified prefix in the container, defaults to no prefix (container root)
// // Prefix (optional) // "prefix": "",
// // Publishing under specified prefix in the container, defaults to no prefix (container root)
// "prefix": "", // // Credentials
// // // Azure storage account access key to access blob storage
// // Credentials // "accountName": "",
// // Azure storage account access key to access blob storage // "accountKey": "",
// "accountName": "",
// "accountKey": "", // // Endpoint URL
// // // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string
// // Endpoint URL // // defaults to "https://<accountName>.blob.core.windows.net"
// // See: Azure documentation https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string // "endpoint": ""
// // defaults to "https://<accountName>.blob.core.windows.net"
// "endpoint": ""
// }
} }
// End of config // End of config