Current state

diff --git a/conf.d/modules b/conf.d/modules
index a062a620ab14e9e869d2d311429ac77169d35cf8..47ce6370dbb7838b930247925e2e059ef1706c82 100644 (file)
--- a/conf.d/modules
+++ b/conf.d/modules
@@ -21,3 +21,5 @@
 
 # You should consult your kernel documentation and configuration
 # for a list of modules and their options.
+
+modules="vboxdrv vboxnetadp vboxnetflt"

diff --git a/conf.d/samba b/conf.d/samba
index 1b329dae6b1861fd342c92f95e843d414f9290a6..c5d9929321337f007242043fc5217370b0f65d87 100644 (file)
--- a/conf.d/samba
+++ b/conf.d/samba
@@ -1,5 +1,5 @@
 #add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
+daemon_list="smbd nmbd winbind"
 
 #----------------------------------------------------------------------------
 # Daemons calls: <daemon_name>_<command_option>

diff --git a/cups/printers.conf b/cups/printers.conf
index a758b7b8e19a59ba018ecad58970f166ff725b47..52ae3fe5bb19184c94b0707bb6cf68d57ec9f663 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-04-01 08:21
+# Written by cupsd on 2012-04-11 07:23
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 31ced4b1ada1668206ec59047c44f9c30b822663..99419303900cd152794be19eaba746629c00433a 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,11 +1,3 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-03-31 13:35
+# Written by cupsd on 2012-04-01 13:35
 NextSubscriptionId 134
-<Subscription 133>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner frank
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1333280083
-NextEventId 627
-</Subscription>

diff --git a/fstab b/fstab
index f5fe601668185ad1b704779fa37ee616df79ded1..c7d7d5d81e406c47ddf8ad3bd8ee8daa4b6ac559 100644 (file)
--- a/fstab
+++ b/fstab
@@ -11,30 +11,31 @@
 # See the manpage fstab(5) for more information.
 #
 
-# <fs>                 <mountpoint>    <type>          <opts>          <dump/pass>
+# <fs>                                 <mountpoint>            <type>  <opts>          <dump/pass>
 
 # NOTE: If your BOOT partition is ReiserFS, add the notail option to opts.
-/dev/sda1              /boot           ext3            noauto,noatime  0 0
-/dev/sda3              /               ext4            noatime,acl,user_xattr          0 1
-/dev/sda2              none            swap            sw              0 0
-/dev/cdrom             /mnt/cdrom      auto            noauto,ro       0 0
-/dev/fd0               /mnt/floppy     auto            noauto          0 0
-/dev/vg1/data          /data           ext4            defaults,acl,user_xattr 1 2
-/dev/vg1/home          /home           ext4            defaults,acl,user_xattr 1 2
-/dev/vg1/distfiles     /usr/portage/distfiles  ext4    noatime 1 2
+/dev/sda1                              /boot                   ext3    noauto,noatime          0 0
+/dev/sda3                              /                       ext4    noatime,acl,user_xattr  0 1
+/dev/sda2                              none                    swap    sw                      0 0
+/dev/cdrom                             /mnt/cdrom              auto    noauto,ro               0 0
+/dev/fd0                               /mnt/floppy             auto    noauto                  0 0
+/dev/vg1/data                          /data                   ext4    defaults,acl,user_xattr 1 2
+/dev/vg1/home                          /home                   ext4    defaults,acl,user_xattr 1 2
+/dev/vg1/distfiles                     /usr/portage/distfiles  ext4    noatime                 1 2
+/dev/vg1/images                                /var/lib/images         ext4    noatime                 1 2
 
 # glibc 2.2 and above expects tmpfs to be mounted at /dev/shm for 
 # POSIX shared memory (shm_open, shm_unlink).
 # (tmpfs is a dynamically expandable/shrinkable ramdisk, and will
 #  use almost no memory if not populated with files)
-shm                    /dev/shm                tmpfs           nodev,nosuid,noexec     0 0
+shm                                    /dev/shm                tmpfs   nodev,nosuid,noexec     0 0
 
 # Bind mountings ...
-/data/all/Bilder                       /home/frank/Bilder      none    bind    0 0
-/data/all/Dokumente/Frank              /home/frank/Dokumente   none    bind    0 0
-/data/all/Dokumente/Frank/sounds       /home/frank/Musik       none    bind    0 0
-/data/frank/Tracks                     /home/frank/Tracks      none    bind    0 0
-/data/doris                            /home/doris/data        none    bind    0 0
-/data/all/Dokumente/Doris              /home/doris/Dokumente   none    bind    0 0
-/data/all/Dokumente/Patrick            /home/patrick/Dokumente none    bind    0 0
+/data/all/Bilder                       /home/frank/Bilder      none    bind                    0 0
+/data/all/Dokumente/Frank              /home/frank/Dokumente   none    bind                    0 0
+/data/all/Dokumente/Frank/sounds       /home/frank/Musik       none    bind                    0 0
+/data/frank/Tracks                     /home/frank/Tracks      none    bind                    0 0
+/data/doris                            /home/doris/data        none    bind                    0 0
+/data/all/Dokumente/Doris              /home/doris/Dokumente   none    bind                    0 0
+/data/all/Dokumente/Patrick            /home/patrick/Dokumente none    bind                    0 0
 

diff --git a/group b/group
index c81989603eaee0f1186885395fb71be396f9832e..94ad9ec1a297f94fd0d7a147de5782a84aeac0d7 100644 (file)
--- a/group
+++ b/group
@@ -62,4 +62,4 @@ postdrop:x:208:
 hsqldb:x:991:
 postgres:x:70:
 realtime:x:990:
-vboxusers:x:989:
+vboxusers:x:989:frank

diff --git a/portage/package.use b/portage/package.use
index ea60ef1c35ea974d6e6377a0226f4b67d10976c8..d79e5b258d1e6f9b61524d196b5790aafd491e44 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -13,6 +13,7 @@ app-crypt/johntheripper                       custom-cflags
 app-crypt/seahorse-plugins             applet
 
 #app-doc/xorg-docs                     -doc
+app-doc/doxygen                                dot
 
 #app-editors/vim                               vim-pager vim-with-x
 #app-editors/gvim                      netbeans
@@ -130,9 +131,9 @@ mail-mta/postfix                    vda
 media-gfx/dcraw                                gimp
 media-gfx/exiv2                                contrib xmp
 media-gfx/gimp                         gimpprint smp
+media-gfx/graphicsmagick               fpx
 media-gfx/graphviz                     pango
-#media-gfx/imagemagick                 autotrace fpx gs hdri lqr raw webp
-media-gfx/imagemagick                  corefonts fpx gs hdri lqr webp
+media-gfx/imagemagick                  autotrace corefonts fftw fpx gs hdri lqr mpeg pango raw webp
 media-gfx/inkscape                     dia gs inkjar postscript
 media-gfx/pstoedit                     emf
 media-gfx/ufraw                        exif gnome contrast gimp hotpixels lensfun timezone
@@ -144,7 +145,6 @@ media-libs/fontconfig                       -doc
 media-libs/freetype                    utils
 # media-libs/gd                                fontconfig
 media-libs/gegl                                -ffmpeg graphviz raw
-#graphviz% -raw -umfpack
 media-libs/giflib                      rle
 media-libs/libgphoto2                  -zeroconf
 media-libs/libmp4v2                    utils
@@ -172,8 +172,7 @@ media-sound/jack-audio-connection-kit       jack-tmpfs netjack
 media-sound/pulseaudio                 asyncns equalizer
 media-sound/sox                                amrnb amrwb
 
-#media-video/ffmpeg                    dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx
-media-video/ffmpeg                     dirac faac faad gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx
+media-video/ffmpeg                     aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger vaapi vhook vpx
 media-video/kino                       gpac
 media-video/mjpegtools                 yv12
 media-video/mplayer                    3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc

diff --git a/samba/smb.conf b/samba/smb.conf
index 43e7c537fe51831dac04fc008c0163dd58f707fd..444441729bae36d66d2a7ec7b2dd29c0c5efbdfc 100644 (file)
--- a/samba/smb.conf
+++ b/samba/smb.conf
@@ -4,20 +4,21 @@
 ;      workgroup = Brehm
        workgroup = HENNIG
        netbios name = Bruni
-       server string = %h
-;      server string = %h - (Samba %v)
+;      server string = %h
+       server string = %h - (Samba %v)
        load printers = yes
        printing = cups
 ;      printcap name = cups
        printcap name = /etc/printcap
+       cups options = raw
 ;      printer admin = @adm
 ;      printer admin = @"Domain Admins"
        log file = /var/log/samba/log.%m
        max log size = 5120
        log level = 2 passdb:5 auth:10
 ;      hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64
-       guest account = pcguest
-       map to guest = bad user
+       #guest account = pcguest
+       #map to guest = bad user
        security = user
 ;      password server = <NT-Server-Name>
 ;      password server = *
@@ -26,6 +27,7 @@
        encrypt passwords = true
 ;      smb passwd file = /var/lib/samba/private/smbpasswd
        passdb backend = tdbsam
+       lanman auth = yes
 ;      unix password sync = Yes
 ;      pam password change = yes
 ;      passwd program = /usr/bin/passwd %u
@@ -40,7 +42,8 @@
 ;      template shell = /bin/bash
        #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 ;      interfaces = eth0 eth1 10.12.11.0/24
-       interfaces = eth0
+       #interfaces = eth0
+       interfaces = lo 10.12.11.0/24 172.20.1.0/24
 ;      remote browse sync = 192.168.3.25 192.168.5.255
 ;      remote browse sync = 10.12.11.255 
 ;      remote announce = 192.168.1.255 192.168.2.44
@@ -82,7 +85,7 @@
 
 ;      wins proxy = yes
 
-;      dns proxy = no 
+       dns proxy = no 
 
 ;      preserve case = no
 ;      short preserve case = no
@@ -92,12 +95,19 @@
        dos charset = 850
        unix charset = UTF-8
 
+       force create mode = 0644
+       force directory mode = 0755
+       create mask = 000
+       directory mask = 000
+
        follow symlinks = yes
 ;      wide links = yes
 ;      unix extensions = no
        wide links = no
        unix extensions = yes
 
+       force group = users
+
 
 #============================ Share Definitions ==============================
 [homes]
@@ -169,7 +179,7 @@
        writable = no
        write list = @users
        printable = no
-;      force user = frank
+       force user = frank
        create mask = 0664
        directory mask = 0775
 

diff --git a/samba/smbusers b/samba/smbusers
index 51b8dda2e99c6c01310e85635356dbf301afc40e..85f82eea7a235aecc835b6675e5d278c8ef27585 100644 (file)
--- a/samba/smbusers
+++ b/samba/smbusers
@@ -5,3 +5,4 @@
 
 root = Administrator admin
 nobody = guest pcguest smbguest
+frank = frank