Skip to content

Commit

Permalink
split roles
Browse files Browse the repository at this point in the history
  • Loading branch information
vit01 committed Dec 1, 2020
1 parent 794f70b commit 392b03c
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 47 deletions.
2 changes: 2 additions & 0 deletions desktop.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include software::everywhere
include software::desktop
2 changes: 2 additions & 0 deletions server.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include software::everywhere
include software::server
47 changes: 0 additions & 47 deletions software.pp

This file was deleted.

21 changes: 21 additions & 0 deletions software/manifests/.ipynb_checkpoints/desktop-checkpoint.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
class software::desktop {
# fonts are questionable, gstreamer plugins, office
# camptocamp-systemd

$pkgs_common = ['bleachbit', 'xfce4-screenshooter', 'davfs2', 'ntfs-3g', 'transmission-gtk', 'dosfstools', 'exfat-utils', 'fdisk', 'gdisk', 'gucharmap', 'gvfs', 'gvfs-fuse', 'kde-cli-tools', 'kdeconnect', 'emacs', 'mousepad', 'localepurge', 'modemmanager', 'mpv', 'os-prober', 'parted', 'gparted', 'pavucontrol', 'fatresize', 'pcmanfm', 'udisks2', 'usbutils', 'x2goclient', 'youtube-dl', 'zenity', 'zip']
$pkgs_deb = ['exfat-fuse', 'firefox-esr', 'firefox-esr-l10n-ru', 'wpasupplicant', 'x11-utils', 'xinit']
$pkgs_arch = ['exfatprogs', 'firefox', 'firefox-i18n-ru', 'archiso', 'arch-install-scripts', 'git-man', 'wpa_supplicant', 'xorg-xinit']

$pkgs_uninst = ['mc']

$pkgs_custom = $operatingsystem ? {
debian => $pkgs_deb,
ubuntu => $pkgs_deb,
archlinux => $pkgs_arch,
manjarolinux => $pkgs_arch
}

package { $pkgs_common: ensure => "installed" }
package { $pkgs_custom: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}
18 changes: 18 additions & 0 deletions software/manifests/.ipynb_checkpoints/everywhere-checkpoint.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
class software::everywhere {
$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-dkms', 'wireguard-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']
$pkgs_arch = ['base-devel', 'cronie', 'openssh', 'python-pip', 'xz']

$pkgs_uninst = []

$pkgs_custom = $operatingsystem ? {
debian => $pkgs_deb,
ubuntu => $pkgs_deb,
archlinux => $pkgs_arch,
manjarolinux => $pkgs_arch
}

package { $pkgs_common: ensure => "installed" }
package { $pkgs_custom: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}
7 changes: 7 additions & 0 deletions software/manifests/.ipynb_checkpoints/server-checkpoint.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class software::server {
$pkgs = ['letsencrypt', 'certbot', 'nginx', 'fail2ban', 'emacs-nox']
$pkgs_uninst = ['apache2-bin', 'apache2-utils']

package { $pkgs: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}
21 changes: 21 additions & 0 deletions software/manifests/desktop.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
class software::desktop {
# fonts are questionable, gstreamer plugins, office
# camptocamp-systemd

$pkgs_common = ['bleachbit', 'xfce4-screenshooter', 'davfs2', 'ntfs-3g', 'transmission-gtk', 'dosfstools', 'exfat-utils', 'fdisk', 'gdisk', 'gucharmap', 'gvfs', 'gvfs-fuse', 'kde-cli-tools', 'kdeconnect', 'emacs', 'mousepad', 'localepurge', 'modemmanager', 'mpv', 'os-prober', 'parted', 'gparted', 'pavucontrol', 'fatresize', 'pcmanfm', 'udisks2', 'usbutils', 'x2goclient', 'youtube-dl', 'zenity', 'zip']
$pkgs_deb = ['exfat-fuse', 'firefox-esr', 'firefox-esr-l10n-ru', 'wpasupplicant', 'x11-utils', 'xinit']
$pkgs_arch = ['exfatprogs', 'firefox', 'firefox-i18n-ru', 'archiso', 'arch-install-scripts', 'git-man', 'wpa_supplicant', 'xorg-xinit']

$pkgs_uninst = ['mc']

$pkgs_custom = $operatingsystem ? {
debian => $pkgs_deb,
ubuntu => $pkgs_deb,
archlinux => $pkgs_arch,
manjarolinux => $pkgs_arch
}

package { $pkgs_common: ensure => "installed" }
package { $pkgs_custom: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}
18 changes: 18 additions & 0 deletions software/manifests/everywhere.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
class software::everywhere {
$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-dkms', 'wireguard-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']
$pkgs_arch = ['base-devel', 'cronie', 'openssh', 'python-pip', 'xz']

$pkgs_uninst = []

$pkgs_custom = $operatingsystem ? {
debian => $pkgs_deb,
ubuntu => $pkgs_deb,
archlinux => $pkgs_arch,
manjarolinux => $pkgs_arch
}

package { $pkgs_common: ensure => "installed" }
package { $pkgs_custom: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}
7 changes: 7 additions & 0 deletions software/manifests/server.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class software::server {
$pkgs = ['letsencrypt', 'certbot', 'nginx', 'fail2ban', 'emacs-nox']
$pkgs_uninst = ['apache2-bin', 'apache2-utils']

package { $pkgs: ensure => "installed" }
package { $pkgs_uninst: ensure => "absent" }
}

0 comments on commit 392b03c

Please sign in to comment.