diff options
95 files changed, 126 insertions, 2519 deletions
diff --git a/files/bin/ifcheck b/files/bin/ifcheck deleted file mode 100755 index c66f2ad..0000000 --- a/files/bin/ifcheck +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Check if a network interface is up, fixing if needed. -# - -# Parameters -BASENAME="`basename $0`" -IFACE="$1" - -# Syntax check -if [ -z "$IFACE" ]; then - echo "usage: $BASENAME <interface>" - exit 1 -fi - -# Run -if ! LANG=C LC_ALL=C ifconfig $IFACE | grep -q "inet addr:"; then - ifup --force $IFACE -fi diff --git a/files/bin/munin-cron b/files/bin/munin-cron deleted file mode 100644 index 052ea2d..0000000 --- a/files/bin/munin-cron +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# This used to test if the executables were installed. But that is -# perfectly redundant and supresses errors that the admin should see. - -/usr/share/munin/munin-update $@ || exit 1 - -# The result of munin-limits is needed by munin-html but not by -# munin-graph. So run it in the background now, it will be done -# before munin-graph. - -/usr/share/munin/munin-limits $@ - -# We always launch munin-html. -# It is a noop if html_strategy is "cgi" -#nice /usr/share/munin/munin-html $@ || exit 1 - -# The result of munin-html is needed for munin-graph. -# It is a noop if graph_strategy is "cgi" -#nice /usr/share/munin/munin-graph --cron $@ || exit 1 diff --git a/files/bin/munin-graph b/files/bin/munin-graph deleted file mode 100644 index b8d8c21..0000000 --- a/files/bin/munin-graph +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# We always launch munin-html. -# It is a noop if html_strategy is "cgi" -nice /usr/share/munin/munin-html $@ || exit 1 - -# The result of munin-html is needed for munin-graph. -# It is a noop if graph_strategy is "cgi" -nice /usr/share/munin/munin-graph --cron $@ || exit 1 diff --git a/files/etc/auto.removable b/files/etc/auto.removable deleted file mode 100644 index 5c3dedf..0000000 --- a/files/etc/auto.removable +++ /dev/null @@ -1,6 +0,0 @@ -usb1 -fstype=auto,sync :/dev/sdb1 -usb2 -fstype=auto,sync :/dev/sdc1 -usb3 -fstype=auto,sync :/dev/sdd1 -usb4 -fstype=auto,sync :/dev/sde1 -cdrom -fstype=iso9660,ro,sync,nodev,nosuid :/dev/cdrom -floppy -fstype=auto,sync,nodev,nosuid :/dev/fd0 diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc deleted file mode 100644 index 27686d6..0000000 --- a/files/etc/bash.bashrc +++ /dev/null @@ -1,58 +0,0 @@ -# System-wide .bashrc file for interactive bash(1) shells. - -# To enable the settings / commands in this file for login shells as well, -# this file has to be sourced in /etc/profile. - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, overwrite the one in /etc/profile) -#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' - -# set a fancy prompt -. /etc/profile.d/prompt.sh - -# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default. -# If this is an xterm set the title to user@host:dir -#case "$TERM" in -#xterm*|rxvt*) -# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' -# ;; -#*) -# ;; -#esac - -# enable bash completion in interactive shells -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi - -# if the command-not-found package is installed, use it -if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then - function command_not_found_handle { - # check because c-n-f could've been removed in the meantime - if [ -x /usr/lib/command-not-found ]; then - /usr/lib/command-not-found -- "$1" - return $? - elif [ -x /usr/share/command-not-found/command-not-found ]; then - /usr/share/command-not-found/command-not-found -- "$1" - return $? - else - printf "%s: command not found\n" "$1" >&2 - return 127 - fi - } -fi diff --git a/files/etc/cron.d/munin b/files/etc/cron.d/munin deleted file mode 100644 index 558a2df..0000000 --- a/files/etc/cron.d/munin +++ /dev/null @@ -1,9 +0,0 @@ -# -# cron-jobs for munin -# - -MAILTO="" - -@reboot root if [ ! -d /var/run/munin ]; then /bin/bash -c 'perms=(`/usr/sbin/dpkg-statoverride --list /var/run/munin`); mkdir /var/run/munin; chown ${perms[0]:-munin}:${perms[1]:-root} /var/run/munin; chmod ${perms[2]:-0755} /var/run/munin'; fi -*/5 * * * * munin if [ -x /usr/local/bin/munin-cron ]; then /usr/local/bin/munin-cron &> /dev/null; fi -14 10 * * * munin if [ -x /usr/share/munin/munin-limits ]; then /usr/share/munin/munin-limits --force --contact nagios --contact old-nagios; fi diff --git a/files/etc/crypttab/appliance b/files/etc/crypttab/appliance deleted file mode 100644 index 24d20bb..0000000 --- a/files/etc/crypttab/appliance +++ /dev/null @@ -1,2 +0,0 @@ -# <target name> <source device> <key file> <options> -#swap /dev/sda1 /dev/random swap,cipher=aes-xts-plain64:sha256 diff --git a/files/etc/crypttab/desktop b/files/etc/crypttab/desktop deleted file mode 100644 index 57aed8b..0000000 --- a/files/etc/crypttab/desktop +++ /dev/null @@ -1,6 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -home /dev/mapper/vg-home none luks,keyscript=decrypt_keyctl -var /dev/mapper/vg-var none luks,keyscript=decrypt_keyctl -vservers /dev/mapper/vg-vservers none luks,keyscript=decrypt_keyctl -swap /dev/mapper/vg-swap /dev/random swap,aes-xts-plain64:sha256 diff --git a/files/etc/crypttab/kvm b/files/etc/crypttab/kvm deleted file mode 100644 index 83859a3..0000000 --- a/files/etc/crypttab/kvm +++ /dev/null @@ -1,3 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -vservers /dev/mapper/vg-vservers none luks diff --git a/files/etc/crypttab/laptop b/files/etc/crypttab/laptop deleted file mode 100644 index 3166fbd..0000000 --- a/files/etc/crypttab/laptop +++ /dev/null @@ -1,5 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -home /dev/mapper/vg-home none luks,keyscript=decrypt_keyctl -var /dev/mapper/vg-var none luks,keyscript=decrypt_keyctl -swap /dev/mapper/swap /dev/random swap,aes-xts-plain64:sha256 diff --git a/files/etc/crypttab/laptop.hibernate b/files/etc/crypttab/laptop.hibernate deleted file mode 100644 index 42f5937..0000000 --- a/files/etc/crypttab/laptop.hibernate +++ /dev/null @@ -1,5 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -home /dev/mapper/vg-home none luks -var /dev/mapper/vg-var none luks -swap /dev/mapper/swap none luks,swap diff --git a/files/etc/crypttab/removable b/files/etc/crypttab/removable deleted file mode 100644 index df6f8a9..0000000 --- a/files/etc/crypttab/removable +++ /dev/null @@ -1,5 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -#home /dev/mapper/vg-home none luks -#var /dev/mapper/vg-var none luks -#swap /dev/mapper/vg-swap /dev/random swap,cipher=aes-xts-plain64:sha256 diff --git a/files/etc/crypttab/server b/files/etc/crypttab/server deleted file mode 100644 index a7ec64a..0000000 --- a/files/etc/crypttab/server +++ /dev/null @@ -1,4 +0,0 @@ -# <target name> <source device> <key file> <options> -root /dev/mapper/vg-root none luks -swap /dev/mapper/vg-swap /dev/random swap,cipher=aes-xts-plain64:sha256 -vservers /dev/mapper/vg-vservers none luks diff --git a/files/etc/default/rrdcached b/files/etc/default/rrdcached deleted file mode 100644 index 43d4ac8..0000000 --- a/files/etc/default/rrdcached +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/default/rrdcached - -# 0: start rrdcached on boot, 1: do not start rrdcached on boot -# default: 0 -DISABLE=0 - -# options to be passed to rrdcached -# (do not specify -p <pidfile> - this is handled by the init script) -# default: see /etc/init.d/rrdcached -#OPTS="" -OPTS="-s munin -l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/munin/ -B -w 1800 -z 1800 -f 3600" - -# number of seconds to wait for rrdcached to shut down -# (writing the data to disk may take some time; -# tune this according to your setup) -# default: 30 -MAXWAIT=30 - -# 0: do not enable core-files, 1: enable core-files ... if rrdcached crashes -# default: 0 -ENABLE_COREFILES=0 - diff --git a/files/etc/gdm/gdm.conf b/files/etc/gdm/gdm.conf deleted file mode 100644 index adea354..0000000 --- a/files/etc/gdm/gdm.conf +++ /dev/null @@ -1,85 +0,0 @@ -# GDM Custom Configuration file. -# -# This file is the appropriate place for specifying your customizations to the -# GDM configuration. If you run gdmsetup, it will automatically edit this -# file for you and will cause the daemon and any running GDM GUI programs to -# automatically update with the new configuration. Not all configuration -# options are supported by gdmsetup, so to modify some values it may be -# necessary to modify this file directly by hand. -# -# This file overrides the default configuration settings. These settings -# are stored in the GDM System Defaults configuration file, which is found -# at the following location. -# -# /usr/share/gdm/defaults.conf. -# -# This file contains comments about the meaning of each configuration option, -# so is also a useful reference. Also refer to the documentation links at -# the end of this comment for further information. In short, to hand-edit -# this file, simply add or modify the key=value combination in the -# appropriate section in the template below this comment section. -# -# For example, if you want to specify a different value for the Enable key -# in the "[debug]" section of your GDM System Defaults configuration file, -# then add "Enable=true" in the "[debug]" section of this file. If the -# key already exists in this file, then simply modify it. -# -# Older versions of GDM used the "gdm.conf" file for configuration. If your -# system has an old gdm.conf file on the system, it will be used instead of -# this file - so changes made to this file will not take effect. Consider -# migrating your configuration to this file and removing the gdm.conf file. -# -# If you hand edit a GDM configuration file, you can run the following -# command and the GDM daemon will immediately reflect the change. Any -# running GDM GUI programs will also be notified to update with the new -# configuration. -# -# gdmflexiserver --command="UPDATE_CONFIG <configuration key>" -# -# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". -# -# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and -# re-read the new configuration settings. You can also restart GDM by sending -# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes -# any user session started by GDM to exit immediately while USR1 behaves like -# gdm-safe-restart and will wait until all users log out before restarting GDM. -# -# For full reference documentation see the gnome help browser under -# GNOME|System category. You can also find the docs in HTML form on -# http://www.gnome.org/projects/gdm/ -# -# NOTE: Lines that begin with "#" are considered comments. -# -# Have fun! - -[daemon] - -[security] - -[xdmcp] - -[gui] - -[greeter] - -GraphicalTheme=Tuxtastic -GraphicalThemes=crunchbang/:Tuxtastic -Browser=false -GraphicalThemedColor=#000000 - -[chooser] - -[debug] - -# Note that to disable servers defined in the GDM System Defaults -# configuration file (such as 0=Standard, you must put a line in this file -# that says 0=inactive, as described in the Configuration section of the GDM -# documentation. -# -[servers] - -# Also note, that if you redefine a [server-foo] section, then GDM will -# use the definition in this file, not the GDM System Defaults configuration -# file. It is currently not possible to disable a [server-foo] section -# defined in the GDM System Defaults configuration file. -# diff --git a/files/etc/gdm/themes/Tuxtastic/GdmGreeterTheme.desktop b/files/etc/gdm/themes/Tuxtastic/GdmGreeterTheme.desktop deleted file mode 100644 index b20a0c7..0000000 --- a/files/etc/gdm/themes/Tuxtastic/GdmGreeterTheme.desktop +++ /dev/null @@ -1,11 +0,0 @@ -# This is not really a .desktop file like the rest, but it's useful to treat -# it as such - -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=gdm.xml -Name=Tuxtastic GDM v1.0 -Description=Tuxtastic GDM Theme, see README for all credits. -Author=Allan Garcia -Copyright=(c) 2009 by Allan Garcia (GPLv2), see LICENSE for all terms. -Screenshot=screenshot.png diff --git a/files/etc/gdm/themes/Tuxtastic/INSTALL b/files/etc/gdm/themes/Tuxtastic/INSTALL deleted file mode 100644 index e938298..0000000 --- a/files/etc/gdm/themes/Tuxtastic/INSTALL +++ /dev/null @@ -1 +0,0 @@ -Use 'gdmsetup' to install. diff --git a/files/etc/gdm/themes/Tuxtastic/LICENSE b/files/etc/gdm/themes/Tuxtastic/LICENSE deleted file mode 100644 index 30c2c2b..0000000 --- a/files/etc/gdm/themes/Tuxtastic/LICENSE +++ /dev/null @@ -1,279 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - diff --git a/files/etc/gdm/themes/Tuxtastic/README b/files/etc/gdm/themes/Tuxtastic/README deleted file mode 100644 index 98234f1..0000000 --- a/files/etc/gdm/themes/Tuxtastic/README +++ /dev/null @@ -1,31 +0,0 @@ -Tuxtastic GDM v1.0 -This is a GDM Theme with Tuxtastic background. - -Copyright (C) 2009 Allan David Garcia (allan.garcia@gmail.com) -http://www.adgsolucoes.com.br/ - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -CREDITS -------- - -Tuxtastic background for Henrique C. Alves (hcarvalhoalves@gmail.com) -http://hcalves.tumblr.com/ -See more of his work at: http://hcalves.deviantart.com/ - -GDM adaptation for Allan D. Garcia (allan.garcia@gmail.com) -http://www.adgsolucoes.com.br/ - diff --git a/files/etc/gdm/themes/Tuxtastic/background.png b/files/etc/gdm/themes/Tuxtastic/background.png Binary files differdeleted file mode 100644 index 3574420..0000000 --- a/files/etc/gdm/themes/Tuxtastic/background.png +++ /dev/null diff --git a/files/etc/gdm/themes/Tuxtastic/blend.png b/files/etc/gdm/themes/Tuxtastic/blend.png Binary files differdeleted file mode 100644 index 451006e..0000000 --- a/files/etc/gdm/themes/Tuxtastic/blend.png +++ /dev/null diff --git a/files/etc/gdm/themes/Tuxtastic/gdm.xml b/files/etc/gdm/themes/Tuxtastic/gdm.xml deleted file mode 100644 index c280d1c..0000000 --- a/files/etc/gdm/themes/Tuxtastic/gdm.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> - -<greeter> - - <!-- - The Background - --> - <item type="pixmap"> - <normal file="background.png" alpha="1"/> - <pos x="0" y="0" width="100%" height="100%"/> - </item> - - <!-- - The Date and Time - --> - <item type="pixmap"> - <normal file="blend.png" alpha="1"/> - <pos x="50%" y="0" anchor="c"/> - </item> - <item type="rect"> - <pos x="50%" y="22" width="box" height="box" anchor="c"/> - <box xpadding="0" ypadding="0" spacing="5" orientation="horizontal"> - <item type="label" id="hostname"> - <normal color="#ffffff" font="Sans 12" alpha="1"/> - <!--<text>%h</text>--> - <text>Welcome</text> - </item> - <item type="label" id="at"> - <normal color="#ffffff" font="Sans 12" alpha="1"/> - <!--<text>@</text>--> - <text>-</text> - </item> - <item type="label" id="clock"> - <normal color="#ffffff" font="Sans 12" alpha="1"/> - <text>%c</text> - </item> - </box> - </item> - - <!-- - The Login - --> - <item type="rect"> - <pos x="50%" y="80%" width="box" height="box" anchor="c"/> - <box xpadding="0" ypadding="0" spacing="5" orientation="vertical"> - <item type="pixmap"> - <normal file="input.png"/> - <pos width="252" height="27"/> - <fixed> - <item type="entry" id="user-pw-entry"> - <normal color="#222222" font="Sans 12"/> - <pos y="5" x="5" width="-10" height="-10" anchor="nw"/> - </item> - </fixed> - </item> - <item type="label" id="userpw"> - <pos x="50%" y="50%" anchor="c"/> - <normal color="#ffffff" font="Sans 8" alpha="0.8"/> - <text>Please, enter your login and password.</text> - </item> - </box> - </item> - - <item type="rect" id="caps-lock-warning"> - <pos x="50%" y="70%" width="box" height="box" anchor="c"/> - <box xpadding="0" ypadding="0" spacing="5" orientation="vertical"> - <item type="label"> - <normal color="#99cccc" font="Sans Bold 8" alpha="0.8"/> - <text>Caps-lock is ON!</text> - </item> - <item type="label"> - <normal color="#99cccc" font="Sans Bold 8" alpha="0.8"/> - <text>Login and password are case-sensitive.</text> - </item> - </box> - </item> - - <item type="rect" id="pam-error"> - <pos x="50%" y="90%" width="box" height="box" anchor="c"/> - <box xpadding="0" ypadding="0" spacing="5" orientation="vertical"> - <item type="label" id="pam-error"> - <normal color="#ffffff" font="Sans Bold 8"/> - <pos x="50%" anchor="c"/> - <text/> - </item> - </box> - </item> - - <!-- - The Timed Login - --> - <item type="rect" id="timed-rect"> - <show type="timed"/> - <normal color="#99cccc" alpha="0.8"/> - <pos x="50%" y="40%" width="box" height="box" anchor="c"/> - <box xpadding="0" ypadding="0" spacing="5" orientation="vertical"> - <item type="label" id="timed-label"> - <normal color="#ffffff" font="Sans Bold 8"/> - <pos x="50%" anchor="c"/> - <stock type="timed-label"/> - </item> - </box> - </item> - - <item type="label" id="pam-message"> - <pos x="50%" anchor="c"/> - <normal alpha="0.00"/> - <text/> - </item> - -</greeter> - - diff --git a/files/etc/gdm/themes/Tuxtastic/input.png b/files/etc/gdm/themes/Tuxtastic/input.png Binary files differdeleted file mode 100644 index ffdba78..0000000 --- a/files/etc/gdm/themes/Tuxtastic/input.png +++ /dev/null diff --git a/files/etc/gdm/themes/Tuxtastic/screenshot.png b/files/etc/gdm/themes/Tuxtastic/screenshot.png Binary files differdeleted file mode 100644 index b60812a..0000000 --- a/files/etc/gdm/themes/Tuxtastic/screenshot.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/GdmGreeterTheme.desktop b/files/etc/gdm/themes/crunchbang/GdmGreeterTheme.desktop deleted file mode 100644 index 864282d..0000000 --- a/files/etc/gdm/themes/crunchbang/GdmGreeterTheme.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[GdmGreeterTheme] -Greeter=crunchbang.xml -Name=crunchbang -Description=GDM theme -Author=Armando Macchia "armaskywalker" <armaskywalker@gmail.com> -Copyright=(c) 2011 Armando Macchia http://armaskywalker.altervista.org/ -Screenshot=screenshot.jpg diff --git a/files/etc/gdm/themes/crunchbang/act_off.png b/files/etc/gdm/themes/crunchbang/act_off.png Binary files differdeleted file mode 100644 index a5e2824..0000000 --- a/files/etc/gdm/themes/crunchbang/act_off.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/act_on.png b/files/etc/gdm/themes/crunchbang/act_on.png Binary files differdeleted file mode 100644 index 972f993..0000000 --- a/files/etc/gdm/themes/crunchbang/act_on.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/crunchbang.xml b/files/etc/gdm/themes/crunchbang/crunchbang.xml deleted file mode 100644 index b7763a9..0000000 --- a/files/etc/gdm/themes/crunchbang/crunchbang.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> - -<!-- -Based On FreeSansGrrl GDM theme -==================== -version 0.2 (26. Jan 2008) - -(c) 2006 by Simon Rei <simon AT verdammtsexy.com> - Published under the terms of the GNU General Public License, version 2 - -(c) 2008 by Giuseppe Pantanetti <gpantanetti AT gmail.com> - Published under the terms of the GNU General Public License, version 2 - -(c) 2011 by Armando Macchia <armaskywalker AT gmail.com> - Published under the terms of the GNU General Public License, version 2 - - ChangeLog: - 0.3 (19.11.2011) - -Changed colors - -New image create with the GIMP with hinting - - 0.2 (26.01.2008): - - Changed colors to match tango palette - - Some global rewrite of the code - - New pixmap images with FreeSans font and tango palette - - 0.1 (29.11.2006): - - initial version from RastaGrrl by Simon Rei <simon AT verdammtsexy.com> - check http://www.gnome-look.org/content/show.php/RastaGrrl+GDM?content=49382 ---> - - <greeter> - - <!-- background --> - <item type="rect"> - <normal color="#000000"/> - <pos y="0" x="0" width="100%" height="100%"/> - </item> - - <!-- container for the buttons --> - <item type="rect"> - <pos x="50%" y="45%" width="180" height="80" anchor="ne"/> - <box orientation="vertical"> - - <item type="rect"> - <pos x="0" y="0" height="0" anchor="w"/> - <normal color="#000000"/> - </item> - - <item type="pixmap" id="welcome-label"> - <pos x="0" y="0" anchor="nw"/> - <normal file="login.png"/> - </item> - - <item type="rect"> - <pos x="0" y="10" width="180" height="40" anchor="nw"/> - <box homogeneous="true"> - <item type="pixmap" button="true" id="language_button"> - <pos x="0" y="0" anchor="nw"/> - <normal file="lang_off.png"/> - <prelight file="lang_on.png"/> - </item> - - <item type="pixmap" button="true" id="session_button"> - <pos x="0" y="0" anchor="nw"/> - <normal file="sess_off.png"/> - <prelight file="sess_on.png"/> - </item> - - <!-- button, system (only console mode) --> - <item type="pixmap" button="true" id="system_button"> - <show modes="console-fixed"/> - <pos x="0" y="0" anchor="nw"/> - <normal file="act_off.png"/> - <prelight file="act_on.png"/> - </item> - - <!-- button, disconnect (only remote,flexi mode) --> - <item type="pixmap" button="true" id="disconnect_button"> - <show modes="remote,flexi"/> - <pos x="0" y="0" anchor="nw"/> - <normal file="quit_off.png"/> - <prelight file="quit_on.png"/> - </item> - </box> - </item> - </box> - </item> - - <item type="rect"> - <pos x="50%" y="45%" width="200" height="100" anchor="nw"/> - <box orientation="vertical"> - - <!-- username label --> - <item type="label" id="pam-prompt"> - <pos x="0" y="0" width="120" height="15" anchor="nw"/> - <normal font="FreeSans Bold 8" color="#eeeeec"/> - <stock type="username-label"/> - </item> - - <!-- user-pw-entry --> - <item type="entry" id="user-pw-entry"> - <pos x="0" y="0" width="160" height="22" anchor="nw"/> - <normal font="FreeSans Bold 16" color="#555753"/> - </item> - - <!-- pam-error (login failure etc.) --> - <item type="label" id="pam-error"> - <normal color="#eeeeec" font="FreeSans 10"/> - <pos x="0" y="10" width="200" anchor="nw"/> - <text></text> - </item> - - </box> - </item> - - <!-- caps-lock-warning --> - <item type="rect" id="caps-lock-warning"> - <normal color="#eeeeec" alpha="0.2"/> - <pos x="0" y="40%" width="100%" height="box" anchor="sw"/> - <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#eeeeec" font="FreeSans Bold 10"/> - <pos x="50%" y="50%" anchor="c"/> - <stock type="caps-lock-warning"/> - </item> - </box> - </item> - - </greeter> - diff --git a/files/etc/gdm/themes/crunchbang/lang_off.png b/files/etc/gdm/themes/crunchbang/lang_off.png Binary files differdeleted file mode 100644 index 8fa3d8c..0000000 --- a/files/etc/gdm/themes/crunchbang/lang_off.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/lang_on.png b/files/etc/gdm/themes/crunchbang/lang_on.png Binary files differdeleted file mode 100644 index e0c837a..0000000 --- a/files/etc/gdm/themes/crunchbang/lang_on.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/login.png b/files/etc/gdm/themes/crunchbang/login.png Binary files differdeleted file mode 100644 index c23ca21..0000000 --- a/files/etc/gdm/themes/crunchbang/login.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/quit_off.png b/files/etc/gdm/themes/crunchbang/quit_off.png Binary files differdeleted file mode 100644 index 3ff2ef2..0000000 --- a/files/etc/gdm/themes/crunchbang/quit_off.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/quit_on.png b/files/etc/gdm/themes/crunchbang/quit_on.png Binary files differdeleted file mode 100644 index 6b2b58d..0000000 --- a/files/etc/gdm/themes/crunchbang/quit_on.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/screenshot.jpg b/files/etc/gdm/themes/crunchbang/screenshot.jpg Binary files differdeleted file mode 100644 index 05161aa..0000000 --- a/files/etc/gdm/themes/crunchbang/screenshot.jpg +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/sess_off.png b/files/etc/gdm/themes/crunchbang/sess_off.png Binary files differdeleted file mode 100644 index e41ff06..0000000 --- a/files/etc/gdm/themes/crunchbang/sess_off.png +++ /dev/null diff --git a/files/etc/gdm/themes/crunchbang/sess_on.png b/files/etc/gdm/themes/crunchbang/sess_on.png Binary files differdeleted file mode 100644 index 97a748c..0000000 --- a/files/etc/gdm/themes/crunchbang/sess_on.png +++ /dev/null diff --git a/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop b/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop deleted file mode 100644 index 357d11c..0000000 --- a/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop +++ /dev/null @@ -1,11 +0,0 @@ -# This is not really a .desktop file like the rest, but it's useful to treat -# it as such - -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=dasUberMini.xml -Name=Das Uber Mini -Description=Can it be more minimal? -Author=Ryan A. Johnson (CITguy) -Copyright=(c) 2009 Ryan A. Johnson (CITguy) -Screenshot=screenshot.png diff --git a/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop~ b/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop~ deleted file mode 100644 index c828528..0000000 --- a/files/etc/gdm/themes/dasUberMini/GdmGreeterTheme.desktop~ +++ /dev/null @@ -1,11 +0,0 @@ -# This is not really a .desktop file like the rest, but it's useful to treat -# it as such - -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=das_mini.xml -Name=Das Mini -Description=Uber Minimalist Theme\nI dare you to make one more minimal. -Author=Ryan A. Johnson (CITguy) -Copyright=(c) 2009 Ryan A. Johnson (CITguy) -Screenshot=screenshot.png diff --git a/files/etc/gdm/themes/dasUberMini/README.txt b/files/etc/gdm/themes/dasUberMini/README.txt deleted file mode 100644 index 8bf3d83..0000000 --- a/files/etc/gdm/themes/dasUberMini/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -INFORMATION: --------------------------------------------------------------------------------- - NAME: "Das Uber Mini" - DATE: June 8, 2009 - VERSION: 1.0 - AUTHOR: Ryan Johnson (CITguy) (rhino.citguy@gmail.com) - Copyright 2009 Ryan Johnson (GPLv3) - --------------------------------------------------------------------------------- - - A copy of the GPLv3 should be included with the contents of this archive. - If not, please visit the following URL to review the license. - - http://www.gnu.org/licenses/gpl-3.0.html - --------------------------------------------------------------------------------- diff --git a/files/etc/gdm/themes/dasUberMini/bluefish.xml~ b/files/etc/gdm/themes/dasUberMini/bluefish.xml~ deleted file mode 100644 index 80753bc..0000000 --- a/files/etc/gdm/themes/dasUberMini/bluefish.xml~ +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<!-- INFORMATION - NAME: "Das Mini" - DATE: March 10, 2009 - VERSION: 1.0 - AUTHOR: Ryan Johnson (CITguy) (rhino.citguy@gmail.com) - Copyright Ryan Johnson 2009 (GPLv3) ---> -<greeter> - - <!-- BLACK BACKGROUND --> - <item type="rect" background="true"> - <pos x="0" y="0" width="100%" height="100%" /> - <normal color="#000000" alpha="1.0" /> - </item> - - <!-- Text Entry for Login --> - <item type="entry" id="user-pw-entry"> - <pos anchor="w" x="50%" y="50%" width="200" height="30" /> - <normal color="#ffffff" font="FreeSans 20" /> - </item> - - <!-- The PSEUDO Command Prompt is an OPTIONS BUTTON! --> - <item type="label" id="options_button" button="true"> - <pos anchor="e" x="49%" y="50%" /> - <normal color="#ffffff" font="FreeSans Bold 20" alpha="1.0" /> - <prelight color="#ff0000" font="FreeSans Bold 20" alpha="1.0" /> - <text xml:lang="en">[%h]~$</text> - </item> - - <!-- CAPS LOCK WARNING --> - <item type="label" id="caps-lock-warning"> - <pos anchor="w" x="50%" y="55%" /> - <normal color="#FF0000" font="FreeSans Bold 12" /> - <text xml:lang="en">Caps Lock is ON</text> - </item> - -</greeter>
\ No newline at end of file diff --git a/files/etc/gdm/themes/dasUberMini/dasUberMini.xml b/files/etc/gdm/themes/dasUberMini/dasUberMini.xml deleted file mode 100644 index 51eca3d..0000000 --- a/files/etc/gdm/themes/dasUberMini/dasUberMini.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<!-- INFORMATION - NAME: "Das Uber Mini" - DATE: June 8, 2009 - VERSION: 1.0 - AUTHOR: Ryan Johnson (CITguy) (rhino.citguy@gmail.com) - Copyright Ryan Johnson 2009 (GPLv3) ---> -<greeter> - - <!-- BLACK BACKGROUND --> - <!-- - The entire background is a button for options. - Here's the kicker, the options button appears above the last instance of the options_button id (which is the rectangle behind the prompt). - --> - <item type="rect" background="true" id="options_button" button="true"> - <pos x="50%" y="50%" width="100%" height="100%" anchor="c" /> - <normal color="#000000" alpha="1.0" /> - </item> - <!-- Text Entry for Login --> - - <item type="entry" id="user-pw-entry"> - <pos anchor="nw" x="2%" y="2%" width="96%" height="30" /> - <normal color="#ffffff" font="FreeSans 20" /> - </item> - <item type="rect" id="options_button" button="true"> - <pos anchor="w" x="2%" y="2%" width="96%" height="30" /> - <normal color="#ff0000" alpha="0.0" /> - </item> - - -</greeter>
\ No newline at end of file diff --git a/files/etc/gdm/themes/dasUberMini/das_mini.xml~ b/files/etc/gdm/themes/dasUberMini/das_mini.xml~ deleted file mode 100644 index 80753bc..0000000 --- a/files/etc/gdm/themes/dasUberMini/das_mini.xml~ +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<!-- INFORMATION - NAME: "Das Mini" - DATE: March 10, 2009 - VERSION: 1.0 - AUTHOR: Ryan Johnson (CITguy) (rhino.citguy@gmail.com) - Copyright Ryan Johnson 2009 (GPLv3) ---> -<greeter> - - <!-- BLACK BACKGROUND --> - <item type="rect" background="true"> - <pos x="0" y="0" width="100%" height="100%" /> - <normal color="#000000" alpha="1.0" /> - </item> - - <!-- Text Entry for Login --> - <item type="entry" id="user-pw-entry"> - <pos anchor="w" x="50%" y="50%" width="200" height="30" /> - <normal color="#ffffff" font="FreeSans 20" /> - </item> - - <!-- The PSEUDO Command Prompt is an OPTIONS BUTTON! --> - <item type="label" id="options_button" button="true"> - <pos anchor="e" x="49%" y="50%" /> - <normal color="#ffffff" font="FreeSans Bold 20" alpha="1.0" /> - <prelight color="#ff0000" font="FreeSans Bold 20" alpha="1.0" /> - <text xml:lang="en">[%h]~$</text> - </item> - - <!-- CAPS LOCK WARNING --> - <item type="label" id="caps-lock-warning"> - <pos anchor="w" x="50%" y="55%" /> - <normal color="#FF0000" font="FreeSans Bold 12" /> - <text xml:lang="en">Caps Lock is ON</text> - </item> - -</greeter>
\ No newline at end of file diff --git a/files/etc/gdm/themes/dasUberMini/gplv3.pdf b/files/etc/gdm/themes/dasUberMini/gplv3.pdf Binary files differdeleted file mode 100755 index 0602e68..0000000 --- a/files/etc/gdm/themes/dasUberMini/gplv3.pdf +++ /dev/null diff --git a/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc b/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc deleted file mode 100644 index 9e56c9e..0000000 --- a/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc +++ /dev/null @@ -1,29 +0,0 @@ -# GDM Theme: -# "Das Mini" -# -# Author: -# Ryan Johnson <rhino.citguy@gmail.com> -# -# Feel free to modify and share! - -gtk_color_scheme="text_color_norm:#FFFFFF -text_color_insensitive:#777777 -widget_base_norm:#000000 -widget_base_insensitive:#000000" - -style "login_prompt" -{ - text[NORMAL] = @text_color_norm - base[NORMAL] = @widget_base_norm - - text[ACTIVE] = @text_color_norm - base[ACTIVE] = @widget_base_norm - - text[PRELIGHT] = @text_color_norm - base[PRELIGHT] = @widget_base_norm - - text[INSENSITIVE] = @text_color_insensitive - base[INSENSITIVE] = @widget_base_insensitive - -} -class "GtkEntry" style "login_prompt" diff --git a/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc~ b/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc~ deleted file mode 100644 index 9e56c9e..0000000 --- a/files/etc/gdm/themes/dasUberMini/gtk-2.0/gtkrc~ +++ /dev/null @@ -1,29 +0,0 @@ -# GDM Theme: -# "Das Mini" -# -# Author: -# Ryan Johnson <rhino.citguy@gmail.com> -# -# Feel free to modify and share! - -gtk_color_scheme="text_color_norm:#FFFFFF -text_color_insensitive:#777777 -widget_base_norm:#000000 -widget_base_insensitive:#000000" - -style "login_prompt" -{ - text[NORMAL] = @text_color_norm - base[NORMAL] = @widget_base_norm - - text[ACTIVE] = @text_color_norm - base[ACTIVE] = @widget_base_norm - - text[PRELIGHT] = @text_color_norm - base[PRELIGHT] = @widget_base_norm - - text[INSENSITIVE] = @text_color_insensitive - base[INSENSITIVE] = @widget_base_insensitive - -} -class "GtkEntry" style "login_prompt" diff --git a/files/etc/gdm/themes/dasUberMini/screenshot.png b/files/etc/gdm/themes/dasUberMini/screenshot.png Binary files differdeleted file mode 100644 index c7a4a62..0000000 --- a/files/etc/gdm/themes/dasUberMini/screenshot.png +++ /dev/null diff --git a/files/etc/gdm/themes/dasUberMini/screenshot2.png b/files/etc/gdm/themes/dasUberMini/screenshot2.png Binary files differdeleted file mode 100644 index a61990f..0000000 --- a/files/etc/gdm/themes/dasUberMini/screenshot2.png +++ /dev/null diff --git a/files/etc/gdm3/greeter.gsettings b/files/etc/gdm3/greeter.gsettings deleted file mode 100644 index 19ba7de..0000000 --- a/files/etc/gdm3/greeter.gsettings +++ /dev/null @@ -1,57 +0,0 @@ -# These are the options for the greeter session that can be set -# through GSettings. Any GSettings setting that is used by the -# greeter session can be set here. - - -# Theming options -# =============== -# - Change the GTK+ theme -# [org.gnome.desktop.interface] -# gtk-theme='Adwaita' -# - Use another background -# [org.gnome.desktop.background] -# picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg' -# picture-options='zoom' -# - Or no background at all -# [org.gnome.desktop.background] -# picture-options='none' -# primary-color='#000000' - -# Greeter session choice -# ====================== -# Use 'gdm-shell' for the GNOME Shell version. -# Never use anything not starting with 'gdm-'. -[org.gnome.desktop.session] -session-name='gdm-fallback' -# session-name='gdm-shell' - -# Login manager options -# ===================== -[org.gnome.login-screen] -logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png' -fallback-logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png' - -# - Disable user list -disable-user-list=true -# - Disable restart buttons -# disable-restart-buttons=true -# - Show a login welcome message -# banner-message-enable=true -# banner-message-text='Welcome' - -# Prevent the power management icon from showing up -[org.gnome.power-manager] -icon-policy='never' - -# Disabling sound in the greeter -#[org.gnome.desktop.sound] -#event-sounds=false - -# The metacity compositor doesn’t go well with the greeter -# so just to be sure -[org.gnome.metacity] -compositing-manager=false - -# No workspaces -[org.gnome.desktop.wm.preferences] -num-workspaces=1 diff --git a/files/etc/pam.d/gdm b/files/etc/pam.d/gdm deleted file mode 100644 index c8c9888..0000000 --- a/files/etc/pam.d/gdm +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so readenv=1 -auth required pam_env.so readenv=1 envfile=/etc/default/locale -@include common-auth -auth optional pam_gnome_keyring.so -@include common-account -session required pam_limits.so -@include common-session -session optional pam_gnome_keyring.so auto_start -@include common-password -@include common-pammount diff --git a/files/etc/pam.d/login.lenny b/files/etc/pam.d/login.lenny deleted file mode 100644 index fd498c4..0000000 --- a/files/etc/pam.d/login.lenny +++ /dev/null @@ -1,84 +0,0 @@ -# -# The PAM configuration file for the Shadow `login' service -# - -# Enforce a minimal delay in case of failure (in microseconds). -# (Replaces the `FAIL_DELAY' setting from login.defs) -# Note that other modules may require another minimal delay. (for example, -# to disable any delay, you should add the nodelay option to pam_unix) -auth optional pam_faildelay.so delay=3000000 - -# Outputs an issue file prior to each login prompt (Replaces the -# ISSUE_FILE option from login.defs). Uncomment for use -# auth required pam_issue.so issue=/etc/issue - -# Disallows root logins except on tty's listed in /etc/securetty -# (Replaces the `CONSOLE' setting from login.defs) -auth [success=ok ignore=ignore user_unknown=ignore default=die] pam_securetty.so - -# Disallows other than root logins when /etc/nologin exists -# (Replaces the `NOLOGINS_FILE' option from login.defs) -auth requisite pam_nologin.so - -# This module parses environment configuration file(s) -# and also allows you to use an extended config -# file /etc/security/pam_env.conf. -# -# parsing /etc/environment needs "readenv=1" -session required pam_env.so readenv=1 -# locale variables are also kept into /etc/default/locale in etch -# reading this file *in addition to /etc/environment* does not hurt -session required pam_env.so readenv=1 envfile=/etc/default/locale - -# Standard Un*x authentication. -@include common-auth - -# This allows certain extra groups to be granted to a user -# based on things like time of day, tty, service, and user. -# Please edit /etc/security/group.conf to fit your needs -# (Replaces the `CONSOLE_GROUPS' option in login.defs) -auth optional pam_group.so - -# Uncomment and edit /etc/security/time.conf if you need to set -# time restrainst on logins. -# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs -# as well as /etc/porttime) -# account requisite pam_time.so - -# Uncomment and edit /etc/security/access.conf if you need to -# set access limits. -# (Replaces /etc/login.access file) -# account required pam_access.so - -# Sets up user limits according to /etc/security/limits.conf -# (Replaces the use of /etc/limits in old login) -session required pam_limits.so - -# Prints the last login info upon succesful login -# (Replaces the `LASTLOG_ENAB' option from login.defs) -session optional pam_lastlog.so - -# Prints the motd upon succesful login -# (Replaces the `MOTD_FILE' option in login.defs) -session optional pam_motd.so - -# Prints the status of the user's mailbox upon succesful login -# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). -# -# This also defines the MAIL environment variable -# However, userdel also needs MAIL_DIR and MAIL_FILE variables -# in /etc/login.defs to make sure that removing a user -# also removes the user's mail spool file. -# See comments in /etc/login.defs -session optional pam_mail.so standard - -# SELinux needs to intervene at login time to ensure that the process -# starts in the proper default security context. -# Uncomment the following line to enable SELinux -# session required pam_selinux.so select_context - -# Standard Un*x account and session -@include common-account -@include common-session -@include common-password -@include common-pammount diff --git a/files/etc/pam.d/login.squeeze b/files/etc/pam.d/login.squeeze deleted file mode 100644 index 47bf6f6..0000000 --- a/files/etc/pam.d/login.squeeze +++ /dev/null @@ -1,108 +0,0 @@ -# -# The PAM configuration file for the Shadow `login' service -# - -# Enforce a minimal delay in case of failure (in microseconds). -# (Replaces the `FAIL_DELAY' setting from login.defs) -# Note that other modules may require another minimal delay. (for example, -# to disable any delay, you should add the nodelay option to pam_unix) -auth optional pam_faildelay.so delay=3000000 - -# Outputs an issue file prior to each login prompt (Replaces the -# ISSUE_FILE option from login.defs). Uncomment for use -# auth required pam_issue.so issue=/etc/issue - -# Disallows root logins except on tty's listed in /etc/securetty -# (Replaces the `CONSOLE' setting from login.defs) -# -# With the default control of this module: -# [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] -# root will not be prompted for a pasword on insecure lines. -# if an invalid username is entered, a password is prompted (but login -# will eventually be rejected) -# -# You can change it to a "requisite" module if you think root may mis-type -# her login and should not be prompted for a password in that case. But -# this will leave the system as vulnerable to user enumeration attacks. -# -# You can change it to a "required" module if you think it permits to -# guess valid user names of your system (invalid user names are considered -# as possibly being root on insecure lines), but root passwords may be -# communicated over insecure lines. -auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so - -# Disallows other than root logins when /etc/nologin exists -# (Replaces the `NOLOGINS_FILE' option from login.defs) -auth requisite pam_nologin.so - -# SELinux needs to be the first session rule. This ensures that any -# lingering context has been cleared. Without out this it is possible -# that a module could execute code in the wrong domain. -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close - -# This module parses environment configuration file(s) -# and also allows you to use an extended config -# file /etc/security/pam_env.conf. -# -# parsing /etc/environment needs "readenv=1" -session required pam_env.so readenv=1 -# locale variables are also kept into /etc/default/locale in etch -# reading this file *in addition to /etc/environment* does not hurt -session required pam_env.so readenv=1 envfile=/etc/default/locale - -# Standard Un*x authentication. -@include common-auth - -# This allows certain extra groups to be granted to a user -# based on things like time of day, tty, service, and user. -# Please edit /etc/security/group.conf to fit your needs -# (Replaces the `CONSOLE_GROUPS' option in login.defs) -auth optional pam_group.so - -# Uncomment and edit /etc/security/time.conf if you need to set -# time restrainst on logins. -# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs -# as well as /etc/porttime) -# account requisite pam_time.so - -# Uncomment and edit /etc/security/access.conf if you need to -# set access limits. -# (Replaces /etc/login.access file) -# account required pam_access.so - -# Sets up user limits according to /etc/security/limits.conf -# (Replaces the use of /etc/limits in old login) -session required pam_limits.so - -# Prints the last login info upon succesful login -# (Replaces the `LASTLOG_ENAB' option from login.defs) -session optional pam_lastlog.so - -# Prints the motd upon succesful login -# (Replaces the `MOTD_FILE' option in login.defs) -session optional pam_motd.so - -# Prints the status of the user's mailbox upon succesful login -# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). -# -# This also defines the MAIL environment variable -# However, userdel also needs MAIL_DIR and MAIL_FILE variables -# in /etc/login.defs to make sure that removing a user -# also removes the user's mail spool file. -# See comments in /etc/login.defs -session optional pam_mail.so standard - -# Standard Un*x account and session -@include common-account -@include common-session -@include common-password -@include common-pammount - -# SELinux needs to intervene at login time to ensure that the process -# starts in the proper default security context. Only sessions which are -# intended to run in the user's context should be run after this. -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) diff --git a/files/etc/pam.d/login.wheezy b/files/etc/pam.d/login.wheezy deleted file mode 100644 index 6ac4fd7..0000000 --- a/files/etc/pam.d/login.wheezy +++ /dev/null @@ -1,107 +0,0 @@ -# -# The PAM configuration file for the Shadow `login' service -# - -# Enforce a minimal delay in case of failure (in microseconds). -# (Replaces the `FAIL_DELAY' setting from login.defs) -# Note that other modules may require another minimal delay. (for example, -# to disable any delay, you should add the nodelay option to pam_unix) -auth optional pam_faildelay.so delay=3000000 - -# Outputs an issue file prior to each login prompt (Replaces the -# ISSUE_FILE option from login.defs). Uncomment for use -# auth required pam_issue.so issue=/etc/issue - -# Disallows root logins except on tty's listed in /etc/securetty -# (Replaces the `CONSOLE' setting from login.defs) -# -# With the default control of this module: -# [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] -# root will not be prompted for a pasword on insecure lines. -# if an invalid username is entered, a password is prompted (but login -# will eventually be rejected) -# -# You can change it to a "requisite" module if you think root may mis-type -# her login and should not be prompted for a password in that case. But -# this will leave the system as vulnerable to user enumeration attacks. -# -# You can change it to a "required" module if you think it permits to -# guess valid user names of your system (invalid user names are considered -# as possibly being root on insecure lines), but root passwords may be -# communicated over insecure lines. -auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so - -# Disallows other than root logins when /etc/nologin exists -# (Replaces the `NOLOGINS_FILE' option from login.defs) -auth requisite pam_nologin.so - -# SELinux needs to be the first session rule. This ensures that any -# lingering context has been cleared. Without out this it is possible -# that a module could execute code in the wrong domain. -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close - -# This module parses environment configuration file(s) -# and also allows you to use an extended config -# file /etc/security/pam_env.conf. -# -# parsing /etc/environment needs "readenv=1" -session required pam_env.so readenv=1 -# locale variables are also kept into /etc/default/locale in etch -# reading this file *in addition to /etc/environment* does not hurt -session required pam_env.so readenv=1 envfile=/etc/default/locale - -# Standard Un*x authentication. -@include common-auth - -# This allows certain extra groups to be granted to a user -# based on things like time of day, tty, service, and user. -# Please edit /etc/security/group.conf to fit your needs -# (Replaces the `CONSOLE_GROUPS' option in login.defs) -auth optional pam_group.so - -# Uncomment and edit /etc/security/time.conf if you need to set -# time restrainst on logins. -# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs -# as well as /etc/porttime) -# account requisite pam_time.so - -# Uncomment and edit /etc/security/access.conf if you need to -# set access limits. -# (Replaces /etc/login.access file) -# account required pam_access.so - -# Sets up user limits according to /etc/security/limits.conf -# (Replaces the use of /etc/limits in old login) -session required pam_limits.so - -# Prints the last login info upon succesful login -# (Replaces the `LASTLOG_ENAB' option from login.defs) -session optional pam_lastlog.so - -# Prints the motd upon succesful login -# (Replaces the `MOTD_FILE' option in login.defs) -session optional pam_motd.so - -# Prints the status of the user's mailbox upon succesful login -# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). -# -# This also defines the MAIL environment variable -# However, userdel also needs MAIL_DIR and MAIL_FILE variables -# in /etc/login.defs to make sure that removing a user -# also removes the user's mail spool file. -# See comments in /etc/login.defs -session optional pam_mail.so standard - -# Standard Un*x account and session -@include common-account -@include common-session -@include common-password - -# SELinux needs to intervene at login time to ensure that the process -# starts in the proper default security context. Only sessions which are -# intended to run in the user's context should be run after this. -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) diff --git a/files/etc/profile.d/prompt.sh b/files/etc/profile.d/prompt.sh deleted file mode 100644 index 9e97ba2..0000000 --- a/files/etc/profile.d/prompt.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Fancy bash prompt. -# See http://www.debian-administration.org/article/Fancy_Bash_Prompts -# - -command_prompt() { - exit_status="$?" - # colors - COLOR_RED="\[\033[31m\]" - COLOR_GREEN="\[\033[32m\]" - COLOR_YELLOW="\[\033[33m\]" - COLOR_BLUE="\[\033[34m\]" - COLOR_MAGENTA="\[\033[35m\]" - COLOR_CYAN="\[\033[36m\]" - - COLOR_RED_BOLD="\[\033[31;1m\]" - COLOR_GREEN_BOLD="\[\033[32;1m\]" - COLOR_YELLOW_BOLD="\[\033[33;1m\]" - COLOR_BLUE_BOLD="\[\033[34;1m\]" - COLOR_MAGENTA_BOLD="\[\033[35;1m\]" - COLOR_CYAN_BOLD="\[\033[36;1m\]" - - COLOR_NONE="\[\033[0m\]" - BOLD="\[\033[1m\]" - - if [ "$exit_status" == "0" ]; then - status_color="${COLOR_GREEN}" - else - status_color="${COLOR_RED_BOLD}" - fi - - # Without git completion - #PS1="(${status_color}${exit_status}${COLOR_NONE}) [${COLOR_RED}\D{%Y%m%d %H:%M:%S}${COLOR_NONE}] ${COLOR_CYAN}${debian_chroot:+($debian_chroot) }${COLOR_NONE}${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \\$ " - - # Red green theme with git completion - #PS1="(${status_color}${exit_status}${COLOR_NONE}) [${COLOR_RED}\D{%Y%m%d %H:%M:%S}${COLOR_NONE}] ${COLOR_CYAN}${debian_chroot:+($debian_chroot) }${COLOR_NONE}${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w$(__git_ps1 " (%s)")${COLOR_NONE} \\$ " - #PS2="${BOLD}>${OFF} " - - # Yellow blue theme with git completion - PS1="${status_color}${exit_status}${COLOR_NONE} ${COLOR_CYAN}\D{%Y%m%d %H:%M:%S}${COLOR_NONE} ${COLOR_CYAN}${debian_chroot:+($debian_chroot) }${COLOR_NONE}${COLOR_YELLOW}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w$(__git_ps1 " (%s)")${COLOR_NONE} \\$ " - PS2="${BOLD}>${OFF} " -} - -PROMPT_COMMAND="command_prompt" diff --git a/files/etc/sysctl.d/madwifi.conf b/files/etc/sysctl.d/madwifi.conf deleted file mode 100644 index 5483318..0000000 --- a/files/etc/sysctl.d/madwifi.conf +++ /dev/null @@ -1,2 +0,0 @@ -dev.wifi0.ledpin=3 -dev.wifi0.softled=1 diff --git a/files/munin/apache.conf b/files/munin/apache.conf deleted file mode 100644 index 6224281..0000000 --- a/files/munin/apache.conf +++ /dev/null @@ -1,86 +0,0 @@ -# Enable this for template generation -Alias /munin /var/cache/munin/www - -# Enable this for cgi-based templates -#Alias /munin-cgi/static /var/cache/munin/www/static -#ScriptAlias /munin-cgi /usr/lib/munin/cgi/munin-cgi-html -#<Location /munin-cgi> -# Order allow,deny -# Allow from localhost 127.0.0.0/8 ::1 -# AuthUserFile /etc/munin/munin-htpasswd -# AuthName "Munin" -# AuthType Basic -# require valid-user -#</Location> - -<Directory /var/cache/munin/www> - #Order allow,deny - #Allow from localhost 127.0.0.0/8 ::1 - Options None - - # This file can be used as a .htaccess file, or a part of your apache - # config file. - # - # For the .htaccess file option to work the munin www directory - # (/var/cache/munin/www) must have "AllowOverride all" or something - # close to that set. - # - - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - - # This next part requires mod_expires to be enabled. - # - - # Set the default expiration time for files to 5 minutes 10 seconds from - # their creation (modification) time. There are probably new files by - # that time. - # - - <IfModule mod_expires.c> - ExpiresActive On - ExpiresDefault M310 - </IfModule> - -</Directory> - -# Enables fastcgi for munin-cgi-html if present -#<Location /munin-cgi> -# <IfModule mod_fastcgi.c> -# SetHandler fastcgi-script -# </IfModule> -#</Location> - -#<Location /munin-cgi/static> -# SetHandler None -#</Location> - -# Enables fastcgi for munin-cgi-graph if present -ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph -<Location /munin-cgi/munin-cgi-graph> - Order allow,deny - Allow from localhost 127.0.0.0/8 ::1 - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - <IfModule mod_fastcgi.c> - SetHandler fastcgi-script - </IfModule> -</Location> - -ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html -<Location /munin-cgi/munin-cgi-html> - Order allow,deny - Allow from localhost 127.0.0.0/8 ::1 - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - <IfModule mod_fastcgi.c> - SetHandler fastcgi-script - </IfModule> -</Location> - diff --git a/files/polkit/org.freedesktop.consolekit.policy b/files/polkit/org.freedesktop.consolekit.policy deleted file mode 100644 index 9e9fc1c..0000000 --- a/files/polkit/org.freedesktop.consolekit.policy +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - -<!-- -Policy definitions for ConsoleKit ---> - -<policyconfig> - - <action id="org.freedesktop.consolekit.system.stop"> - <description>Stop the system</description> - <message>System policy prevents stopping the system</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.consolekit.system.stop-multiple-users"> - <description>Stop the system when multiple users are logged in</description> - <message>System policy prevents stopping the system when other users are logged in</message> - <defaults> - <allow_inactive>no</allow_inactive> - <!--<allow_active>auth_admin_keep</allow_active>--> - <allow_active>yes</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.consolekit.system.restart"> - <description>Restart the system</description> - <message>System policy prevents restarting the system</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.consolekit.system.restart-multiple-users"> - <description>Restart the system when multiple users are logged in</description> - <message>System policy prevents restarting the system when other users are logged in</message> - <defaults> - <allow_inactive>no</allow_inactive> - <!--<allow_active>auth_admin_keep</allow_active>--> - <allow_active>yes</allow_active> - </defaults> - </action> - -</policyconfig> diff --git a/files/sound/devices.sh b/files/sound/devices.sh deleted file mode 100644 index b112082..0000000 --- a/files/sound/devices.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -VSERVER="$1" - -if [ -z "$VSERVER" ]; then - ROOT="/" -else - ROOT="/var/vservers/$1" -fi - -if [ "$2" == "--check" ]; then - if [ -e "$ROOT/dev/snd/controlC0" ]; then - exit 0 - else - exit 1 - fi -fi - -mkdir -p $ROOT/dev/snd -mknod $ROOT/dev/snd/controlC1 c 116 6 -mknod $ROOT/dev/snd/pcmC1D0c c 116 5 -mknod $ROOT/dev/snd/pcmC1D0p c 116 4 -mknod $ROOT/dev/snd/seq c 116 3 -mknod $ROOT/dev/snd/timer c 116 2 - -chown root:audio $ROOT/dev/snd/* -chmod 660 $ROOT/dev/snd/* - -if [ -z "$VSERVER" ]; then - chown -R root:audio /dev/snd -else - vserver $VSERVER exec chown -R root:audio /dev/snd -fi - -chmod 660 $ROOT/dev/snd/* diff --git a/files/terminfo/rxvt-256color b/files/terminfo/rxvt-256color Binary files differdeleted file mode 100644 index c50b2f8..0000000 --- a/files/terminfo/rxvt-256color +++ /dev/null diff --git a/manifests/base.pp b/manifests/base.pp index 6426219..f0a05d7 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -7,7 +7,6 @@ class nodo::base( # Then include our subsystems include nodo::subsystem::sudo include nodo::subsystem::locales - include nodo::subsystem::profile include nodo::subsystem::screen include nodo::subsystem::screen::startup include nodo::subsystem::backup @@ -17,39 +16,25 @@ class nodo::base( include nodo::subsystem::local # Apt module - $apt = hiera('nodo::subsystem::apt', True) - if $apt == true { - include nodo::subsystem::apt - } + #$apt = hiera('nodo::subsystem::apt', True) + #if $apt == true { + # include nodo::subsystem::apt + #} # Declare subsystem classes - class { [ 'nodo::subsystem::hosts', 'nodo::subsystem::motd' ]: } + #class { 'nodo::subsystem::hosts': } + class { 'nodo::subsystem::motd': } # Common utilities include nodo::utils # Other modules - include tunnel::autossh - include domain_check include concat::setup include cron + include shellprompt # Require admin accounts' class if (defined(site_users::admin)) { include site_users::admin } - - # Puppet - case $puppet_mode { - 'standalone': { include puppet::standalone } - 'daemon': { - class { 'puppet::daemon': - master => hiera('nodo::role::master::main', false), - } - } - default: { } - } - - # Does not work well inside vservers - #class { 'runit': ensure => absent } } diff --git a/manifests/base/appliance.pp b/manifests/base/appliance.pp index 3032479..982e589 100644 --- a/manifests/base/appliance.pp +++ b/manifests/base/appliance.pp @@ -1,7 +1,3 @@ class nodo::base::appliance inherits nodo::base::physical { class { 'nodo::subsystem::sysctl::appliance': } - - class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: - type => 'appliance', - } } diff --git a/manifests/base/desktop.pp b/manifests/base/desktop.pp index 7dd969c..8b03e6e 100644 --- a/manifests/base/desktop.pp +++ b/manifests/base/desktop.pp @@ -1,16 +1,3 @@ class nodo::base::desktop inherits nodo::base::personal { include nodo::utils::desktop - - class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: - type => 'desktop', - } - - # Allow regular users to power off the machine (overrides policy kit default configuration) - file { '/usr/share/polkit-1/actions/org.freedesktop.consolekit.policy': - ensure => present, - owner => root, - group => root, - mode => 0644, - source => 'puppet:///modules/nodo/polkit/org.freedesktop.consolekit.policy', - } } diff --git a/manifests/base/host.pp b/manifests/base/host.pp index 8cbf9d2..80eb936 100644 --- a/manifests/base/host.pp +++ b/manifests/base/host.pp @@ -14,17 +14,6 @@ class nodo::base::host { # Firewall class { 'firewall': } - # Vserver - if $::lsbdistcodename == 'squeeze' { - $vserver = hiera('nodo::host::use_vserver', True) - - if $vserver == true { - class { 'virtual::vserver::host': - vdirbase => "/var/vservers", - } - } - } - # Time $ntpdate = hiera('nodo::host::ntpdate', True) case $ntpdate { @@ -40,17 +29,4 @@ class nodo::base::host { #dombr => $::is_virtual, #dobios => $::is_virtual, } - - # Monitoring - if !defined(Class['nodo::subsystem::monitor']) { - class { 'nodo::subsystem::monitor': } - } - - # Munin configuration - $munin = hiera('nodo::host::use_munin', True) - if $munin == true { - nodo::subsystem::monitor::munin { "$hostname": - port => '4900', - } - } } diff --git a/manifests/base/laptop.pp b/manifests/base/laptop.pp index 3885606..b984873 100644 --- a/manifests/base/laptop.pp +++ b/manifests/base/laptop.pp @@ -54,23 +54,4 @@ class nodo::base::laptop inherits nodo::base::personal { default => present, }, } - - # Avoid this annoying warning - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673818 - file { '/etc/laptop-mode/conf.d/board-specific': - ensure => directory, - owner => root, - group => root, - mode => 0755, - require => Package['laptop-mode-tools'], - } - - file { '/etc/laptop-mode/conf.d/board-specific/bogus.conf' : - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', - content => "# Placeholder file, see Debian bug #673818\n", - require => File['/etc/laptop-mode/conf.d/board-specific'], - } } diff --git a/manifests/base/personal.pp b/manifests/base/personal.pp index 14fa34f..55f4835 100644 --- a/manifests/base/personal.pp +++ b/manifests/base/personal.pp @@ -4,19 +4,8 @@ class nodo::base::personal { include nodo::utils::personal include autossh - class { 'nodo::subsystem::pam': } class { 'nodo::subsystem::xorg': } - - if $::lsbdistcodename == 'squeeze' { - include nodo::subsystem::gdm - } - elsif $::lsbdistcodename == 'wheezy' { - include nodo::subsystem::gdm3 - } - else { - include nodo::subsystem::gdm3::disabled - include nodo::subsystem::lightdm - } + class { 'nodo::subsystem::lightdm': } # Media folders and groups include nodo::subsystem::media diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp index 45648ee..a00dd18 100644 --- a/manifests/base/physical.pp +++ b/manifests/base/physical.pp @@ -1,58 +1,7 @@ class nodo::base::physical inherits nodo::base::host { class { [ 'nodo::subsystem::ups', 'smartmontools' ]: } - # SMART and sensors monitoring - $munin = hiera('nodo::host::use_munin', True) - if $munin == true { - include munin::plugins::smart - - # TODO: use nodo::physical::disks instead - $sdb = hiera('nodo::physical::sdb', false) - $disks = $sdb ? { - true => 'sda sdb', - default => 'sda', - } - - munin::plugin { 'hddtemp_smartctl': - ensure => present, - config => "user root\ngroup disk\nenv.drives ${disks}", - } - - munin::plugin { 'smart_sda': - ensure => 'smart_', - config => "user root\ngroup disk", - } - - if $sdb == true { - munin::plugin { 'smart_sdb': - ensure => 'smart_', - config => "user root\ngroup disk", - } - } - - package { 'lm-sensors': - ensure => present, - } - - munin::plugin { [ 'sensors_fan', 'sensors_volt', 'sensors_temp' ]: - ensure => 'sensors_', - } - } - - # Entropy key - $ekey_masterkey = hiera('nodo::physical::ekey_masterkey', '') - if $ekey_masterkey != '' { - class { "ekeyd": - ekeyd_masterkey => $ekey_masterkey, - } - - # We can also use ekeyd::munin - munin::plugin { [ 'ekeyd_stat_KeyTemperatureC', 'ekeyd_stat_KeyTemperatureF', - 'ekeyd_stat_KeyTemperatureK', 'ekeyd_stat_TotalEntropy', - 'ekeyd_stat_KeyVoltage', 'ekeyd_stat_FipsFrameRate', - 'ekeyd_stat_EntropyRate', 'ekeyd_stat' ]: - ensure => 'ekeyd_stat_', - config => 'user root', - } + package { 'lm-sensors': + ensure => present, } } diff --git a/manifests/base/plug.pp b/manifests/base/plug.pp index 49d9f8d..756eb3c 100644 --- a/manifests/base/plug.pp +++ b/manifests/base/plug.pp @@ -13,14 +13,4 @@ class nodo::base::plug { backupninja::sys { "sys": ensure => present, } - - # Monitoring - if !defined(Class['nodo::subsystem::monitor']) { - class { 'nodo::subsystem::monitor': } - } - - # Munin configuration - nodo::subsystem::monitor::munin { "${::hostname}": - port => '4900', - } } diff --git a/manifests/base/removable.pp b/manifests/base/removable.pp index d13b5ee..e82700c 100644 --- a/manifests/base/removable.pp +++ b/manifests/base/removable.pp @@ -1,9 +1,2 @@ class nodo::base::removable inherits nodo::base::desktop { - File["/etc/fstab"] { - source => "puppet:///modules/nodo/etc/fstab/removable", - } - - File["/etc/crypttab"] { - source => "puppet:///modules/nodo/etc/crypttab/removable", - } } diff --git a/manifests/base/virtual.pp b/manifests/base/virtual.pp index f2c72f1..5e86e42 100644 --- a/manifests/base/virtual.pp +++ b/manifests/base/virtual.pp @@ -10,25 +10,8 @@ class nodo::base::virtual { dohwinfo => false, } - $hosting_type = hiera('nodo::vserver::hosting_type', 'direct') - - case $hosting_type { - "direct": { - # Apply munin and monkeysphere configuration for - # for directly hosted nodes. - Nodo::Subsystem::Monitor::Munin <<| title == $::hostname |>> - Nodo::Subsystem::Monkeysphere <<| title == $::hostname |>> - } - "third-party": { - # Apply munin and monkeysphere configuration for - # nodes hosted by third-parties. - nodo::subsystem::monitor::munin { "${::hostname}": } - monkeysphere_host { "${::hostname}": - port => hiera('nodo::vserver::ssh_port', '22'), - } - - # Nagios configuration - class { 'nodo::subsystem::monitor': } - } + nodo::subsystem::monitor::munin { "${::hostname}": } + monkeysphere_host { "${::hostname}": + port => hiera('nodo::vserver::ssh_port', '22'), } } diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 2383ada..87a928b 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -1,29 +1,19 @@ class nodo::role::mail { class { [ 'nodo::role::virtual', 'mail::system' ]: } - # Config parameters - $delivery = hiera('nodo::subsystem::mail::delivery', 'exim') - $virtual = hiera('mail::virtual', false) - # Graph postfix munin::plugin { [ 'postfix_mailqueue', 'postfix_mailstats' ]: config => 'user root', - ensure => $delivery ? { - 'postfix' => present, - default => absent, - }, + ensure => present, } - # Graph mysql - package { 'libcache-cache-perl': # needed by munin mysql plugin + # Graph mysql, needed by munin mysql plugin + package { 'libcache-cache-perl': ensure => present, } munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", - ensure => $virtual ? { - true => present, - default => absent, - }, + ensure => present, } } diff --git a/manifests/role/web.pp b/manifests/role/web.pp index a497108..2d25c9c 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -6,53 +6,53 @@ class nodo::role::web inherits nodo::base::virtual { } # Munin - $munin = hiera('nodo::munin_node::manage', True) - if $munin == true { - munin::plugin { [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: - ensure => present, - } - - package { 'libcache-cache-perl': # needed by munin mysql plugin - ensure => present, - } - - munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: - ensure => present, - config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", - } - } + #$munin = hiera('nodo::munin_node::manage', True) + #if $munin == true { + # munin::plugin { [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: + # ensure => present, + # } + # + # # Needed by munin mysql plugin + # package { 'libcache-cache-perl': + # ensure => present, + # } + # + # munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: + # ensure => present, + # config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", + # } + #} # Classes for web nodes include database - - # Put your custom sites and users here include websites - - # Reprepro configuration - $reprepro = hiera('nodo::web::reprepro', false) - $reprepro_basedir = '/var/reprepro' - - case $reprepro { - true,'enabled': { - class { 'reprepro': - basedir => '/var/reprepro', - uploaders => hiera('nodo::web::reprepro_uploaders', [ ]), - } - - include reprepro::cron - } - 'disabled': { - class { 'reprepro::disabled': - basedir => '/var/reprepro', - } - } - 'purged': { - class { 'reprepro::purged': - basedir => '/var/reprepro', - } - } - false,default: { } - } + include domain_check + + ## Reprepro configuration + #$reprepro = hiera('nodo::web::reprepro', false) + #$reprepro_basedir = '/var/reprepro' + # + #case $reprepro { + # true,'enabled': { + # class { 'reprepro': + # basedir => '/var/reprepro', + # uploaders => hiera('nodo::web::reprepro_uploaders', [ ]), + # } + # + # include reprepro::cron + # } + # 'disabled': { + # class { 'reprepro::disabled': + # basedir => '/var/reprepro', + # } + # } + # 'purged': { + # class { 'reprepro::purged': + # basedir => '/var/reprepro', + # } + # } + # false,default: { } + #} backupninja::svn { "svn": src => "/var/svn", diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp index c927062..2c463b6 100644 --- a/manifests/subsystem/apt.pp +++ b/manifests/subsystem/apt.pp @@ -61,27 +61,27 @@ class nodo::subsystem::apt { }, } - $squeeze_lts = 'http://http.debian.net/debian/ squeeze-lts main contrib non-free' - - # See https://wiki.debian.org/LTS/Using - ::apt::sources_list { 'squeeze-lts.list': - content => "deb ${squeeze_lts}\ndeb-src ${squeeze_lts}", - ensure => $::lsbdistcodename ? { - 'squeeze' => present, - default => absent, - } - } - - file { '/etc/apt/apt.conf.d/80default-release': - owner => root, - group => root, - mode => 0644, - content => "APT::Default-Release \"squeeze-lts\";\n", - ensure => $::lsbdistcodename ? { - 'squeeze' => present, - default => absent, - } - } + #$squeeze_lts = 'http://http.debian.net/debian/ squeeze-lts main contrib non-free' + # + ## See https://wiki.debian.org/LTS/Using + #::apt::sources_list { 'squeeze-lts.list': + # content => "deb ${squeeze_lts}\ndeb-src ${squeeze_lts}", + # ensure => $::lsbdistcodename ? { + # 'squeeze' => present, + # default => absent, + # } + #} + # + #file { '/etc/apt/apt.conf.d/80default-release': + # owner => root, + # group => root, + # mode => 0644, + # content => "APT::Default-Release \"squeeze-lts\";\n", + # ensure => $::lsbdistcodename ? { + # 'squeeze' => present, + # default => absent, + # } + #} package { 'apt-transport-https': ensure => present, diff --git a/manifests/subsystem/crypttab.pp b/manifests/subsystem/crypttab.pp deleted file mode 100644 index 749569c..0000000 --- a/manifests/subsystem/crypttab.pp +++ /dev/null @@ -1,15 +0,0 @@ -class nodo::subsystem::crypttab( - $type, - $manage = hiera('nodo::crypttab::manage', false) -) { - if $manage == true { - file { "/etc/crypttab": - source => "puppet:///modules/nodo/etc/crypttab/${type}", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - notify => Exec['update-initramfs'], - } - } -} diff --git a/manifests/subsystem/fstab.pp b/manifests/subsystem/fstab.pp deleted file mode 100644 index 9538f66..0000000 --- a/manifests/subsystem/fstab.pp +++ /dev/null @@ -1,15 +0,0 @@ -class nodo::subsystem::fstab( - $type, - $manage = hiera('nodo::subsystem::fstab::manage', false) -) { - if $manage == true { - file { "/etc/fstab": - source => "puppet:///modules/nodo/etc/fstab/${type}", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - notify => Exec['update-initramfs'], - } - } -} diff --git a/manifests/subsystem/gdm.pp b/manifests/subsystem/gdm.pp deleted file mode 100644 index fd36e99..0000000 --- a/manifests/subsystem/gdm.pp +++ /dev/null @@ -1,66 +0,0 @@ -class nodo::subsystem::gdm { - package { 'gdm': - ensure => installed, - } - - service { 'gdm': - ensure => running, - require => Package['gdm'], - } - - exec { '/usr/sbin/dpkg-reconfigure gdm': - subscribe => File['/etc/gdm/gdm.conf'], - user => root, - group => root, - refreshonly => true, - require => Service['gdm'], - } - - file { '/etc/gdm/gdm.conf': - ensure => present, - owner => root, - group => root, - mode => 0644, - source => [ "puppet:///modules/site_nodo/etc/gdm/${::domain}/gdm.conf", - "puppet:///modules/nodo/etc/gdm/gdm.conf", ] - } - - file { '/usr/share/gdm/themes/crunchbang': - ensure => directory, - recurse => true, - purge => true, - force => true, - owner => "root", - group => "root", - # This mode will also apply to files from the source directory - mode => 0644, - # Puppet will automatically set +x for directories - source => 'puppet:///modules/nodo/etc/gdm/themes/crunchbang', - } - - file { '/usr/share/gdm/themes/Tuxtastic': - ensure => directory, - recurse => true, - purge => true, - force => true, - owner => "root", - group => "root", - # This mode will also apply to files from the source directory - mode => 0644, - # Puppet will automatically set +x for directories - source => 'puppet:///modules/nodo/etc/gdm/themes/Tuxtastic', - } - - file { '/usr/share/gdm/themes/dasUberMini': - ensure => directory, - recurse => true, - purge => true, - force => true, - owner => "root", - group => "root", - # This mode will also apply to files from the source directory - mode => 0644, - # Puppet will automatically set +x for directories - source => 'puppet:///modules/nodo/etc/gdm/themes/dasUberMini', - } -} diff --git a/manifests/subsystem/gdm/disabled.pp b/manifests/subsystem/gdm/disabled.pp deleted file mode 100644 index d2565ef..0000000 --- a/manifests/subsystem/gdm/disabled.pp +++ /dev/null @@ -1,18 +0,0 @@ -class nodo::subsystem::gdm::disabled inherits nodo::subsystem::gdm { - File['/usr/share/gdm/themes/dasUberMini', '/usr/share/gdm/themes/Tuxtastic', - '/usr/share/gdm/themes/crunchbang', '/etc/gdm/gdm.conf' ] { - ensure => absent, - } - - Exec['/usr/sbin/dpkg-reconfigure gdm'] { - command => '/bin/true', - } - - Service['gdm'] { - ensure => stopped, - } - - Package['gdm'] { - ensure => absent, - } -} diff --git a/manifests/subsystem/gdm3.pp b/manifests/subsystem/gdm3.pp deleted file mode 100644 index d708f6a..0000000 --- a/manifests/subsystem/gdm3.pp +++ /dev/null @@ -1,20 +0,0 @@ -class nodo::subsystem::gdm3 { - package { 'gdm3': - ensure => installed, - } - - service { 'gdm3': - ensure => running, - require => Package['gdm3'], - } - - file { '/etc/gdm3/greeter.gsettings': - ensure => present, - owner => root, - group => root, - mode => 0644, - notify => Service['gdm3'], - source => [ "puppet:///modules/site_nodo/etc/gdm3/${::domain}/greeter.gseetings", - "puppet:///modules/nodo/etc/gdm3/greeter.gsettings", ] - } -} diff --git a/manifests/subsystem/gdm3/disabled.pp b/manifests/subsystem/gdm3/disabled.pp deleted file mode 100644 index 3e108f3..0000000 --- a/manifests/subsystem/gdm3/disabled.pp +++ /dev/null @@ -1,13 +0,0 @@ -class nodo::subsystem::gdm3::disabled inherits nodo::subsystem::gdm3 { - Package['gdm3'] { - ensure => absent, - } - - Service['gdm3'] { - ensure => stopped, - } - - File['/etc/gdm3/greeter.gsettings'] { - ensure => absent, - } -} diff --git a/manifests/subsystem/hosts.pp b/manifests/subsystem/hosts.pp index 464bc0c..d3b0d56 100644 --- a/manifests/subsystem/hosts.pp +++ b/manifests/subsystem/hosts.pp @@ -20,41 +20,41 @@ class nodo::subsystem::hosts( host_aliases => [ "${::fqdn}" ], } - host { "localhost": - ensure => present, - ip => "127.0.0.1", - } + #host { "localhost": + # ensure => present, + # ip => "127.0.0.1", + #} - host { "ip6-localhost": - ensure => present, - ip => "::1", - host_aliases => [ "ip6-loopback" ], - } + #host { "ip6-localhost": + # ensure => present, + # ip => "::1", + # host_aliases => [ "ip6-loopback" ], + #} - host { "ip6-localnet": - ensure => present, - ip => "fe00::0", - } + #host { "ip6-localnet": + # ensure => present, + # ip => "fe00::0", + #} - host { "ip6-mcastprefix": - ensure => present, - ip => "ff00::0", - } + #host { "ip6-mcastprefix": + # ensure => present, + # ip => "ff00::0", + #} - host { "ip6-allnodes": - ensure => present, - ip => "ff02::1", - } + #host { "ip6-allnodes": + # ensure => present, + # ip => "ff02::1", + #} - host { "ip6-allrouters": - ensure => present, - ip => "ff02::2", - } + #host { "ip6-allrouters": + # ensure => present, + # ip => "ff02::2", + #} - host { "ip6-allhosts": - ensure => present, - ip => "ff02::3", - } + #host { "ip6-allhosts": + # ensure => present, + # ip => "ff02::3", + #} } } } diff --git a/manifests/subsystem/modprobe.pp b/manifests/subsystem/modprobe.pp index be6ec42..e5e5498 100644 --- a/manifests/subsystem/modprobe.pp +++ b/manifests/subsystem/modprobe.pp @@ -1,28 +1,9 @@ class nodo::subsystem::modprobe { - # Keep firewire disabled among other things - case $lsbdistcodename { - 'lenny': { - file { "/etc/modprobe.d/blacklist": - owner => "root", - group => "root", - mode => 0644, - ensure => present, - source => "puppet:///modules/nodo/etc/modprobe.d/blacklist.conf", - } - } - default: { - # Upgrade from lenny - file { "/etc/modprobe.d/blacklist": - ensure => absent, - } - - file { "/etc/modprobe.d/blacklist.conf": - owner => "root", - group => "root", - mode => 0644, - ensure => present, - source => "puppet:///modules/nodo/etc/modprobe.d/blacklist.conf", - } - } + file { "/etc/modprobe.d/blacklist.conf": + owner => "root", + group => "root", + mode => 0644, + ensure => present, + source => "puppet:///modules/nodo/etc/modprobe.d/blacklist.conf", } } diff --git a/manifests/subsystem/modprobe/gnokii.pp b/manifests/subsystem/modprobe/gnokii.pp deleted file mode 100644 index decd1ed..0000000 --- a/manifests/subsystem/modprobe/gnokii.pp +++ /dev/null @@ -1,10 +0,0 @@ -# See http://wiki.gnokii.org/index.php/DKU2 -class nodo::subsystem::modprobe::gnokii { - file { '/etc/modprobe.d/phonet.conf': - ensure => present, - owner => root, - group => root, - mode => 0644, - content => "blacklist cdc_phonet\nblacklist phonet\n", - } -} diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp deleted file mode 100644 index ebb99e5..0000000 --- a/manifests/subsystem/monitor.pp +++ /dev/null @@ -1,39 +0,0 @@ -class nodo::subsystem::monitor( - $use_nagios = hiera('nodo::subsystem::monitor::use_nagios', True), - $address = hiera('nodo::subsystem::monitor::address', $::ipaddress), - $check_command = hiera('nodo::subsystem::monitor::check_command', 'check_ping'), - $check_ping = hiera('nodo::subsystem::monitor::check_ping', present), - $check_ssh = hiera('nodo::subsystem::monitor::check_ssh', absent), - $ping_rate = hiera('nodo::subsystem::monitor::ping_rate', '!100.0,20%!500.0,60%') -) { - file { '/usr/local/sbin/ifcheck' : - ensure => present, - owner => 'root', - group => 'root', - mode => '0755', - source => 'puppet:///modules/nodo/bin/ifcheck', - } - - if $use_nagios != false { - - $command = $check_command ? { - 'check_ping' => "check_ping${ping_rate}", - default => $check_command, - } - - class { 'nagios::target': - address => $address, - check_command => $command, - } - - nagios::service::ping { "${::fqdn}": - ensure => $check_ping, - ping_rate => $ping_rate, - } - - nagios::service { "check_ssh4": - ensure => $check_ssh, - check_command => "check_ssh_4", - } - } -} diff --git a/manifests/subsystem/monitor/interface.pp b/manifests/subsystem/monitor/interface.pp deleted file mode 100644 index be630aa..0000000 --- a/manifests/subsystem/monitor/interface.pp +++ /dev/null @@ -1,14 +0,0 @@ -define nodo::subsystem::monitor::interface( - $ensure = 'present', - $hour = "*", - $minute = "*", -) -{ - cron { "ifcheck-${name}": - command => "/usr/local/sbin/ifcheck ${name} &> /dev/null", - user => 'root', - hour => $hour, - minute => $minute, - ensure => $ensure, - } -} diff --git a/manifests/subsystem/monitor/mail.pp b/manifests/subsystem/monitor/mail.pp deleted file mode 100644 index 913991b..0000000 --- a/manifests/subsystem/monitor/mail.pp +++ /dev/null @@ -1,6 +0,0 @@ -class nodo::subsystem::monitor::mail { - nagios::service { "check_rbl": - ensure => present, - check_command => "check_rbl", - } -} diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp deleted file mode 100644 index dd6defa..0000000 --- a/manifests/subsystem/monitor/master.pp +++ /dev/null @@ -1,118 +0,0 @@ -class nodo::subsystem::monitor::master { - file { '/etc/nagios-plugins/check_rbl.ini': - ensure => present, - owner => root, - group => root, - source => 'puppet:///modules/nodo/etc/nagios-plugins/check_rbl.ini', - require => Package['nagios'], - } - - $main = hiera('nodo::role::master::main', false) - $ensure = $main ? { - true => 'present', - default => 'absent', - } - - # Legacy configuration - file { '/etc/apache2/conf.d/munin': - ensure => absent, - } - - # Munin configuration for apache - file { '/etc/apache2/conf.d/munin.conf': - ensure => present, - owner => root, - group => root, - mode => 0644, - source => 'puppet:///modules/nodo/munin/apache.conf', - require => Package["apache"], - notify => Service["apache"], - } - - # See http://www.jethrocarr.com/2012/05/26/munin-performance/ - file { "munin_graph_performance": - ensure => $ensure, - path => "/var/lib/puppet/modules/munin/nodes/00-performance", - content => "max_graph_jobs 1\nmax_cgi_graph_jobs 1\n", - require => $main ? { - true => Concatenated_file['/etc/munin/munin.conf'], - default => undef, - }, - } - - # See https://raymii.org/s/tutorials/Munin_optimalization_on_Debian.html - file { '/usr/local/bin/munin-graph': - ensure => $ensure, - owner => root, - group => root, - mode => 0755, - source => 'puppet:///modules/nodo/bin/munin-graph', - } - - file { '/etc/cron.d/munin-graph': - ensure => $ensure, - owner => root, - group => root, - mode => 0644, - content => "10 * * * * munin if [ -x /usr/local/bin/munin-graph ]; then /usr/bin/ionice -c 3 /usr/bin/nice -n 19 /usr/local/bin/munin-graph; fi\n", - require => File['/usr/local/bin/munin-graph'], - } - - # We won't mess with the package, so we distribute our own munin-cron - file { '/usr/local/bin/munin-cron': - ensure => $ensure, - owner => root, - group => root, - mode => 0755, - source => 'puppet:///modules/nodo/bin/munin-cron', - } - - file { '/etc/cron.d/munin': - ensure => $ensure, - owner => root, - group => root, - mode => 0644, - source => 'puppet:///modules/nodo/etc/cron.d/munin', - require => File['/usr/local/bin/munin-cron'], - } - - # - # See https://raymii.org/s/tutorials/Munin_optimalization_on_Debian.html - # https://munin.readthedocs.org/en/latest/master/rrdcached.html - # http://kuszelas.eu/~eyck/log/Howto/Munin.Rrdcached.html - # http://munin-monitoring.org/wiki/rrdcached - # - package { 'rrdcached': - ensure => $ensure, - } - - file { '/etc/default/rrdcached': - ensure => $ensure, - owner => root, - group => root, - source => 'puppet:///modules/nodo/etc/default/rrdcached', - require => Package['rrdcached'], - notify => $main ? { - true => Service['rrdcached'], - default => undef, - }, - } - - # Munin configuration for rrdcache - file { "munin_rrdcache": - ensure => $ensure, - path => "/var/lib/puppet/modules/munin/nodes/00-rrdcache", - content => "rrdcached_socket /var/run/rrdcached.sock\n", - require => $main ? { - true => Concatenated_file['/etc/munin/munin.conf'], - default => undef, - }, - } - - if $main == true { - service { 'rrdcached': - ensure => running, - require => Package['rrdcached'], - } - } -} diff --git a/manifests/subsystem/monitor/munin.pp b/manifests/subsystem/monitor/munin.pp deleted file mode 100644 index c2f461a..0000000 --- a/manifests/subsystem/monitor/munin.pp +++ /dev/null @@ -1,30 +0,0 @@ -# Define a munin node -define nodo::subsystem::monitor::munin( - $manage = hiera('nodo::munin_node::manage', True), - $port = hiera('nodo::munin_node::port', '4949'), - $allow = hiera('nodo::munin_node::allow', ''), - $host = hiera('nodo::munin_node::host', $::fqdn), - $listen = hiera('nodo::munin_node::listen', '*'), - $config = hiera('nodo::munin_node::config', [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10' ]) -) { - - if $manage == true { - case $allow { - '': { fail("Please set nodo::munin_node::allow in your config") } - } - - package { "munin-plugins-extra": - ensure => "present", - } - - class { 'munin::client': - port => $port, - allow => $allow, - host => $host, - listen => $listen, - config => $config, - } - - munin::plugin { apt_all: ensure => present; } - } -} diff --git a/manifests/subsystem/mount.pp b/manifests/subsystem/mount.pp deleted file mode 100644 index 05adaa7..0000000 --- a/manifests/subsystem/mount.pp +++ /dev/null @@ -1,15 +0,0 @@ -class nodo::subsystem::mount { - class { autofs: } - - file { '/etc/auto.removable': - source => [ "puppet:///modules/site_nodo/etc/${::fqdn}/auto.removable", - "puppet:///modules/site_nodo/etc/${::domain}/auto.removable", - "puppet:///modules/site_nodo/etc/auto.removable", - "puppet:///modules/nodo/etc/auto.removable.${::operatingssystem}", - "puppet:///modules/nodo/etc/auto.removable" ], - notify => Service[autofs], - owner => root, - group => root, - mode => 0644; - } -} diff --git a/manifests/subsystem/pam.pp b/manifests/subsystem/pam.pp deleted file mode 100644 index 7186d0b..0000000 --- a/manifests/subsystem/pam.pp +++ /dev/null @@ -1,40 +0,0 @@ -class nodo::subsystem::pam( - $enable = hiera('nodo::pam::enable', false) -) { - if $enable != false { - - # Squeeze only - if $::lsbdistcodename == 'squeeze' { - # pam - login - file { "/etc/pam.d/login": - source => [ "puppet:///modules/nodo/etc/pam.d/login.${::lsbdistcodename}", - "puppet:///modules/nodo/etc/pam.d/login", - ], - owner => "root", - group => "root", - mode => 0644, - ensure => present, - } - - # pam - gdm - file { "/etc/pam.d/gdm": - source => "puppet:///modules/nodo/etc/pam.d/gdm", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - } - } - - # pam - mountpoints - file { "/etc/security/pam_mount.conf.xml": - ensure => present, - owner => root, - group => root, - mode => 0644, - source => [ "puppet:///modules/site_nodo/security/pam_mount.conf.xml.${::lsbdistcodename}", - "puppet:///modules/site_nodo/security/pam_mount.conf.xml", - ], - } - } -} diff --git a/manifests/subsystem/profile.pp b/manifests/subsystem/profile.pp index d1e343e..dac2f02 100644 --- a/manifests/subsystem/profile.pp +++ b/manifests/subsystem/profile.pp @@ -1,35 +1,4 @@ # Custom configuration for user profiles class nodo::subsystem::profile { - file { "/etc/profile.d/prompt.sh": - source => "puppet:///modules/nodo/etc/profile.d/prompt.sh", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - } - - # Ideally we should not manage this file, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675008 - file { "/etc/bash.bashrc": - source => "puppet:///modules/nodo/etc/bash.bashrc", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - require => File['/etc/profile.d/prompt.sh'], - } - - # See http://linuxforcynics.com/how-to/using-rxvt-unicode-with-screen - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630976 - # https://bbs.archlinux.org/viewtopic.php?id=50647 - # https://stackoverflow.com/questions/12345675/screen-cannot-find-terminfo-entry-for-xterm-256color - file { '/lib/terminfo/r/rxvt-256color': - source => "puppet:///modules/nodo/terminfo/rxvt-256color", - owner => root, - group => root, - mode => 0644, - ensure => $::lsbdistcodename ? { - 'squeeze' => present, - default => absent, - }, - } + include shellprompt } diff --git a/manifests/subsystem/profile/vagrant.pp b/manifests/subsystem/profile/vagrant.pp deleted file mode 100644 index 6306b58..0000000 --- a/manifests/subsystem/profile/vagrant.pp +++ /dev/null @@ -1,9 +0,0 @@ -class nodo::subsystem::profile::vagrant inherits nodo::subsystem::profile { - file { "/root/.profile": - source => "puppet:///modules/nodo/root/profile", - owner => "root", - group => "root", - mode => 0644, - ensure => present, - } -} diff --git a/manifests/subsystem/sudo.pp b/manifests/subsystem/sudo.pp index 9249379..d8c7099 100644 --- a/manifests/subsystem/sudo.pp +++ b/manifests/subsystem/sudo.pp @@ -3,7 +3,7 @@ class nodo::subsystem::sudo { ensure => "present", } - file { "/etc/sudoers": + file { "/etc/sudoers.d/local": source => [ "puppet:///modules/site_nodo/etc/sudoers/hostname/${::hostname}", "puppet:///modules/site_nodo/etc/sudoers/domain/${::domain}", "puppet:///modules/nodo/etc/sudoers" ], diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp index 151058e..a7fead0 100644 --- a/manifests/subsystem/virtual/instance.pp +++ b/manifests/subsystem/virtual/instance.pp @@ -1,7 +1,6 @@ # Define a virtual server instance define nodo::subsystem::virtual::instance( $context, - $distro = 'jessie', $ensure = 'running', $proxy = false, $puppetmaster = false, @@ -47,66 +46,7 @@ define nodo::subsystem::virtual::instance( $dev = hiera('nodo::subsystem::vm::interface', 'eth0') - if $implementation == 'vserver' { - virtual::vserver { $name: - ensure => $ensure, - context => "$context", - mark => 'default', - distro => $distro, - interface => "${dev}:192.168.0.${context}/24", - hostname => "$name.$domain", - memory_limit => $memory_limit, - } - - # Some nodes need a lot of space at /tmp otherwise some admin - # tasks like backups might not run. - file { "/etc/vservers/${name}/fstab": - source => [ "puppet:///modules/site_nodo/etc/fstab/vserver/$name", - "puppet:///modules/nodo/etc/fstab/vserver" ], - owner => "root", - group => "root", - mode => 0644, - ensure => present, - notify => Exec["vs_restart_${name}"], - require => Exec["vserver_instance_${name}"], - } - - # Sound support - if $sound { - if !defined(File["/usr/local/sbin/create-sound-devices"]) { - file { "/usr/local/sbin/create-sound-devices": - ensure => present, - source => "puppet:///modules/nodo/sound/devices.sh", - owner => root, - group => root, - mode => 755, - } - } - exec { "/usr/local/sbin/create-sound-devices ${name}": - unless => "/usr/local/sbin/create-sound-devices ${name} --check", - user => root, - require => [ Exec["vs_create_${name}"], File["/usr/local/sbin/create-sound-devices"] ], - } - } - } - - # Create a munin virtual resource to be realized in the node - @@nodo::subsystem::monitor::munin { "${name}": - port => $munin_port ? { - false => "49$id", - default => $munin_port, - } - } - - # Create a monkeysphere virtual resource to be realized in the node - @@nodo::subsystem::monkeysphere { "$name": - port => $monkeysphere_ssh_port ? { - false => "22$id", - default => $monkeysphere_ssh_port, - } - } - - # Apply firewall rules just for running vservers + # Apply firewall rules just for running virtual machines case $ensure { 'running': { firewall::virtual::ssh { "$name": diff --git a/manifests/subsystem/xorg.pp b/manifests/subsystem/xorg.pp deleted file mode 100644 index da8a069..0000000 --- a/manifests/subsystem/xorg.pp +++ /dev/null @@ -1,15 +0,0 @@ -class nodo::subsystem::xorg( - $enable = hiera('nodo::subsystem::xorg::enable', false) -) { - if $enable != false { - file { "/etc/X11/xorg.conf": - ensure => present, - owner => root, - group => root, - mode => 0644, - source => [ "puppet:///modules/site_nodo/X11/xorg.conf/${::hostname}.${::lsbdistcodename}", - "puppet:///modules/site_nodo/X11/xorg.conf/${::hostname}", - "puppet:///modules/site_nodo/X11/xorg.conf.default" ], - } - } -} diff --git a/manifests/utils.pp b/manifests/utils.pp index 8f572b6..0335bf3 100644 --- a/manifests/utils.pp +++ b/manifests/utils.pp @@ -1,9 +1,6 @@ # Common utilities -class nodo::utils { - package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'unzip', - 'nmap', 'telnet', 'tree', 'whois', 'dosfstools', 'dnsutils', 'secure-delete', - 'bc', 'lsof', 'wipe', 'vrms', 'nsca-client', 'uuid-runtime', 'vim-nox', - 'multitail', 'bash-completion', 'zsh' ]: +class nodo::utils inherits nodo::utils::base { + package { [ 'vim-nox' ]: ensure => installed, } @@ -14,33 +11,11 @@ class nodo::utils { } } - # Not using right now - package { [ 'logcheck', 'logcheck-database' ]: - ensure => absent, - } - - # We'll probably use https://github.com/puppetlabs/puppetlabs-denyhosts in the future - package { 'denyhosts': - ensure => purged, - } - - # Maybe we use logwatch in the future - #package { 'logwatch': - # ensure => installed, - #} - # To be considered #package { 'needrestart': # ensure => present, #} - # Obsolete - if !defined(Package['git-core']) { - package { 'git-core': - ensure => absent, - } - } - if !defined(Package['git']) { package { 'git': ensure => latest, @@ -55,17 +30,7 @@ class nodo::utils { } # Ensure we have the minimum augeas version required by shorewall module - package { - 'libaugeas0': - ensure => $::lsbdistcodename ? { - 'squeeze' => '0.10.0-1~bpo60+3', - default => installed, - }; - 'augeas-tools': - ensure => $::lsbdistcodename ? { - 'squeeze' => '0.10.0-1~bpo60+3', - default => installed, - }, - require => Package['libaugeas0']; + package { [ 'libaugeas0', 'augeas-tools' ]: + ensure => present, } } diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp index af9cefb..948a34c 100644 --- a/manifests/utils/laptop/debian.pp +++ b/manifests/utils/laptop/debian.pp @@ -10,7 +10,7 @@ class nodo::utils::laptop::debian { 'tftp', 'sharutils', 'wireshark', 'macchanger', 'weplab', 'wpagui', 'gnokii', 'sslstrip', 'uswsusp', - 'tcpdump', 'tshark', 'powertop' ]: + 'tcpdump', 'tshark' ]: ensure => installed, } diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp index a6806c5..071c9a9 100644 --- a/manifests/utils/physical.pp +++ b/manifests/utils/physical.pp @@ -2,7 +2,8 @@ class nodo::utils::physical { package { [ 'nload', 'acpid', 'slurm', 'ethtool', 'parted', 'iftop', 'iptraf', 'htop', 'sdparm', 'iotop', 'sysstat', 'saidar', - 'lshw', 'sg3-utils', 'nmon', 'atop', 'dcfldd', 'gdisk' ]: + 'lshw', 'sg3-utils', 'nmon', 'atop', 'dcfldd', 'gdisk', + 'powertop' ]: ensure => installed, } |
