wip apple+windows

default.nix

@@ -32,6 +32,13 @@ in {
     i386 = build_debug_and_release "i686-unknown-linux-musl";
     arm64 = build_debug_and_release "aarch64-unknown-linux-musl";
     arm = build_debug_and_release "armv6l-unknown-linux-musleabihf";
+    win = {
+      amd64 = build_debug_and_release "x86_64-w64-mingw32";
+    };
+    apple = {
+      arm64 = build_debug_and_release "aarch64-apple-darwin";
+      amd64 = build_debug_and_release "x86_64-apple-darwin";
+    };
   };
   test = {
     amd64 = test (compile {

doc/book/connect/cli.md

@@ -202,11 +202,56 @@ See its usage output for other commands available.
 ## Cyberduck & duck {#cyberduck}
 
 Both Cyberduck (the GUI) and duck (the CLI) have a concept of "Connection Profiles" that contain some presets for a specific provider.
+We wrote the following connection profile for Garage:
 
-Within Cyberduck, a
-[Garage connection profile](https://docs.cyberduck.io/protocols/s3/garage/) is
-available within the `Preferences -> Profiles` section. This can enabled and
-then connections to Garage may be configured.
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Protocol</key>
+        <string>s3</string>
+        <key>Vendor</key>
+        <string>garage</string>
+        <key>Scheme</key>
+        <string>https</string>
+        <key>Description</key>
+        <string>GarageS3</string>
+        <key>Default Hostname</key>
+        <string>127.0.0.1</string>
+        <key>Default Port</key>
+        <string>4443</string>
+        <key>Hostname Configurable</key>
+        <false/>
+        <key>Port Configurable</key>
+        <false/>
+        <key>Username Configurable</key>
+        <true/>
+        <key>Username Placeholder</key>
+        <string>Access Key ID (GK...)</string>
+        <key>Password Placeholder</key>
+        <string>Secret Key</string>
+        <key>Properties</key>
+        <array>
+            <string>s3service.disable-dns-buckets=true</string>
+        </array>
+        <key>Region</key>
+        <string>garage</string>
+        <key>Regions</key>
+        <array>
+            <string>garage</string>
+        </array>
+    </dict>
+</plist>
+```
+
+*Note: If your garage instance is configured with vhost access style, you can remove `s3service.disable-dns-buckets=true`.*
+
+### Instructions for the GUI
+
+Copy the connection profile, and save it anywhere as `garage.cyberduckprofile`.
+Then find this file with your file explorer and double click on it: Cyberduck will open a connection wizard for this profile.
+Simply follow the wizard and you should be done!
 
 ### Instuctions for the CLI
 

doc/book/quick-start/_index.md

@@ -290,13 +290,13 @@ sourcing the right file.*
 aws s3 ls
 
 # list objects of a bucket
-aws s3 ls s3://nextcloud-bucket
+aws s3 ls s3://my_files
 
 # copy from your filesystem to garage
-aws s3 cp /proc/cpuinfo s3://nextcloud-bucket/cpuinfo.txt
+aws s3 cp /proc/cpuinfo s3://my_files/cpuinfo.txt
 
 # copy from garage to your filesystem
-aws s3 cp s3://nextcloud-bucket/cpuinfo.txt /tmp/cpuinfo.txt
+aws s3 cp s3/my_files/cpuinfo.txt /tmp/cpuinfo.txt
 ```
 
 Note that you can use `awscli` for more advanced operations like

script/helm/garage/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.8.2"
+appVersion: "v0.7.2.1"

src/model/bucket_table.rs

@@ -57,56 +57,8 @@ mod v08 {
 	pub struct WebsiteConfig {
 		pub index_document: String,
 		pub error_document: Option<String>,
-        pub redirect_all_requests_to: Option<RedirectTarget>,
-        pub routing_rules: Vec<RoutingRule>,
 	}
 
-	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
-    pub struct RedirectTarget {
-        /// Name of the host where requests are redirected.
-        pub hostname: String,
-        /// Protocol to use when redirecting requests. The default is the protocol that is used in the original request.
-        /// Valid Values: http | https 
-        pub protocol: Option<String>,
-    }
-
-	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
-    pub struct RoutingRule {
-        /// A container for describing a condition that must be met for the specified redirect to apply. For example, 1. If request is for pages in the /docs folder, redirect to the /documents folder. 2. If request results in HTTP error 4xx, redirect request to another host where you might process the error.
-        pub condition: Option<RoutingCondition>,
-        /// Container for redirect information. You can redirect requests to another host, to another page, or with another protocol. In the event of an error, you can specify a different error code to return.
-        pub redirect: RedirectRule,
-    }
-
-	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
-    pub struct RoutingCondition {
-        /// The HTTP error code when the redirect is applied. In the event of an error, if the error code equals this value, then the specified redirect is applied. Required when parent element Condition is specified and sibling KeyPrefixEquals is not specified. If both are specified, then both must be true for the redirect to be applied.
-        pub http_error_code_returned_equals: Option<u16>,
-        /// The object key name prefix when the redirect is applied. For example, to redirect requests for ExamplePage.html, the key prefix will be ExamplePage.html. To redirect request for all pages with the prefix docs/, the key prefix will be /docs, which identifies all objects in the docs/ folder. Required when the parent element Condition is specified and sibling HttpErrorCodeReturnedEquals is not specified. If both conditions are specified, both must be true for the redirect to be applied.
-        pub key_prefix_equals: Option<String>,
-    }
-
-	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
-    pub struct RedirectRule {
-        /// The hostname to use in the redirect request.
-        pub hostname: Option<String>,
-
-        /// The HTTP redirect code to use on the response. Not required if one of the siblings is present.
-        pub http_redirect_code: Option<u16>,
-
-        /// Protocol to use when redirecting requests. The default is the protocol that is used in the original request.
-        /// Valid Values: http | https 
-        pub protocol: Option<String>,
- 
-        /// The object key prefix to use in the redirect request. For example, to redirect requests for all pages with prefix docs/ (objects in the docs/ folder) to documents/, you can set a condition block with KeyPrefixEquals set to docs/ and in the Redirect set ReplaceKeyPrefixWith to /documents. Not required if one of the siblings is present. Can be present only if ReplaceKeyWith is not provided.
-        pub replace_key_prefix_with: Option<String>,
-
-        /// The specific object key to use in the redirect request. For example, redirect request to error.html. Not required if one of the siblings is present. Can be present only if ReplaceKeyPrefixWith is not provided.
-        pub replace_key_with: Option<String>,
-
-
-    }
-
 	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 	pub struct CorsRule {
 		pub id: Option<String>,