diff --git a/README.md b/README.md index 578a18f..55d1a73 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,9 @@ After having installed `provs-desktop.jar` (see prerequisites) execute: **target** can be: * `local` -* `user123:mypassword@myhost.com` - general format is: - +* remote, e.g. `user123:mypassword@myhost.com` - general format is: - + * be sure to have openssh-server installed + * add your preferred public key to known_hosts on the target machine * if password is omitted, then ssh-keys will be used for authentication * if password is omitted but option `-p` is provided, then the password will be prompted interactively @@ -75,7 +77,8 @@ provs-server.jar k3s local provs-server.jar k3s myuser@myhost.com # using ssh-authentication - alternatively use option -p for password authentication ``` -For the remote server please configure a config file (default file name: server-config.yaml) +For the remote server please configure a config file (default file name: server-config.yaml). +It has to be in the same folder where you execute the provs-server.jar command. ```yaml fqdn: "myhostname.com" node: diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt index 1095c33..edabfb9 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt @@ -11,7 +11,7 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFrom fun Prov.downloadGopassBridge() = task { - val version = "0.8.0" + val version = "0.9.0" val filename = "gopass_bridge-${version}-fx.xpi" val downloadDir = "${userHome()}Downloads/" @@ -25,10 +25,10 @@ fun Prov.downloadGopassBridge() = task { fun Prov.installGopassBridgeJsonApi() = task { // see https://github.com/gopasspw/gopass-jsonapi - val gopassBridgeVersion = "1.11.1" - val requiredGopassVersion = "1.12" - val filename = "gopass-jsonapi_${gopassBridgeVersion}_linux_amd64.deb" - val downloadUrl = "-L https://github.com/gopasspw/gopass-jsonapi/releases/download/v$gopassBridgeVersion/$filename" + val gopassJsonApiVersion = "1.14.3" + val requiredGopassVersion = "1.14.4" + val filename = "gopass-jsonapi_${gopassJsonApiVersion}_linux_amd64.deb" + val downloadUrl = "-L https://github.com/gopasspw/gopass-jsonapi/releases/download/v$gopassJsonApiVersion/$filename" val downloadDir = "${userHome()}Downloads" val installedJsonApiVersion = gopassJsonApiVersion()?.trim() @@ -55,13 +55,13 @@ fun Prov.installGopassBridgeJsonApi() = task { ) } } else { - if (installedJsonApiVersion.startsWith("gopass-jsonapi version " + gopassBridgeVersion)) { - addResultToEval(ProvResult(true, out = "Version $gopassBridgeVersion of gopass-jsonapi is already installed")) + if (installedJsonApiVersion.startsWith("gopass-jsonapi version " + gopassJsonApiVersion)) { + addResultToEval(ProvResult(true, out = "Version $gopassJsonApiVersion of gopass-jsonapi is already installed")) } else { addResultToEval( ProvResult( false, - err = "gopass-jsonapi (version $gopassBridgeVersion) cannot be installed as version $installedJsonApiVersion is already installed." + + err = "gopass-jsonapi (version $gopassJsonApiVersion) cannot be installed as version $installedJsonApiVersion is already installed." + " Upgrading gopass-jsonapi is currently not supported by provs." ) )