Skip to content

Commit 62bd23b

Browse files
committed
Merge pull request 'fix: install openvox for turrisos with compatible version' (#178) from fix/install-openvox-for-turris into main
Reviewed-on: https://gitea.obmondo.com/EnableIT/Linuxaid-cli/pulls/178
2 parents 9d8acc2 + b789233 commit 62bd23b

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.goreleaser.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ builds:
5353
- arm64
5454
- arm
5555
goarm:
56+
- "6"
5657
- "7"
5758
flags:
5859
- -v
@@ -72,6 +73,7 @@ builds:
7273
- arm64
7374
- arm
7475
goarm:
76+
- "6"
7577
- "7"
7678
flags:
7779
- -v

constant/constants.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ const (
1515
ExternalFacterFile = "/etc/puppetlabs/facter/facts.d/new_installation.yaml"
1616
PuppetPrivKeyPath = "/etc/puppetlabs/puppet/ssl/private_keys"
1717

18+
// Openvox
19+
OpenvoxAgentVersionTurris = "7.37.2"
20+
1821
// Lock and Disabled
1922
AgentDisabledLockFile = "/opt/puppetlabs/puppet/cache/state/agent_disabled.lock"
2023
AgentRunningLockFile = "/opt/puppetlabs/puppet/cache/state/agent_catalog_run.lock"

helper/provisioner/provisioner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ func (s *Provisioner) provisionForSuse() error {
167167
// provisionForTurris installs puppet via gem on TurrisOS
168168
func (s *Provisioner) provisionForTurris() {
169169
s.webtee.RemoteLogObmondo([]string{"opkg update"}, s.certName)
170-
s.webtee.RemoteLogObmondo([]string{"opkg install ruby ruby-full ruby-gems"}, s.certName)
170+
s.webtee.RemoteLogObmondo([]string{"opkg install ruby ruby-stdlib ruby-dev ruby-gems"}, s.certName)
171171

172-
installCmd := []string{fmt.Sprintf("gem install puppet -v %s --no-document", constant.PuppetVersion)}
172+
installCmd := []string{fmt.Sprintf("gem install -v %s --no-document openvox", constant.OpenvoxAgentVersionTurris)}
173173
s.webtee.RemoteLogObmondo(installCmd, s.certName)
174174
}

0 commit comments

Comments
 (0)