Changeset 814

Show
Ignore:
Timestamp:
09/09/08 10:08:20 (3 months ago)
Author:
free
Message:

Cleaned up backup script

Location:
ares/trunk
Files:
20 modified
1 moved

Legend:

Unmodified
Added
Removed

  • ares/trunk/Makefile

    r813 r814  
    2929        -rm -f tests/fakeroot/etc/apache2/mods-enabled/ssl.load 
    3030        -rm -f tests/fakeroot/etc/apache2/mods-enabled/ssl.conf 
     31        -rm -f tests/fakeroot/etc/udev/rules.d/80-backup.rules 
     32 
     33test: 
     34        cd tests && python ./Test.py 

  • ares/trunk/tests/Test.py

    r813 r814  
    1111from ares import Ares 
    1212 
    13 class TestAres(unittest.TestCase): 
     13class Test(unittest.TestCase): 
    1414 
    15     def test_ldap(self): 
     15    def test_all(self): 
    1616        ares = Ares(test=True) 
    17 #         ares.ldap.setup() 
    18 #         ares.hostname.setup() 
    19 #         ares.hosts.setup() 
    20 #         ares.dnsmasq.setup() 
    21 #         ares.monit.setup() 
    22 #         ares.squid.setup() 
    23 #         ares.amavis.setup() 
    24 #         ares.spamassassin.setup() 
    25 #         ares.postfix.setup() 
    26 #         ares.ssl.setup() 
    27 #         ares.squirrel.setup() 
    28 #         ares.fetchmail.setup() 
    29 #         ares.samba.setup() 
     17        ares.ldap.setup() 
     18        ares.hostname.setup() 
     19        ares.hosts.setup() 
     20        ares.dnsmasq.setup() 
     21        ares.monit.setup() 
     22        ares.squid.setup() 
     23        ares.amavis.setup() 
     24        ares.spamassassin.setup() 
     25        ares.postfix.setup() 
     26        ares.ssl.setup() 
     27        ares.squirrel.setup() 
     28        ares.fetchmail.setup() 
     29        ares.samba.setup() 
    3030#         ares.webmin.setup() 
    31 #         ares.nfs.setup() 
    32 #         ares.havp.setup() 
    33 #         ares.apt.setup() 
    34 #         ares.sshd.setup() 
    35 #         ares.nfs.setup() 
    36 #         ares.aug.save() 
    37 #         ares.postconfig.setup() 
     31        ares.nfs.setup() 
     32        ares.havp.setup() 
     33        ares.apt.setup() 
     34        ares.sshd.setup() 
     35        ares.nfs.setup() 
    3836        ares.backup.setup() 
     37        ares.aug.save() 
     38        ares.postconfig.setup() 
    3939 
    4040if __name__ == '__main__': 

  • ares/trunk/tests/fakeroot/etc/amavis/conf.d/15-content_filter_mode

    r786 r814  
    99# 
    1010 
    11 #@bypass_virus_checks_maps = ( 
    12 #   \%bypass_virus_checks, \@bypass_virus_checks_acl, \$bypass_virus_checks_re); 
     11@bypass_virus_checks_maps = ( 
     12   \%bypass_virus_checks, \@bypass_virus_checks_acl, \$bypass_virus_checks_re); 
    1313 
    1414 
    … …  
    1818# 
    1919 
    20 #@bypass_spam_checks_maps = ( 
    21 #   \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); 
     20@bypass_spam_checks_maps = ( 
     21   \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); 
    2222 
    23231;  # ensure a defined return 

  • ares/trunk/tests/fakeroot/etc/amavis/conf.d/20-debian_defaults

    r786 r814  
    6767 
    6868$final_virus_destiny      = D_DISCARD;  # (data not lost, see virus quarantine) 
    69 $final_banned_destiny     = D_BOUNCE;   # D_REJECT when front-end MTA 
    70 $final_spam_destiny       = D_BOUNCE; 
     69$final_banned_destiny     = D_DISCARD;   # D_REJECT when front-end MTA 
     70$final_spam_destiny       = D_DISCARD; 
    7171$final_bad_header_destiny = D_PASS;     # False-positive prone (for spam) 
    7272 

  • ares/trunk/tests/fakeroot/etc/apt/sources.list

    r800 r814  
    22# deb cdrom:[foo (1)]/ hardy main 
    33 
    4 deb cdrom:[foo (1)]/ hardy main 
     4deb http://apt.64studio.com/ares/stable hardy main 

  • ares/trunk/tests/fakeroot/etc/default/fetchmail

    r794 r814  
    99 
    1010# Declare here if we want to start fetchmail. 'yes' or 'no' 
    11 START_DAEMON=no 
     11START_DAEMON=yes 
     12OPTIONS="-d 30" 

  • ares/trunk/tests/fakeroot/etc/default/monit

    r776 r814  
    55 
    66# You must set this variable to for monit to start 
    7 startup=0 
     7startup=1 
    88 
    99# To change the intervals which monit should run uncomment 
    1010# and change this variable. 
    1111# CHECK_INTERVALS=180 
     12CHECK_INTERVALS=30 

  • ares/trunk/tests/fakeroot/etc/default/spamassassin

    r788 r814  
    66 
    77# Change to one to enable spamd 
    8 ENABLED=0 
     8ENABLED=1 
    99 
    1010# Options 
    … …  
    2929# Set to anything but 0 to enable the cron job to automatically update 
    3030# spamassassin's rules on a nightly basis 
    31 CRON=0 
     31CRON=1 

  • ares/trunk/tests/fakeroot/etc/dnsmasq.conf

    r770 r814  
    469469# Include a another lot of configuration options. 
    470470#conf-file=/etc/dnsmasq.more.conf 
    471 #conf-dir=/etc/dnsmasq.d 
     471conf-dir=/etc/dnsmasq.d 

  • ares/trunk/tests/fakeroot/etc/exports

    r796 r814  
    99# /srv/nfs4/homes  gss/krb5i(rw,sync) 
    1010# 
     11/srv/nfs *(rw,sync,no_root_squash) 

  • ares/trunk/tests/fakeroot/etc/havp/havp.config

    r798 r814  
    521521# ARCAVIRSOCKET /var/run/arcavird.socket 
    522522 
     523PARENTPROXY localhost 
     524PARENTPORT 3128 

  • ares/trunk/tests/fakeroot/etc/hosts

    r772 r814  
    99ff02::2 ip6-allrouters 
    1010ff02::3 ip6-allhosts 
     11192.168.2.1     ares.q1 ares 

  • ares/trunk/tests/fakeroot/etc/ldap.conf

    r806 r814  
    296296#pam_sasl_mech DIGEST-MD5 
    297297nss_initgroups_ignoreusers avahi,avahi-autoipd,backup,bin,daemon,dhcp,games,gdm,gnats,haldaemon,hplip,irc,klog,libuuid,list,lp,mail,man,messagebus,news,polkituser,proxy,pulse,root,sshd,statd,sync,sys,syslog,uucp,www-data 
     298bind_policy soft 

  • ares/trunk/tests/fakeroot/etc/ldap/slapd.conf

    r766 r814  
    1616include         /etc/ldap/schema/nis.schema 
    1717include         /etc/ldap/schema/inetorgperson.schema 
     18include fakeroot/etc/ldap/schema/evolutionperson.schema 
     19include fakeroot/etc/ldap/schema/samba.schema 
    1820 
    1921# Where the pid file is put. The init.d script 

  • ares/trunk/tests/fakeroot/etc/monit/monitrc

    r775 r814  
    215215# 
    216216# 
     217set alert root@ares.q1 
     218set logfile syslog facility log_daemon 
     219set mail-format { from: monit@ares.q1 } 
     220include /etc/monit/ares 

  • ares/trunk/tests/fakeroot/etc/php5/apache2/php.ini

    r780 r814  
    268268max_input_time = 60 ; Maximum amount of time each script may spend parsing request data 
    269269;max_input_nesting_level = 64 ; Maximum input variable nesting level 
    270 memory_limit = 16M      ; Maximum amount of memory a script may consume (16MB) 
     270memory_limit = 32M      ; Maximum amount of memory a script may consume (16MB) 
    271271 
    272272 

  • ares/trunk/tests/fakeroot/etc/postfix/main.cf

    r809 r814  
    3939default_transport = error 
    4040relay_transport = error 
     41home_mailbox = Maildir/ 
     42content_filter = smtp-amavis:[127.0.0.1]:10024 

  • ares/trunk/tests/fakeroot/etc/samba/smb.conf

    r792 r814  
    9090# in the samba-doc package for details. 
    9191;   security = user 
     92   security = user 
    9293 
    9394# You may wish to use password encryption.  See the section on 
    … …  
    9798# If you are using encrypted passwords, Samba will need to know what 
    9899# password database type you are using.   
    99    passdb backend = tdbsam 
     100   passdb backend = ldapsam:ldap://localhost 
    100101 
    101102   obey pam restrictions = yes 
    … …  
    271272;   directory mask = 0700 
    272273 
     274   ldap suffix = dc=nodomain 
     275   ldap user suffix = ou=People 
     276   ldap group suffix = ou=Group 
     277   ldap admin dn = cn=admin,dc=nodomain 
    273278[printers] 
    274279   comment = All Printers 
    … …  
    315320;   postexec = /bin/umount /cdrom 
    316321 
     322[data] 
     323   path = /srv/nfs/share 
     324   browseable = yes 
     325   writeable = yes 
     326   admin users = manager 
     327   create mask = 0664 
     328   directory mask = 0775 

  • ares/trunk/tests/fakeroot/etc/squid/squid.conf

    r767 r814  
    45284528# sleep_after_fork 0 
    45294529 
     4530acl local_network src 192.168.2.0/24 
     4531acl SSL_ports port 5050 
     4532acl SSL_ports port 5222 
     4533acl SSL_ports port 5190 
     4534http_access allow SSL_ports 

  • ares/trunk/tests/fakeroot/etc/squirrelmail/config.php

    r784 r814  
    998998 * @global string $squirrelmail_default_language 
    999999 */ 
    1000 $squirrelmail_default_language = 'en_US'; 
     1000$squirrelmail_default_language = 'it_IT'; 
    10011001 
    10021002/** 

  • ares/trunk/tests/fakeroot/etc/ssh/sshd_config

    r802 r814  
    7676 
    7777UsePAM yes 
     78PasswordAuthentication no