From d2026f5d03ebf7b94b2121a2482538465f0a4224 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 7 Oct 2021 19:56:54 +0000 Subject: [PATCH] Added x2go CT --- CT-Build/Debian.Jenkinsfile | 2 +- CT-Build/Debian.yaml | 69 ++++++++++++ CT-Files/x2go/Configs/Skel/.Xresources | 2 + .../panel/launcher-2/15797758814.desktop | 14 +++ .../panel/launcher-3/15797759346.desktop | 14 +++ .../panel/launcher-4/15797759488.desktop | 13 +++ .../panel/launcher-5/16336291841.desktop | 13 +++ .../xfce-perchannel-xml/xfce4-panel.xml | 81 ++++++++++++++ .../xfce-perchannel-xml/xfce4-session.xml | 31 ++++++ .../xfconf/xfce-perchannel-xml/xfwm4.xml | 103 ++++++++++++++++++ CT-Files/x2go/Scripts/Init.sh | 17 +++ Readme.md | 12 +- 12 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 CT-Files/x2go/Configs/Skel/.Xresources create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-2/15797758814.desktop create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-3/15797759346.desktop create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-4/15797759488.desktop create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-5/16336291841.desktop create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml create mode 100644 CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml create mode 100644 CT-Files/x2go/Scripts/Init.sh diff --git a/CT-Build/Debian.Jenkinsfile b/CT-Build/Debian.Jenkinsfile index 42cecd5..d22e852 100644 --- a/CT-Build/Debian.Jenkinsfile +++ b/CT-Build/Debian.Jenkinsfile @@ -1,4 +1,4 @@ -String[] ImgVariantList = ['minimal', 'default', 'jenkinsbuilder', 'imgbuilder', 'jenkins', 'mysql' , 'pihole' , 'collabora' , 'jellyfin' , 'domoticz' , 'omadaV3' , 'docker' , 'smb' , 'tvheadend' ] +String[] ImgVariantList = ['minimal', 'default', 'jenkinsbuilder', 'imgbuilder', 'jenkins', 'mysql' , 'pihole' , 'collabora' , 'jellyfin' , 'domoticz' , 'omadaV3' , 'docker' , 'smb' , 'tvheadend' , 'x2go' ] pipeline { agent { label 'LXCBuilder' } diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index de05acd..9be668c 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -930,6 +930,13 @@ files: variants: - smb +#FileForX2go +- path: /opt/Setup + generator: copy + source: CT-Files/x2go + variants: + - x2go + packages: manager: apt update: true @@ -950,6 +957,7 @@ packages: - docker - smb - tvheadend + - x2go #Https Repo pkgs - packages: @@ -964,6 +972,7 @@ packages: - docker - smb - tvheadend + - x2go #Minimal pkgs - packages: @@ -1137,6 +1146,50 @@ packages: variants: - tvheadend +#X2go pkgs + - packages: + - gnome-themes-extra + - xfce4-session + - xfce4-settings + - xfce4-panel + - xfconf + - xfdesktop4 + - xfwm4 + - xserver-xorg + - gvfs + - x2goserver + - x2goserver-extensions + - x2goserver-fmbindings + - x2goserver-xsession + - thunar + - lxterminal + - mousepad + - file-roller + - librsvg2-common + - ncurses-term + - filezilla + - google-chrome-stable + - firefox-esr + - mc + - xterm + - nedit + - nano + - clusterssh + - libreoffice-writer + - libreoffice-impress + - libreoffice-calc + - libreoffice-l10n-nl + - libreoffice-help-nl + - okular + - remmina + - remmina-plugin-rdp + - remmina-plugin-rdp + - remmina-plugin-vnc + - remmina-plugin-spice + action: install + variants: + - x2go + repositories: - name: sources.list url: |- @@ -1200,6 +1253,13 @@ packages: variants: - tvheadend +#GoogleChrome Repo + - name: google-chrome.list + url: |- + deb [signed-by=/usr/share/keyrings/GoogleChrome-archive-keyring.gpg arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main + variants: + - x2go + actions: - trigger: post-unpack action: |- @@ -1249,6 +1309,7 @@ actions: - domoticz - omadaV3 - smb + - x2go - trigger: post-packages action: |- @@ -1343,5 +1404,13 @@ actions: variants: - tvheadend +#GoogleChrome Repo key +- trigger: post-unpack + action: |- + #!/bin/sh + curl --retry 7 --retry-delay 5 -L -s https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /usr/share/keyrings/GoogleChrome-archive-keyring.gpg + variants: + - x2go + mappings: architecture_map: debian \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.Xresources b/CT-Files/x2go/Configs/Skel/.Xresources new file mode 100644 index 0000000..af9dcc0 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.Xresources @@ -0,0 +1,2 @@ +xterm*background: black +xterm*foreground: lightgray diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-2/15797758814.desktop b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-2/15797758814.desktop new file mode 100644 index 0000000..f604ab8 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-2/15797758814.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch FileManager %u +Icon=org.xfce.filemanager +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-XFCE-MimeType=inode/directory;x-scheme-handler/trash; +X-AppStream-Ignore=True +Name=File Manager +Comment=Browse the file system +X-XFCE-Source=file:///usr/share/applications/xfce4-file-manager.desktop \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-3/15797759346.desktop b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-3/15797759346.desktop new file mode 100644 index 0000000..70698fd --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-3/15797759346.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch WebBrowser %u +Icon=web-browser +StartupNotify=true +Terminal=false +Categories=Network;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https; +X-AppStream-Ignore=True +Name=Web Browser +Comment=Browse the web +X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-4/15797759488.desktop b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-4/15797759488.desktop new file mode 100644 index 0000000..973db77 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-4/15797759488.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch TerminalEmulator +Icon=utilities-terminal +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-AppStream-Ignore=True +Name=Terminal Emulator +Comment=Use the command line +X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-5/16336291841.desktop b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-5/16336291841.desktop new file mode 100644 index 0000000..f08b275 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/panel/launcher-5/16336291841.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Mousepad +Comment=Simple Text Editor +GenericName=Text Editor +Exec=mousepad %F +Icon=accessories-text-editor +Terminal=false +StartupNotify=true +Type=Application +Categories=Utility;TextEditor;GTK; +MimeType=text/plain; +X-Desktop-File-Install-Version=0.23 +X-XFCE-Source=file:///usr/share/applications/mousepad.desktop \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000..22c0ee6 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 0000000..b3f2019 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000..5faa4a2 --- /dev/null +++ b/CT-Files/x2go/Configs/Skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CT-Files/x2go/Scripts/Init.sh b/CT-Files/x2go/Scripts/Init.sh new file mode 100644 index 0000000..54011cc --- /dev/null +++ b/CT-Files/x2go/Scripts/Init.sh @@ -0,0 +1,17 @@ +#!/bin/bash +#Hide mail button in application menu +sed -i -e 's/OnlyShowIn/NotShowIn/g' /usr/share/applications/xfce4-mail-reader.desktop + +#Hide 'Thunar bulk rename' button in application menu +echo "NotShowIn=XFCE;" >> /usr/share/applications/thunar-bulk-rename.desktop + +#Set default webrowser to 'Gooogle Chrome' +update-alternatives --set x-www-browser /usr/bin/google-chrome-stable + +#Set default terminal to 'LxTerminal' +update-alternatives --set x-terminal-emulator /usr/bin/lxterminal + +#Setup default home with 'XFCE' configs +mv -f /opt/Setup/Configs/Skel/* /opt/Setup/Configs/Skel/.[!.]* /etc/skel/ +mkdir /etc/skel/.ssh +rm -rf /opt/Setup/Configs/Skel \ No newline at end of file diff --git a/Readme.md b/Readme.md index be5b043..5726e24 100644 --- a/Readme.md +++ b/Readme.md @@ -29,7 +29,8 @@ This can be done on a Minimal debian CT (make sure to enable nesting) on the new | omadaV3 | Debian | TP-link Omada SDN controller(V3.2.14) | | docker | Debian | Docker container service | | smb | Debian | Samba server | -| tvheadend | Debian | Tvheadend server | +| tvheadend | Debian | Tvheadend server | +| x2go | Debian | Remote xfce desktop accessable via X2go | | gitea | Alpine | Gitea server | | nginx | Alpine | Nginx server for reverse-proxy use | | ddns | Alpine | DDNS client configured for OVH/OVH-Cloud | @@ -65,7 +66,7 @@ AptCacherNG MailBackup* ~FileShelter~ Not supported in debian 11 /transfer.sh As alternative -WS(x2go-xfce) + **End original list** @@ -227,4 +228,9 @@ create /dev/ cd /iscsi//tpg1/luns create exit -``` \ No newline at end of file +``` + +## x2go +* Add a user by typing `adduser ` +* Set key auth only `sed -i -e '/PasswordAuthentication/c\PasswordAuthentication no' -e '/ChallengeResponseAuthentication/c\ChallengeResponseAuthentication no' /etc/ssh/sshd_config` +* Set ssh port `sed -i -e '/Port 22/c\Port ' /etc/ssh/sshd_config` \ No newline at end of file