Skip to content
This repository was archived by the owner on Jun 14, 2022. It is now read-only.

Commit aaea23a

Browse files
author
David Vogt
committed
Removed a lot of "amoothei" labels and replaced by virtesk
Some of those unfinished changes prevented builds from happening correctly.
1 parent 1ec3e96 commit aaea23a

19 files changed

+82
-82
lines changed

‎sample_config/tc_rollout.ks

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ fi
248248
249249
#
250250
# Setup SSH-Keys for Root
251-
# Details: see docs/amoothei-tc-tools.rst
251+
# Details: see docs/virtesk-tc-tools.rst
252252
#
253253
254254
mkdir /root/.ssh
@@ -343,7 +343,7 @@ cat > /etc/sudoers.d/vdiclient << 'EOF'
343343
# User vdiclient can start all programs as root
344344
# tty is not required
345345
#
346-
# Needed for amoothei-vdi
346+
# Needed for virtesk-vdi
347347
vdiclient ALL=(ALL) NOPASSWD: ALL
348348
Defaults:vdiclient !requiretty
349349
EOF
@@ -582,7 +582,7 @@ if [[ $REBOOT_TARGET_ACTIVE -eq 0 ]]; then
582582
logger -s -t vmshutdown "Rebooting ==> NOT Running VM shutdown code..."
583583
elif [[ $HALT_TARGET_ACTIVE -eq 0 || $POWEROFF_TARGET_ACTIVE -eq 0 ]]; then
584584
logger -s -t vmshutdown "Running VM shutdown code..."
585-
/opt/amoothei-tc-connectspice/amoothei-tc-connectspice-shutdown-vm --config /etc/connect_spice_client/connect_spice_client.conf
585+
/opt/virtesk-tc-connectspice/virtesk-tc-connectspice-shutdown-vm --config /etc/connect_spice_client/connect_spice_client.conf
586586
else
587587
logger -s -t vmshutdown "Dont know what to do ==> NOT Running VM shutdown code..."
588588
fi
@@ -763,7 +763,7 @@ useradd -G wheel,audio,video,floppy vdiclient
763763
# VDI software installation
764764
#
765765
766-
echo Installing amoothei vdi thinclient software...
766+
echo Installing virtesk vdi thinclient software...
767767
cd /home/vdiclient
768768
mkdir logs
769769
@@ -777,7 +777,7 @@ echo wget result: $?
777777
tar -C /opt -xvzf $RELEASE.tar.gz
778778
779779
cat > /etc/profile.d/connect_spice_client_path.sh << 'EOF'
780-
pathmunge /opt/amoothei-tc-connectspice after
780+
pathmunge /opt/virtesk-tc-connectspice after
781781
EOF
782782
783783
# Remote-Viewer settings...
@@ -855,7 +855,7 @@ pacmd load-module module-switch-on-connect
855855
856856
# starting VDI software
857857
858-
amoothei-tc-connectspice-main --config /etc/connect_spice_client/connect_spice_client.conf &
858+
virtesk-tc-connectspice-main --config /etc/connect_spice_client/connect_spice_client.conf &
859859
860860
# uncomment for debugging purposes...
861861
# xterm &

‎sample_config/virtesk-tc-tools.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Configuration for amoothei-tc-tools.
1+
# Configuration for virtesk-tc-tools.
22

33
# Documentation:
4-
# * see doc/amoothei-tc-tools.rst
4+
# * see doc/virtesk-tc-tools.rst
55

66
# DEVELOPER_MODE=0 =====> quiet mode
77
# DEVELOPER_MODE=1 =====> verbose debug messages
@@ -11,7 +11,7 @@ DEVELOPER_MODE=0
1111
TC_DOMAIN=myorganization.mydomain
1212

1313
# SSH options for tc_ssh
14-
SSH_GLOBAL_OPTS="-q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=4 -i /etc/amoothei-vdi/amoothei-thinclient-ssh-private-key-id_rsa"
14+
SSH_GLOBAL_OPTS="-q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=4 -i /etc/virtesk-vdi/virtesk-thinclient-ssh-private-key-id_rsa"
1515

1616
# Commands to run on a thinclient in order
1717
# to re-install itself using kexec and kickstart

‎sample_config/virtesk-vm-rollout.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
[logging]
2121
config_file=logging.conf
22-
log_file=/var/log/amoothei-vdi/amoothei-virtroom.log
22+
log_file=/var/log/virtesk-vdi/virtesk-virtroom.log
2323

2424
# ADJUST: everything.
2525
[room test01]
@@ -44,8 +44,8 @@ log_file=/var/log/amoothei-vdi/amoothei-virtroom.log
4444
usb = enabled
4545
rollout_startvm = True
4646
reset_startvm = Always
47-
snapshot_description = "Automatic snapshot after amoothei-vmrollout, IP=${ip}/${netmask_as_suffix}, scripttime=${scripttime}"
48-
reset_to_snapshot_regex = "Automatic snapshot after amoothei-vmrollout, .*"
47+
snapshot_description = "Automatic snapshot after virtesk-vmrollout, IP=${ip}/${netmask_as_suffix}, scripttime=${scripttime}"
48+
reset_to_snapshot_regex = "Automatic snapshot after virtesk-vmrollout, .*"
4949
stateless = False
5050

5151
[[student_vms]]
@@ -69,7 +69,7 @@ log_file=/var/log/amoothei-vdi/amoothei-virtroom.log
6969
usb = enabled
7070
rollout_startvm = True
7171
reset_startvm = Auto
72-
snapshot_description = "Automatic snapshot after amoothei-vmrollout, IP=${ip}/${netmask_as_suffix}, scripttime=${scripttime}"
73-
reset_to_snapshot_regex = "Automatic snapshot after amoothei-vmrollout, .*"
72+
snapshot_description = "Automatic snapshot after virtesk-vmrollout, IP=${ip}/${netmask_as_suffix}, scripttime=${scripttime}"
73+
reset_to_snapshot_regex = "Automatic snapshot after virtesk-vmrollout, .*"
7474
stateless = False
7575

‎virtesk-tc-connectspice/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ clean:
99
# mv -f /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-new.tar.gz /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-dev.tar.gz
1010

1111
release: clean
12-
tar --transform 's,^,amoothei-tc-connectspice/,S' -czf /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-new.tar.gz *.py amoothei-tc-connectspice-shutdown-vm amoothei-tc-connectspice-main
12+
tar --transform 's,^,virtesk-tc-connectspice/,S' -czf /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-new.tar.gz *.py virtesk-tc-connectspice-shutdown-vm virtesk-tc-connectspice-main
1313
echo mv -f /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-new.tar.gz /var/www/mirror/private/thinclients/thinclient-software/connect_spice_client-dev.tar.gz
1414

1515
flake8:
16-
flake8 --doctests -j auto --ignore=E221,E222,E251,E272,E241,E203 *.py amoothei-tc-connectspice-*
16+
flake8 --doctests -j auto --ignore=E221,E222,E251,E272,E241,E203 *.py virtesk-tc-connectspice-*
1717
flake8-strict:
18-
flake8 --doctests -j auto *.py amoothei-tc-connectspice-*
18+
flake8 --doctests -j auto *.py virtesk-tc-connectspice-*
1919
indention_report:
2020
autopep8 . --recursive --select=E101,E121 --diff
2121
indention_fix:

‎virtesk-tc-connectspice/connect_spice_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
# Copyright (c) 2013-2016, Adfinis SyGroup AG
66
#
7-
# This file is part of Amoothei-VDI.
7+
# This file is part of Virtesk VDI.
88
#
9-
# Amoothei-VDI is free software: you can redistribute it and/or modify
9+
# Virtesk VDI is free software: you can redistribute it and/or modify
1010
# it under the terms of the GNU General Public License as published by
1111
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
14-
# Amoothei-VDI is distributed in the hope that it will be useful,
14+
# Virtesk VDI is distributed in the hope that it will be useful,
1515
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1616
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1717
# GNU General Public License for more details.
1818
#
1919
# You should have received a copy of the GNU General Public License
20-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
20+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
2121

2222

2323
# System Imports

‎virtesk-tc-connectspice/find_thinclient_identifier.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
# Copyright (c) 2013-2016, Adfinis SyGroup AG
66
#
7-
# This file is part of Amoothei-VDI.
7+
# This file is part of Virtesk VDI.
88
#
9-
# Amoothei-VDI is free software: you can redistribute it and/or modify
9+
# Virtesk VDI is free software: you can redistribute it and/or modify
1010
# it under the terms of the GNU General Public License as published by
1111
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
14-
# Amoothei-VDI is distributed in the hope that it will be useful,
14+
# Virtesk VDI is distributed in the hope that it will be useful,
1515
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1616
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1717
# GNU General Public License for more details.
1818
#
1919
# You should have received a copy of the GNU General Public License
20-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
20+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
2121

2222
# System Imports
2323
import os

‎virtesk-tc-connectspice/spice_xpi_controller.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020

2121
# Copyright (c) 2013-2016, Adfinis SyGroup AG
2222
#
23-
# This file is part of Amoothei-VDI.
23+
# This file is part of Virtesk VDI
2424
#
25-
# Amoothei-VDI is free software: you can redistribute it and/or modify
25+
# Virtesk VDI is free software: you can redistribute it and/or modify
2626
# it under the terms of the GNU General Public License as published by
2727
# the Free Software Foundation, either version 3 of the License, or
2828
# (at your option) any later version.
2929
#
30-
# Amoothei-VDI is distributed in the hope that it will be useful,
30+
# Virtesk VDI is distributed in the hope that it will be useful,
3131
# but WITHOUT ANY WARRANTY; without even the implied warranty of
3232
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3333
# GNU General Public License for more details.
3434
#
3535
# You should have received a copy of the GNU General Public License
36-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
36+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
3737

3838

3939
import socket

‎virtesk-tc-connectspice/virtesk-tc-connectspice-main

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
# Copyright (c) 2013-2016, Adfinis SyGroup AG
66
#
7-
# This file is part of Amoothei-VDI.
7+
# This file is part of Virtesk VDI.
88
#
9-
# Amoothei-VDI is free software: you can redistribute it and/or modify
9+
# Virtesk VDI is free software: you can redistribute it and/or modify
1010
# it under the terms of the GNU General Public License as published by
1111
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
14-
# Amoothei-VDI is distributed in the hope that it will be useful,
14+
# Virtesk VDI is distributed in the hope that it will be useful,
1515
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1616
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1717
# GNU General Public License for more details.
1818
#
1919
# You should have received a copy of the GNU General Public License
20-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
20+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
2121

2222

2323
import connect_spice_client

‎virtesk-tc-connectspice/virtesk-tc-connectspice-shutdown-vm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
# Copyright (c) 2013-2016, Adfinis SyGroup AG
66
#
7-
# This file is part of Amoothei-VDI.
7+
# This file is part of Virtesk VDI.
88
#
9-
# Amoothei-VDI is free software: you can redistribute it and/or modify
9+
# Virtesk VDI is free software: you can redistribute it and/or modify
1010
# it under the terms of the GNU General Public License as published by
1111
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
14-
# Amoothei-VDI is distributed in the hope that it will be useful,
14+
# Virtesk VDI is distributed in the hope that it will be useful,
1515
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1616
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1717
# GNU General Public License for more details.
1818
#
1919
# You should have received a copy of the GNU General Public License
20-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
20+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
2121

2222
import connect_spice_client
2323

‎virtesk-tc-tools/tc_rollout_kexec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
# Copyright (c) 2013-2016, Adfinis SyGroup AG
44
#
5-
# This file is part of Amoothei-VDI.
5+
# This file is part of Virtesk VDI.
66
#
7-
# Amoothei-VDI is free software: you can redistribute it and/or modify
7+
# Virtesk VDI is free software: you can redistribute it and/or modify
88
# it under the terms of the GNU General Public License as published by
99
# the Free Software Foundation, either version 3 of the License, or
1010
# (at your option) any later version.
1111
#
12-
# Amoothei-VDI is distributed in the hope that it will be useful,
12+
# Virtesk VDI is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
# GNU General Public License for more details.
1616
#
1717
# You should have received a copy of the GNU General Public License
18-
# along with Amoothei-VDI. If not, see <http://www.gnu.org/licenses/>.
18+
# along with Virtesk VDI. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Global variables
2121
declare -a ARGV
@@ -38,12 +38,12 @@ display_usage() {
3838
It is useful for re-installation of already
3939
installed thinclients.
4040
41-
tc_rollout_kexec is part of the amoothei-tc-tools collection.
41+
tc_rollout_kexec is part of the virtesk-tc-tools collection.
4242
4343
Amoothei-vdi is a virtual desktop infrastructure
4444
solution based on RHEV / Ovirt.
4545
46-
Documentation: see doc/amoothei-tc-tools.rst .
46+
Documentation: see doc/virtesk-tc-tools.rst .
4747
EndOfHelpText
4848

4949
exit 1;

0 commit comments

Comments
 (0)