Changeset 545

Show
Ignore:
Timestamp:
05/19/08 16:51:44 (4 months ago)
Author:
free
Message:

* Added support for setting the hostname

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cdd-utils/trunk/debian/changelog

    r544 r545  
    1919  * Added cryptpw script 
    2020  * Encrypt passwords when changing the manager account 
     21  * Added support for setting the hostname 
    2122 
    2223 -- Free Ekanayaka <free@64studio.com>  Thu, 08 May 2008 21:55:32 +0200 

  • cdd-utils/trunk/lib/common.sh

    r544 r545  
    1010} 
    1111nullstr () { 
    12     if [ -z $1 ]; then return 0; else return 1; fi 
     12    if [ -z "$1" ]; then return 0; else return 1; fi 
    1313} 
    1414exists () { 
    15     if [ -e $1 ]; then return 0; else return 1; fi 
     15    if [ -e "$1" ]; then return 0; else return 1; fi 
    1616} 
    1717add_key () { 

  • cdd-utils/trunk/lib/server.sh

    r544 r545  
    355355# 
    356356dnsmasq () { 
     357    net=$1 
     358    if nullstr $1; then warning "no network given"; return; fi 
    357359    cfg=/etc/dnsmasq.conf 
    358360    if ! exists $cfg; then warning $cfg not found; return; fi 
    …… 
    360362    mkdir -p /etc/dnsmasq.d 
    361363    cat <<EOF > /etc/dnsmasq.d/cdd-utils.conf 
    362 dhcp-range=192.168.1.10,192.168.1.100,12h 
     364dhcp-range=$net.10,$net.100,12h 
    363365EOF 
    364366} 
    …… 
    380382# the rdiff-backup-wrapper 
    381383backup () { 
    382     device=$1 # Path to the backup device 
    383     if nullstr $device; then warning "No device given"; return; fi 
     384 
     385    device="$1" # Path to the backup device 
     386    vendor="$(echo $2|sed -e 's/%SPACE%/ /g')" # Vendor name of the backup device 
     387    model="$(echo $3|sed -e 's/%SPACE%/ /g')"  # Model name of the backup device 
     388 
     389    if nullstr "$device"; then warning "No device given"; return; fi 
     390    if nullstr "$vendor"; then warning "No vendor given"; return; fi 
     391    if nullstr "$model";  then warning "No model given"; return; fi 
     392 
    384393    cfg=/etc/cron.daily/backup 
    385394    cat <<EOF > $cfg 
    …… 
    391400 
    392401    cfg=/etc/udev/rules.d/80-backup.rules 
    393     model="2500BEV External" 
    394     vendor="WD" 
    395402    run="/usr/bin/rdiff-backup-wrapper /dev/backup /backup/removable" 
    396403    cat <<EOF > $cfg 

  • cdd-utils/trunk/lib/suites.sh

    r544 r545  
    2323    cdd-config havp 
    2424    cdd-config klogd 
    25     cdd-config dnsmasq 
     25    cdd-config dnsmasq 192.168.1 
    2626    cdd-config monit 
    2727    cdd-config manager manager 

  • cdd-utils/trunk/lib/system.sh

    r535 r545  
    214214hosts () { 
    215215 
    216     if [ "$1" == "" ]; then 
    217         ip="192.168.1.200" 
    218     else 
    219         ip=$1 
    220     fi 
     216    ip=$1 
     217    host=$2 
     218 
     219    if nullstr $ip; then warning "no ip given"; return; fi 
     220    if nullstr $host; then warning "no host given"; return; fi 
    221221 
    222222    cfg=/etc/hosts 
    223223    if ! exists $cfg; then warning $cfg not found; return; fi 
    224224 
    225     if ! grep -q ^$ip $cfg; then 
    226         echo "$ip server.local server" >> $cfg 
    227     fi 
     225    del_key "$ip" $cfg 
     226    add_key "$ip" " " $cfg 
     227    set_key "$ip" " " "$host" $cfg 
     228 
    228229} 
    229230 
    …… 
    241242    set_key "$key" "$sep" "$val" "$cfg" 
    242243} 
     244 
     245# Set the hostname 
     246hostname () { 
     247    hostname=$1 
     248    if nullstr $hostname; then warning "no hostname given"; return; fi 
     249    echo $hostname > /etc/hostname 
     250} 

  • cdd-utils/trunk/share/monit/global

    r458 r545  
    1 set alert free.ekanayaka@gmail.com 
     1set alert root 
    22set logfile syslog facility log_daemon 
    3 set mail-format { from: monit@macimpianti.com } 
     3set mail-format { from: monit }