meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases15 Packages Wiki Activity

[skip ci] replace deprecated method by checkPackage

Browse source
This commit is contained in:
ansgarz 2025-02-21 11:38:29 +01:00
parent e1cbe57dad
commit ad6c761e7a
4 changed files with 8 additions and 8 deletions
src/main/kotlin/org/domaindrivenarchitecture/provs
desktop/infrastructure
VSCode.ktZim.kt
server/infrastructure
Ssh.kt
syspec/infrastructure
Verification.kt

4
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCode.kt
View file

@ -3,7 +3,7 @@ package org.domaindrivenarchitecture.provs.desktop.infrastructure
import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.checkPackage
fun Prov.installVSCode(vararg options: String) = task { fun Prov.installVSCode(vararg options: String) = task {
@ -34,7 +34,7 @@ private fun Prov.installVSCodePrerequisites() = task {
@Suppress("unused") // only required for installation of vscode via apt @Suppress("unused") // only required for installation of vscode via apt
private fun Prov.installVSCodeWithApt() = task { private fun Prov.installVSCodeWithApt() = task {
val packageName = "code" val packageName = "code"
if (!isPackageInstalled(packageName)) { if (!checkPackage(packageName)) {
// see https://code.visualstudio.com/docs/setup/linux // see https://code.visualstudio.com/docs/setup/linux
// alternatively install with snapd (but this cannot be tested within docker as snapd within docker is not working/supported) // alternatively install with snapd (but this cannot be tested within docker as snapd within docker is not working/supported)
sh(""" sh("""

4
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Zim.kt
View file

@ -4,11 +4,11 @@ import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.checkPackage
fun Prov.installZimWiki() = task { fun Prov.installZimWiki() = task {
if (isPackageInstalled("zim")) { if (checkPackage("zim")) {
ProvResult(true, out = "zim already installed.") ProvResult(true, out = "zim already installed.")
} else { } else {
aptInstallFromPpa("jaap.karssenberg", "zim", "zim") aptInstallFromPpa("jaap.karssenberg", "zim", "zim")

4
src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/Ssh.kt
View file

@ -4,7 +4,7 @@ import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkFile import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkFile
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFileFromResource import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFileFromResource
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.checkPackage
val pathSshConfig = "/etc/ssh/ssh_config" val pathSshConfig = "/etc/ssh/ssh_config"
val pathSshdConfig = "/etc/ssh/sshd_config" val pathSshdConfig = "/etc/ssh/sshd_config"
@ -25,7 +25,7 @@ fun Prov.isSshdHardeningConfigExisting(): Boolean {
} }
fun Prov.configureSsh() = task { fun Prov.configureSsh() = task {
if(isSshdConfigExisting() && isSshConfigExisting() && !isSshdHardeningConfigExisting() && isPackageInstalled(packageNameSshServer)) { if(isSshdConfigExisting() && isSshConfigExisting() && !isSshdHardeningConfigExisting() && checkPackage(packageNameSshServer)) {
createFileFromResource( createFileFromResource(
pathSshConfig, pathSshConfig,
"ssh_config", "ssh_config",

4
src/main/kotlin/org/domaindrivenarchitecture/provs/syspec/infrastructure/Verification.kt
View file

@ -4,7 +4,7 @@ import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkDir import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkDir
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkFile import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.checkFile
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.checkPackage
import org.domaindrivenarchitecture.provs.syspec.domain.* import org.domaindrivenarchitecture.provs.syspec.domain.*
import java.text.ParseException import java.text.ParseException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@ -72,7 +72,7 @@ fun Prov.verify(hostspec: HostSpec) {
} }
fun Prov.verify(pkg: PackageSpec) { fun Prov.verify(pkg: PackageSpec) {
val res = isPackageInstalled(pkg.name) val res = checkPackage(pkg.name)
verify(res == pkg.installed, "Package [${pkg.name}] is ${res.falseToNot()}installed.") verify(res == pkg.installed, "Package [${pkg.name}] is ${res.falseToNot()}installed.")
} }