Commit 74d893ee authored by Rene Hadler's avatar Rene Hadler

Move puppet install to prevent debian 10 lsb_release bug with puppet

parent 93f7ba1e
...@@ -870,6 +870,14 @@ class Installer(): ...@@ -870,6 +870,14 @@ class Installer():
run_cmd('chmod +x /usr/lib/nagios/plugins/idrac_2.2rc4.py') run_cmd('chmod +x /usr/lib/nagios/plugins/idrac_2.2rc4.py')
file_append("/etc/nagios/nrpe.cfg", "command[check_openmanage]=/usr/lib/nagios/plugins/idrac_2.2rc4 -H 10.10.10.10 -v 2c -c public") file_append("/etc/nagios/nrpe.cfg", "command[check_openmanage]=/usr/lib/nagios/plugins/idrac_2.2rc4 -H 10.10.10.10 -v 2c -c public")
# Install puppet
if self.puppet == "generic":
run_cmd('wget -O /tmp/install_puppet.sh https://git.styrion.net/iteas/iteas-tools/raw/master/puppet/proxmox_mit_puppet.sh && chmod +x /tmp/install_puppet.sh', argShell=True)
run_cmd('echo "\n" | /tmp/install_puppet.sh', argShell=True)
elif self.puppet == "proxmox-desktop":
run_cmd('wget -O /tmp/install_puppet.sh https://git.styrion.net/iteas/iteas-tools/raw/master/puppet/proxmox_mit_puppet.sh && chmod +x /tmp/install_puppet.sh', argShell=True)
run_cmd('echo "\n" | /tmp/install_puppet.sh', argShell=True)
# Desktop Konfiguration # Desktop Konfiguration
if self.desktop == "plasma-light": if self.desktop == "plasma-light":
run_cmd('apt install -y lm-sensors curl nomachine firefox-esr firefox-esr-l10n-de virt-viewer kde-plasma-desktop qapt-deb-installer filelight khelpcenter mpv curl task-german-kde-desktop task-german hunspell-de-at hunspell-de-ch hyphen-de mythes-de-ch mythes-de git') run_cmd('apt install -y lm-sensors curl nomachine firefox-esr firefox-esr-l10n-de virt-viewer kde-plasma-desktop qapt-deb-installer filelight khelpcenter mpv curl task-german-kde-desktop task-german hunspell-de-at hunspell-de-ch hyphen-de mythes-de-ch mythes-de git')
...@@ -905,14 +913,6 @@ class Installer(): ...@@ -905,14 +913,6 @@ class Installer():
elif self.desktop == "i3": elif self.desktop == "i3":
pass pass
# Install puppet
if self.puppet == "generic":
run_cmd('wget -O /tmp/install_puppet.sh https://git.styrion.net/iteas/iteas-tools/raw/master/puppet/proxmox_mit_puppet.sh && chmod +x /tmp/install_puppet.sh', argShell=True)
run_cmd('echo "\n" | /tmp/install_puppet.sh', argShell=True)
elif self.puppet == "proxmox-desktop":
run_cmd('wget -O /tmp/install_puppet.sh https://git.styrion.net/iteas/iteas-tools/raw/master/puppet/proxmox_mit_puppet.sh && chmod +x /tmp/install_puppet.sh', argShell=True)
run_cmd('echo "\n" | /tmp/install_puppet.sh', argShell=True)
run_cmd('apt-get install -f; apt autoremove --purge -y;') run_cmd('apt-get install -f; apt autoremove --purge -y;')
if self.proxy == True: if self.proxy == True:
run_cmd('rm /etc/apt/apt.conf.d/01proxy') run_cmd('rm /etc/apt/apt.conf.d/01proxy')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment