Changeset 1233


Ignore:
Timestamp:
01/17/12 23:21:38 (4 months ago)
Author:
tschmitt
Message:
  • linuxmuster-setup: obsolet gewordene Konfigurationsvorlagen entfernt (Netzwerk und Lokalisierung betreffend).
  • pg_hba.conf angepasst.
Location:
main/linuxmuster-base/branches/testing
Files:
5 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • main/linuxmuster-base/branches/testing/debian/changelog

    r1232 r1233  
    44  * reworked nic-setup scripts and functions in helperfunctions.sh. 
    55  * removed mac_* package templates, added iface_lan to templates. 
     6  * removed more obsolete configuration stuff (according to locale settings and network). 
    67  * linuxmuster-setup: fixed postgresql's pg_hba.conf template. 
    78  * added linuxmuster-nagios-base to server task again. 
    89 
    9  -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 17 Jan 2012 22:14:18 +0100 
     10 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 17 Jan 2012 23:19:23 +0100 
    1011 
    1112linuxmuster-base (6.0.0-3ubuntu0) lenny; urgency=low 

  • main/linuxmuster-base/branches/testing/sbin/linuxmuster-setup

    r1226 r1233  
    146146    done 
    147147 
    148     # reconfigure locale settings 
    149     for i in locale.gen timezone; do 
    150     conf=/etc/$i 
    151     cp $STATICTPLDIR/$conf $conf 
    152     done 
    153     DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales 
    154     DEBIAN_FRONTEND=noninteractive dpkg-reconfigure tzdata 
    155     install-keymap /usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz 
    156     kmapmd5=`md5sum /etc/console-setup/boottime.kmap.gz | awk '{ print $1 }' 2> /dev/null` 
    157     sed -e "s/^BOOTTIME_KMAP_MD5=.*/BOOTTIME_KMAP_MD5=\"$kmapmd5\"/" $STATICTPLDIR/etc/default/console-setup > /etc/default/console-setup 
    158     /etc/init.d/console-setup restart 
     148    # reconfigure locale settings, deprecated? 
     149    #for i in locale.gen timezone; do 
     150    # conf=/etc/$i 
     151    # cp $STATICTPLDIR/$conf $conf 
     152    #done 
     153    #DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales 
     154    #DEBIAN_FRONTEND=noninteractive dpkg-reconfigure tzdata 
     155    #install-keymap /usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz 
     156    #kmapmd5=`md5sum /etc/console-setup/boottime.kmap.gz | awk '{ print $1 }' 2> /dev/null` 
     157    #sed -e "s/^BOOTTIME_KMAP_MD5=.*/BOOTTIME_KMAP_MD5=\"$kmapmd5\"/" $STATICTPLDIR/etc/default/console-setup > /etc/default/console-setup 
     158    #/etc/init.d/console-setup restart 
    159159 
    160160    # install indexpage if available 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/postpatch

    r1226 r1233  
    7474 
    7575        # create new ldap tree 
    76         rm -rf /etc/ldap/slapd.d 
    77         mkdir -p /etc/ldap/slapd.d 
    78         chattr +i /var/lib/ldap/DB_CONFIG 
    79         rm -f /var/lib/ldap/* 
    80         chattr -i /var/lib/ldap/DB_CONFIG 
    81         slapadd < /var/tmp/ldap.ldif 
    82         chown openldap:openldap /var/lib/ldap -R 
    83         slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d 
    84         chown -R openldap:openldap /etc/ldap/slapd.d 
     76        #rm -rf /etc/ldap/slapd.d 
     77        #mkdir -p /etc/ldap/slapd.d 
     78        #chattr +i /var/lib/ldap/DB_CONFIG 
     79        #rm -f /var/lib/ldap/* 
     80        #chattr -i /var/lib/ldap/DB_CONFIG 
     81        #slapadd < /var/tmp/ldap.ldif 
     82        #chown openldap:openldap /var/lib/ldap -R 
     83        #slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d 
     84        #chown -R openldap:openldap /etc/ldap/slapd.d 
    8585 
    8686        # changing user's default shell to /bin/bash 
    … …  
    158158 
    159159# recreate ldap tree 
    160 # sophomorix-dump-pg2ldap 
     160sophomorix-dump-pg2ldap 
    161161 
    162162rm -f /var/tmp/ldap.* 

  • main/linuxmuster-base/branches/testing/var/config-static/etc/postgresql/9.1/main/pg_hba.conf

    r1230 r1233  
    8585# 
    8686 
     87# TYPE  DATABASE        USER            ADDRESS                 METHOD 
     88 
     89# paedml 
     90local   ldap            ldap            ident                   map=ldap 
     91 
    8792# paedml 
    8893local   ldap            postgres        ident                   map=postgres 
    … …  
    9095 
    9196# Database administrative login by Unix domain socket 
    92 local   all             postgres                                peer 
    93  
    94 # TYPE  DATABASE        USER            ADDRESS                 METHOD 
    95  
    96 # paedml 
    97 local   ldap            ldap            ident                   map=ldap 
     97local   all             postgres                                trust 
    9898 
    9999# "local" is for Unix domain socket connections only 
Note: See TracChangeset for help on using the changeset viewer.