From 5194ff1344e195bb581457c2b544b066026e1bcb Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Tue, 15 Mar 2011 19:12:39 -0400 Subject: [PATCH] All kinds of updates --- nodes.ia | 6 ++- packages.ia | 107 +++++++++++++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 52 deletions(-) diff --git a/nodes.ia b/nodes.ia index 68c7abc..1e84dc4 100644 --- a/nodes.ia +++ b/nodes.ia @@ -58,12 +58,16 @@ profiles csclub server machine i386 squeeze; # unrestricted but too slow for general-use @sodium-citrate -profiles csclub server machine mips lenny general-small; +profiles csclub server machine mips squeeze general-small; # unrestricted but too slow for general-use @goto80 profiles csclub server machine armel squeeze general-small; +# unrestricted but too slow for general-use +@paza +profiles csclub server machine powerpc squeeze general-small; + # Computational Math Club Office Terminals @inkpen diff --git a/packages.ia b/packages.ia index 19d61b7..fa32aa7 100644 --- a/packages.ia +++ b/packages.ia @@ -13,7 +13,7 @@ if @core { schedtool pciutils usbutils rsync; # compression - install bzip2 gzip pax lzma cpio xdelta; + install bzip2 gzip pax lzma @!lenny xz-utils cpio; # terminals install ncurses-bin ncurses-term; @@ -21,7 +21,7 @@ if @core { # network install iputils-ping iputils-arping traceroute telnet iproute ethtool dnsutils whois wget netcat-openbsd netcat6 - ntp vlan bridge-utils tcpdump tshark tsocks + ntp vlan bridge-utils tcpdump tshark ftp tftp; # package management @@ -41,13 +41,26 @@ if @core { # logging install rsyslog; + + # safety + install molly-guard; + + # mail + install @mta postfix @!mta ssmtp; }; # physical machine (non virtual server) if @machine { install lm-sensors smartmontools hwinfo lshw @armel mtd-utils @x86 acpid @x86 acpi @x86 @!lucid @!maverick acpi-support-base - kexec-tools; + @!sparc @!mips @!alpha kexec-tools; + + @amd64 install linux-image-amd64/linux-image; + @i386 install linux-image-686/linux-image; + @sparc install @!nosmp linux-image-sparc64-smp @nosmp linux-image-sparc64; + @powerpc install linux-image-powerpc; + @alpha install linux-image-alpha-smp; + @mips install linux-image-mips; }; # container (virtual server) @@ -56,12 +69,10 @@ if @container { }; if @auth-core { - install nscd libnss-ldapd ldap-utils libpam-krb5 krb5-user ldapvi; + install nscd @!lenny nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user ldapvi; @csclub install libpam-csc; - - install molly-guard; }; if @nfs-core { @@ -122,8 +133,8 @@ if @devel-full { @!lucid @!maverick @!squeeze cl-yacc; # build systems - install make-doc ccache distcc ant ant-optional @!squeeze bake scons qt4-qmake - cmake autogen autoconf-doc autoconf2.13 automake1.9 + install make-doc ccache @!lenny distcc ant ant-optional @!squeeze bake scons qt4-qmake + autogen autoconf-doc autoconf2.13 automake1.9 automake1.9-doc autotools-dev autoproject kbuild; # version control @@ -197,7 +208,7 @@ if @devel-full { # scheme install gauche-dev gambc mit-scheme-doc chicken-bin @!lucid @!maverick @!squeeze guile-1.8-dev scheme48 scm sigscheme slib tinyscheme - @!lenny @!sparc scheme2c scheme9 + @!lenny @!sparc scheme2c @!lenny scheme9 @x86 stalin @x86 plt-scheme; @@ -251,6 +262,10 @@ if @devel-full { # integrated development environments @X install eclipse; + # arm toolchain + @squeeze @x86 + install gcc-4.4-arm-linux-gnueabi; + # miscellaneous install chrpath openmpi-bin openmpi-doc protobuf-compiler protobuf-c-compiler; @@ -270,7 +285,7 @@ if @general-use { # network install ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools - iptables ebtables arptables + iptables ebtables arptables tsocks lftp ncftp @X wireshark; @@ -296,7 +311,7 @@ if @general-use { # compression install unzip unrar sharutils cabextract p7zip p7zip-full p7zip-rar - arj unace ncompress zoo; + arj unace ncompress zoo xdelta; # ssh install pssh @X clusterssh dsh; @@ -363,8 +378,9 @@ if @general-use { @corn-syrup qemu-system @corn-syrup qemu-user; -# @csclub -# install ceo-python; + # club management + @csclub @amd64 + install ceo-python; }; if @X { @@ -392,7 +408,6 @@ if @X { # messaging install pidgin pidgin-otr empathy; - # browsers install firefox/iceweasel thunderbird/icedove epiphany-browser @!lenny midori google-chrome-stable; @@ -405,14 +420,14 @@ if @X { install hugin; # geometry - install @X carmetal; + install carmetal; # cad install xtrkcad @!lenny freecad pythoncad; # gnome install gdm @!lucid @!maverick gdm-themes gnome-core gnome-office gnome-themes - gnome-themes-extras rhythmbox + gnome-themes-extras rhythmbox gnome-rdp @!karmic @!lucid @!maverick gnome-desktop-environment; # kde @@ -428,50 +443,40 @@ if @X { octave-ocs oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc eagle kic kicad; + # virtualization + install virtualbox-ose; + # miscellaneous install gucharmap gmrun dzen2 xserver-xephyr @lenny/squeeze wine; }; -@csclub -remove gnome-games nethack-common; +if @core { -@csclub -install @mta postfix @!mta ssmtp; + # no games + @csclub + remove gnome-games nethack-common; -# satan -remove pulseaudio avahi-daemon evolution-data-server; + # evil packages + remove pulseaudio avahi-daemon evolution-data-server @!lenny docky + @!lenny @!squeeze ureadahead lirc joe + mlocate locate; -# lesser satan -@!X @core -remove fam gamin hal winbind; + # useless packages + remove winbind gpm timidity @!lenny modemmanager + libpam-ldap @!lenny libpam-ldapd + @!lenny blcr-dkms + @!squeeze @!lenny apparmor @!squeeze @!lenny packagekit; -@X @core remove winbind docky; + # X-only packages + @!X remove fam gamin hal pidgin dbus dbus-x11; -remove network-manager-kde network-manager-pptp - network-manager-pptp-gnome network-manager; -remove @!lenny @!squeeze ureadahead lirc; + # static network only + remove network-manager-kde network-manager-pptp + network-manager-pptp-gnome network-manager + wpasupplicant; -remove nagios-nrpe-server timidity watchdog @!squeeze autofs autofs5 cups gpm - @!lenny modemmanager wpasupplicant; - -remove @!lenny blcr-dkms; -remove libpam-ldap @!lenny libpam-ldapd; -remove joe; - -@!sodium-benzoate remove snmpd; - -@!X remove pidgin dbus-x11 dbus; - -remove mlocate locate; - -if @!container { - @amd64 install linux-image-amd64/linux-image; - @i386 install linux-image-686/linux-image; - @sparc install @!nosmp linux-image-sparc64-smp @nosmp linux-image-sparc64; - @powerpc install linux-image-powerpc; - @alpha install linux-image-alpha - @mips install linux-image-mips; + # obsolete daemons + remove nagios-nrpe-server watchdog @!squeeze autofs autofs5 cups + @!sodium-benzoate snmpd; }; - -@!squeeze remove apparmor;