diff --git a/init-server.py b/init-server.py index 861f60f..2d52bb4 100755 --- a/init-server.py +++ b/init-server.py @@ -9,9 +9,9 @@ from ssh_lib.benchmark import benchmark, c1000k from ssh_lib.config import config, scripts from ssh_lib.kernel import set_cpu_governor, setup_kernel_settings from ssh_lib.nginx import certbot, nginx -from ssh_lib.pkg_base import pkg_base, pkg_clean, pkg_upgrade +from ssh_lib.pkg_base import pkg_base, pkg_upgrade from ssh_lib.planetiler import TILE_GEN_BIN, install_planetiler -from ssh_lib.utils import add_user, apt_get_install, enable_sudo, put, reboot, setup_time, sudo_cmd +from ssh_lib.utils import add_user, enable_sudo, put, reboot, setup_time, sudo_cmd def prepare_shared(c): @@ -20,7 +20,6 @@ def prepare_shared(c): enable_sudo(c, 'ofm', nopasswd=True) pkg_upgrade(c) - pkg_clean(c) pkg_base(c) setup_time(c) diff --git a/ssh_lib/pkg_base.py b/ssh_lib/pkg_base.py index 0f2d465..4a5a9cb 100644 --- a/ssh_lib/pkg_base.py +++ b/ssh_lib/pkg_base.py @@ -1,9 +1,6 @@ from ssh_lib.utils import ( - apt_get_autoremove, apt_get_install, - apt_get_purge, apt_get_update, - sudo_cmd, ) @@ -34,26 +31,6 @@ def pkg_base(c): apt_get_install(c, ' '.join(pkg_list)) -def pkg_clean(c): - pkg_list = [ - # firewalls - 'ufw', - 'nftables', - 'firewalld', - 'iptables-persistent', - # bloat - 'ntfs-3g', - 'popularity-contest', - 'landscape*', - 'ubuntu-advantage-tools', - ] - - apt_get_purge(c, ' '.join(pkg_list)) - apt_get_autoremove(c) - sudo_cmd(c, 'dpkg --list | grep "^rc" | cut -d " " -f 3 | xargs -r dpkg --purge') - c.sudo('iptables -L', warn=True) - - def pkg_upgrade(c): apt_get_update(c) c.sudo(