update software

software/files/backup-pg.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## install packages: postgresql-12 php7.4-pgsql postgresql-server-dev-all
+## install packages: postgresql-15 php8.2-pgsql postgresql-server-dev-all
 # sudo -i -u postgres
 # createuser --interactive
 # createdb datadbname

software/manifests/desktop.pp

@@ -1,16 +1,16 @@
 class software::desktop {
     $user = 'vitya'
 
-    $pkgs_common = ['bleachbit', 'davfs2', 'ntfs-3g', 'qbittorrent', 'dosfstools', 'exfatprogs', 'gucharmap', 'gvfs', 'kde-cli-tools', 'kdeconnect', 'geany', 'modemmanager', 'mpv', 'os-prober', 'parted', 'gparted', 'pavucontrol', 'fatresize', 'pcmanfm', 'udisks2', 'usbutils', 'telegram-desktop', 'yt-dlp', 'zenity', 'zip', 'squashfs-tools', 'syncthing', 'keepassxc', 'audacious', 'debootstrap', 'okular', 'f2fs-tools', 'gimp', 'vinagre', 'mtpaint', 'powertop', 'refind', 'shadowsocks-libev', 'simplescreenrecorder', 'seahorse', 'thunderbird', 'tor', 'torsocks', 'translate-shell', 'onboard', 'xfburn', 'qt5ct', 'materia-gtk-theme', 'papirus-icon-theme', 'grsync']
+    $pkgs_common = ['bleachbit', 'davfs2', 'ntfs-3g', 'qbittorrent', 'dosfstools', 'exfatprogs', 'gucharmap', 'gvfs', 'kde-cli-tools', 'kdeconnect', 'geany', 'modemmanager', 'mpv', 'os-prober', 'parted', 'gparted', 'pavucontrol', 'fatresize', 'pcmanfm-qt', 'udisks2', 'usbutils', 'telegram-desktop', 'yt-dlp', 'zenity', 'zip', 'squashfs-tools', 'syncthing', 'keepassxc', 'debootstrap', 'okular', 'f2fs-tools', 'gimp', 'remmina', 'mtpaint', 'powertop', 'refind', 'shadowsocks-libev', 'simplescreenrecorder', 'seahorse', 'thunderbird', 'tor', 'torsocks', 'translate-shell', 'onboard', 'qt5ct', 'materia-gtk-theme', 'papirus-icon-theme', 'grsync']
 
-    $pkgs_debbased = ['fdisk', 'gdisk', 'gvfs-fuse', 'wpasupplicant', 'x11-utils', 'xinit', 'nextcloud-desktop', 'android-tools-adb', 'bluez-tools', 'go-mtpfs', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'gstreamer1.0-pulseaudio', 'libgstreamer-plugins-bad1.0-0', 'proxychains', 'pulseaudio-module-bluetooth', 'localepurge', 'libfsapfs1', 'libfsapfs-utils', 'broadcom-sta-dkms', 'fonts-firacode', 'x2goclient']
+    $pkgs_debbased = ['fdisk', 'gdisk', 'gvfs-fuse', 'wpasupplicant', 'x11-utils', 'xinit', 'nextcloud-desktop', 'android-tools-adb', 'bluez-tools', 'go-mtpfs', 'gstreamer1.0-plugins-base', 'gstreamer1.0-plugins-good', 'gstreamer1.0-pulseaudio', 'libgstreamer-plugins-bad1.0-0', 'proxychains', 'localepurge', 'libfsapfs1', 'libfsapfs-utils', 'broadcom-sta-dkms', 'fonts-firacode', 'x2goclient']
 
-    $pkgs_arch = ['firefox', 'firefox-i18n-ru', 'arch-install-scripts', 'wpa_supplicant', 'xorg-xinit', 'nextcloud-client', 'android-tools', 'bluez-utils', 'gst-libav', 'gst-plugins-bad', 'gst-plugins-base', 'gst-plugins-good', 'gst-plugins-ugly', 'gstreamer-vaapi', 'gvfs-mtp', 'broadcom-wl-dkms', 'discord', 'mtpfs', 'pacgraph', 'proxychains-ng', 'pulseaudio-bluetooth', 'refind-drivers', 'thunderbird-i18n-ru', 'mypaint', 'ttf-fira-sans', 'ttf-fira-mono', 'ttf-fira-code']
+    $pkgs_arch = ['firefox', 'firefox-i18n-ru', 'arch-install-scripts', 'wpa_supplicant', 'xorg-xinit', 'nextcloud-client', 'android-tools', 'bluez-utils', 'gst-libav', 'gst-plugins-bad', 'gst-plugins-base', 'gst-plugins-good', 'gst-plugins-ugly', 'gstreamer-vaapi', 'gvfs-mtp', 'broadcom-wl-dkms', 'discord', 'mtpfs', 'pacgraph', 'proxychains-ng', 'refind-drivers', 'thunderbird-i18n-ru', 'mypaint', 'ttf-fira-sans', 'ttf-fira-mono', 'ttf-fira-code']
 
     $pkgs_debian = ['bluez-firmware', 'firefox-esr', 'firefox-esr-l10n-ru', 'thunderbird-l10n-ru']
     $pkgs_ubuntu = ['firefox', 'firefox-locale-ru', 'thunderbird-locale-ru']
 
-    $pkgs_uninst = ['mc', 'mousepad', 'leafpad', 'emacs', 'youtube-dl', 'transmission-gtk']
+    $pkgs_uninst = ['mc', 'mousepad', 'leafpad', 'emacs', 'youtube-dl', 'transmission-gtk', 'vinagre']
 
     $pkgs_custom = $operatingsystem ? {
         debian => $pkgs_debbased,
@@ -58,11 +58,11 @@
             mode => "0644"
         }
 
-        file { '/etc/X11/xorg.conf.d/10-mtrack.conf':
-            ensure => present,
-            content => file('software/10-mtrack.conf'),
-            mode => "0644"
-        }
+        #file { '/etc/X11/xorg.conf.d/10-mtrack.conf':
+        #    ensure => present,
+        #    content => file('software/10-mtrack.conf'),
+        #    mode => "0644"
+        #}
     }
 
     $icon = 'xdg-desktop-icon install --novendor /usr/share/applications'

software/manifests/everywhere.pp

@@ -42,7 +42,7 @@
         include software::archlinuxcn
     }}
 
-    $pkgs_common = ['vim', 'git', 'curl', 'bash-completion', 'busybox', 'diffutils', 'dkms', 'elinks', 'file', 'findutils', 'gdb', 'graphicsmagick', 'grep', 'moreutils', 'ncdu', 'nmap', 'p7zip', 'parallel', 'patch', 'pciutils', 'rsync', 'screen', 'sed', 'sshfs', 'sudo', 'unzip', 'wget', 'wireguard-tools', 'ethtool', 'fdupes', 'iftop', 'iotop', 'lshw', 'lsof', 'zsh', 'unrar', 'qrencode']
+    $pkgs_common = ['vim', 'git', 'curl', 'bash-completion', 'busybox', 'diffutils', 'dkms', 'elinks', 'file', 'findutils', 'gdb', 'graphicsmagick', 'grep', 'moreutils', 'ncdu', 'nmap', 'p7zip', 'parallel', 'patch', 'pciutils', 'rsync', 'screen', 'sed', 'sshfs', 'sudo', 'unzip', 'wget', 'wireguard-tools', 'ethtool', 'fdupes', 'iftop', 'iotop', 'lshw', 'lsof', 'zsh', 'unrar', 'qrencode', 'net-tools']
     $pkgs_deb = ['adduser', 'apt-utils', 'apt-transport-https', 'build-essential', 'cron', 'openssh-client', 'openssh-server', 'openssh-sftp-server', 'python3-pip', 'wireguard', 'xz-utils', 'apt-file', 'wcalc']
     $pkgs_arch = ['base-devel', 'cronie', 'openssh', 'python-pip', 'xz', 'calc', 'yay']
 

software/manifests/science.pp

@@ -13,7 +13,7 @@
 
 	$pkgs_arch = ['ds9', 'texlive-bin', 'texlive-core', 'texlive-bibtexextra', 'texlive-fontsextra', 'texlive-latexextra', 'texlive-formatsextra', 'texlive-langcyrillic', 'texlive-langgreek']
 
-    $pip_packages = ['jupyter', 'jupyterlab', 'aiohttp', 'lxml', 'matplotlib', 'numpy', 'scipy', 'sympy', 'pandas', 'seaborn', 'pillow', 'astropy', 'sunpy', 'apprise', 'requests', 'bs4', 'drms', 'zeep', 'h5netcdf', 'ipywidgets', 'ipyleaflet', 'voila', 'voila-gridstack', 'papermill', 'dot_kernel', 'git+https://github.com/gnudatalanguage/gdl_kernel', 'jupyterlab_latex', 'iplantuml']
+    $pip_packages = ['jupyter', 'jupyterlab', 'aiohttp', 'lxml', 'matplotlib', 'ipympl', 'numpy', 'scipy', 'sympy', 'pandas', 'seaborn', 'pillow', 'astropy', 'sunpy', 'sunkit-instruments', 'hvpy', 'apprise', 'requests', 'bs4', 'drms', 'zeep', 'h5netcdf', 'ipywidgets', 'papermill', 'dot_kernel', 'jupyter_scheduler', 'iplantuml', 'pip-review', 'ipyparallel']
 
     $pkgs_uninst = ['xmaxima', 'wxmaxima', 'sbcl']
 
@@ -47,39 +47,20 @@
     ~> exec { 'jupyterlab-ipywidgets': path => $all_path,
         refreshonly => true,
         command => 'jupyter labextension install @jupyter-widgets/jupyterlab-manager --no-build' }
-    ~> exec { 'jupyterlab-latex': path => $all_path,
-        refreshonly => true,
-        command => 'jupyter labextension install @jupyterlab/latex --no-build' }
-    ~> exec { 'voila enable serverextension': path => $all_path,
-        refreshonly => true,
-        command => 'jupyter serverextension enable voila --sys-prefix' }
-    ~> exec { 'jupyterlab_latex enable serverextension': path => $all_path,
-        refreshonly => true,
-        command => 'jupyter serverextension enable jupyterlab_latex --sys-prefix' }
     ~> exec {'jupyter lab build without minimize': path => $all_path,
         refreshonly => true,
         command => 'jupyter lab build --minimize=False' }
 
-    exec { 'install dot kernel': path => $all_path,
-        subscribe   => Package['dot_kernel'],
-        refreshonly => true,
-        command  => 'install-dot-kernel' }
-
-    exec { 'install dot kernel for user': path => $all_path,
-        command  => 'install-dot-kernel',
-        onlyif => 'which install-dot-kernel',
-        user => $user }
-
     file { '/etc/R-packages.txt':
         ensure => present,
         content => file('software/R-packages.txt'),
         mode => "0644"
     }
 
-    exec { 'install R packages': path => $all_path,
-        subscribe   => Package[$rpkgs],
-        require => File['/etc/R-packages.txt'],
-        timeout => 800,
-        refreshonly => true,
-        command  => 'cat /etc/R-packages.txt | R CMD BATCH /dev/stdin /dev/stdout' }
+    #exec { 'install R packages': path => $all_path,
+    #    subscribe   => Package[$rpkgs],
+    #    require => File['/etc/R-packages.txt'],
+    #    timeout => 800,
+    #    refreshonly => true,
+    #    command  => 'cat /etc/R-packages.txt | R CMD BATCH /dev/stdin /dev/stdout' }
 }

software/manifests/server.pp

@@ -1,6 +1,6 @@
 class software::server {
     $user = 'vitya'
-    $pkgs = ['apache2-utils', 'letsencrypt', 'certbot', 'python3-certbot-nginx', 'nginx', 'fail2ban', 'emacs-nox', 'tcpdump', 'prometheus-node-exporter']
+    $pkgs = ['apache2-utils', 'letsencrypt', 'certbot', 'python3-certbot-nginx', 'nginx', 'fail2ban', 'tcpdump', 'prometheus-node-exporter']
     $pkgs_uninst = ['apache2-bin']
 
     package { $pkgs: ensure => "installed" }
@@ -130,7 +130,7 @@
             fpm => true,
             fpm_pools => {
                 'www' => {
-                    'listen' => '/var/run/php/php7.4-fpm.sock',
+                    'listen' => '/var/run/php/php8.2-fpm.sock',
                     'listen_owner' => "www-data",
                     'listen_group' => "www-data",
                     'user' => "www-data",

zaebis.sh

@@ -11,9 +11,6 @@ if [ -n "`which apt-get`" ]; then
             apt-get -y install git
             apt-get -y purge puppet
             source /etc/os-release
-            if [ "$VERSION_CODENAME" = "jammy" ]; then
-                    VERSION_CODENAME="focal";
-            fi
             wget https://apt.puppet.com/puppet7-release-$VERSION_CODENAME.deb -O puppet7-release-$VERSION_CODENAME.deb
             dpkg -i puppet7-release-$VERSION_CODENAME.deb;
             apt-get update