From: Frank Brehm Date: Mon, 5 May 2014 11:24:27 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=10acca1aaede2811af9d6571fd60e7f0c86dc9d8;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index 035f4cc..77d1ae6 100644 --- a/ImageMagick-6/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -87,7 +87,7 @@ - + diff --git a/config-archive/etc/logrotate.d/syslog-ng.dist.new b/config-archive/etc/logrotate.d/syslog-ng.dist.new index e982686..1c67d90 100644 --- a/config-archive/etc/logrotate.d/syslog-ng.dist.new +++ b/config-archive/etc/logrotate.d/syslog-ng.dist.new @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate,v 1.3 2008/10/15 20:46:12 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $ # # Syslog-ng logrotate snippet for Gentoo Linux # contributed by Michael Sterrett @@ -8,6 +8,6 @@ missingok sharedscripts postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true + systemctl kill -s HUP syslog-ng > /dev/null 2>&1 || true endscript } diff --git a/fstab b/fstab index a7926f8..34243a5 100644 --- a/fstab +++ b/fstab @@ -30,3 +30,5 @@ /dev/cdrom /mnt/cdrom auto noauto,ro 0 0 /dev/fd0 /mnt/floppy auto noauto 0 0 + +/dev/sdc1 /mnt/usb_stick auto noauto,user 0 0 diff --git a/gimp/2.0/gimprc b/gimp/2.0/gimprc index aa22bc4..1efcc43 100644 --- a/gimp/2.0/gimprc +++ b/gimp/2.0/gimprc @@ -42,7 +42,7 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 2038820k) +# (tile-cache-size 2147483647) # Specifies the language to use for the user interface. This is a string # value. diff --git a/group b/group index e050621..46f5787 100644 --- a/group +++ b/group @@ -69,3 +69,4 @@ chef:x:980: dialout:x:979: systemd-journal:x:978: geoclue:x:977: +samba:x:976: diff --git a/group- b/group- index fe5a8e9..e050621 100644 --- a/group- +++ b/group- @@ -68,3 +68,4 @@ dropbox:x:981: chef:x:980: dialout:x:979: systemd-journal:x:978: +geoclue:x:977: diff --git a/gshadow b/gshadow index 7bbb8b8..5f2a450 100644 --- a/gshadow +++ b/gshadow @@ -69,3 +69,4 @@ chef:!:: dialout:!:: systemd-journal:!:: geoclue:!:: +samba:!:: diff --git a/gshadow- b/gshadow- index 81fe55c..7bbb8b8 100644 --- a/gshadow- +++ b/gshadow- @@ -68,3 +68,4 @@ dropbox:!:: chef:!:: dialout:!:: systemd-journal:!:: +geoclue:!:: diff --git a/i3/config b/i3/config index ff6c9db..de7e1fe 100644 --- a/i3/config +++ b/i3/config @@ -84,6 +84,13 @@ bindsym Mod1+a focus parent # focus the child container #bindsym Mod1+d focus child +# move the currently focused window to the scratchpad +bindsym Mod1+Shift+minus move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +bindsym Mod1+minus scratchpad show + # switch to workspace bindsym Mod1+1 workspace 1 bindsym Mod1+2 workspace 2 diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf index 5353927..aeba11d 100644 --- a/libvirt/libvirtd.conf +++ b/libvirt/libvirtd.conf @@ -63,7 +63,7 @@ # unique on the immediate broadcast network. # # The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) +# is substituted for the short hostname of the machine (without domain) # #mdns_name = "Virtualization Host Joe Demo" @@ -83,8 +83,8 @@ # Set the UNIX socket permissions for the R/O socket. This is used # for monitoring VM status only # -# Default allows any user. If setting group ownership may want to -# restrict this to: +# Default allows any user. If setting group ownership, you may want to +# restrict this too. #unix_sock_ro_perms = "0777" # Set the UNIX socket permissions for the R/W socket. This is used @@ -94,7 +94,7 @@ # the default will change to allow everyone (eg, 0777) # # If not using PolicyKit and setting group ownership for access -# control then you may want to relax this to: +# control, then you may want to relax this too. #unix_sock_rw_perms = "0770" # Set the name of the directory in which sockets will be found/created. @@ -113,7 +113,7 @@ # - sasl: use SASL infrastructure. The actual auth scheme is then # controlled from /etc/sasl2/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. -# For non-TCP or TLS sockets, any scheme is allowed. +# For non-TCP or TLS sockets, any scheme is allowed. # # - polkit: use PolicyKit to authenticate. This is only suitable # for use on the UNIX sockets. The default policy will @@ -216,7 +216,7 @@ #tls_no_verify_certificate = 1 -# A whitelist of allowed x509 Distinguished Names +# A whitelist of allowed x509 Distinguished Names # This list may contain wildcards such as # # "C=GB,ST=London,L=London,O=Red Hat,CN=*" @@ -255,7 +255,7 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. -#max_clients = 20 +#max_clients = 5000 # The maximum length of queue of connections waiting to be # accepted by the daemon. Note, that some protocols supporting @@ -263,6 +263,10 @@ # connection succeeds. #max_queued_clients = 1000 +# The maximum length of queue of accepted but not yet not +# authenticated clients. The default value is zero, meaning +# the feature is disabled. +#max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up # initially. If the number of active clients exceeds this, @@ -274,13 +278,13 @@ # The number of priority workers. If all workers from above -# pool will stuck, some calls marked as high priority +# pool are stuck, some calls marked as high priority # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 # Total global limit on concurrent RPC calls. Should be # at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impact +# will be read into memory and queued. This directly impacts # memory usage, currently each request requires 256 KB of # memory. So by default up to 5 MB of memory is used # @@ -318,7 +322,7 @@ # 3: WARNING # 4: ERROR # -# Multiple filter can be defined in a single @filters, they just need to be +# Multiple filters can be defined in a single @filters, they just need to be # separated by spaces. # # e.g. to only get warning or errors from the remote layer and only errors @@ -340,16 +344,16 @@ # 3: WARNING # 4: ERROR # -# Multiple output can be defined, they just need to be separated by spaces. +# Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: #log_outputs="3:syslog:libvirtd" # -# Log debug buffer size: default 64 -# The daemon keeps an internal debug log buffer which will be dumped in case -# of crash or upon receiving a SIGUSR2 signal. This setting allows to override -# the default buffer size in kilobytes. -# If value is 0 or less the debug log buffer is deactivated +# Log debug buffer size: +# +# This configuration option is no longer used, since the global +# log buffer functionality has been removed. Please configure +# suitable log_outputs/log_filters settings to obtain logs. #log_buffer_size = 64 @@ -387,7 +391,7 @@ ################################################################### # Keepalive protocol: # This allows libvirtd to detect broken client connections or even -# dead client. A keepalive message is sent to a client after +# dead clients. A keepalive message is sent to a client after # keepalive_interval seconds of inactivity to check if the client is # still responding; keepalive_count is a maximum number of keepalive # messages that are allowed to be sent to the client without getting @@ -396,7 +400,7 @@ # keepalive_interval * (keepalive_count + 1) seconds since the last # message received from the client. If keepalive_interval is set to # -1, libvirtd will never send keepalive requests; however clients -# can still send them and the deamon will send responses. When +# can still send them and the daemon will send responses. When # keepalive_count is set to 0, connections will be automatically # closed after keepalive_interval seconds of inactivity without # sending any keepalive messages. diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf index 17f1b10..f0e802f 100644 --- a/libvirt/qemu.conf +++ b/libvirt/qemu.conf @@ -58,7 +58,7 @@ #vnc_tls_x509_verify = 1 -# The default VNC password. Only 8 letters are significant for +# The default VNC password. Only 8 bytes are significant for # VNC passwords. This parameter is only used if the per-domain # XML config does not already provide a password. To allow # access without passwords, leave this commented out. An empty @@ -180,7 +180,7 @@ # VNC WebSocket port policies, same rules apply as with remote display # ports. VNC WebSockets use similar display <-> port mappings, with -# the exception being that ports starts from 5700 instead of 5900. +# the exception being that ports start from 5700 instead of 5900. # #remote_websocket_port_min = 5700 #remote_websocket_port_max = 65535 @@ -333,7 +333,7 @@ # disable guest hugepage backing. # # NB, within this mount point, guests will create memory backing files -# in a location of $MOUNTPOINT/libvirt/qemu +# in a location of $MOUNTPOINT/libvirt/qemu # #hugetlbfs_mount = "/dev/hugepages" @@ -402,11 +402,13 @@ #allow_disk_format_probing = 1 -# To enable 'Sanlock' project based locking of the file -# content (to prevent two VMs writing to the same -# disk), uncomment this +# In order to prevent accidentally starting two domains that +# share one writable disk, libvirt offers two approaches for +# locking files. The first one is sanlock, the other one, +# virtlockd, is then our own implementation. Accepted values +# are "sanlock" and "lockd". # -#lock_manager = "sanlock" +#lock_manager = "lockd" @@ -421,14 +423,14 @@ # Keepalive protocol: # This allows qemu driver to detect broken connections to remote # libvirtd during peer-to-peer migration. A keepalive message is -# sent to the deamon after keepalive_interval seconds of inactivity -# to check if the deamon is still responding; keepalive_count is a +# sent to the daemon after keepalive_interval seconds of inactivity +# to check if the daemon is still responding; keepalive_count is a # maximum number of keepalive messages that are allowed to be sent -# to the deamon without getting any response before the connection +# to the daemon without getting any response before the connection # is considered broken. In other words, the connection is # automatically closed approximately after # keepalive_interval * (keepalive_count + 1) seconds since the last -# message received from the deamon. If keepalive_interval is set to +# message received from the daemon. If keepalive_interval is set to # -1, qemu driver will not send keepalive requests during # peer-to-peer migration; however, the remote libvirtd can still # send them and source libvirtd will send responses. When diff --git a/libvirt/virtlockd.conf b/libvirt/virtlockd.conf index 652e156..4c935d0 100644 --- a/libvirt/virtlockd.conf +++ b/libvirt/virtlockd.conf @@ -52,11 +52,11 @@ #log_outputs="3:syslog:virtlockd" # -# Log debug buffer size: default 64 -# The daemon keeps an internal debug log buffer which will be dumped in case -# of crash or upon receiving a SIGUSR2 signal. This setting allows to override -# the default buffer size in kilobytes. -# If value is 0 or less the debug log buffer is deactivated +# Log debug buffer size: +# +# This configuration option is no longer used, since the global +# log buffer functionality has been removed. Please configure +# suitable log_outputs/log_filters settings to obtain logs. #log_buffer_size = 64 # The maximum number of concurrent client connections to allow diff --git a/portage/make.conf b/portage/make.conf index 0a7b47e..81924e0 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -20,7 +20,7 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \ kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \ libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo \ - meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ + mate meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \ nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ plotutils posix postgres postscript projectm python quicktime rdesktop \ diff --git a/revdep-rebuild/61-oracle-jdk-bin-1.7 b/revdep-rebuild/61-oracle-jdk-bin-1.7 index f822b66..a0ed67e 100644 --- a/revdep-rebuild/61-oracle-jdk-bin-1.7 +++ b/revdep-rebuild/61-oracle-jdk-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.51" +SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.55" diff --git a/revdep-rebuild/61-oracle-jre-bin-1.7 b/revdep-rebuild/61-oracle-jre-bin-1.7 index 3db052e..4fbb53f 100644 --- a/revdep-rebuild/61-oracle-jre-bin-1.7 +++ b/revdep-rebuild/61-oracle-jre-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.51" +SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.55" diff --git a/sysconfig/libvirtd b/sysconfig/libvirtd index 3af1f03..f15e595 100644 --- a/sysconfig/libvirtd +++ b/sysconfig/libvirtd @@ -20,5 +20,14 @@ # #SDL_AUDIODRIVER=pulse -# Override the maximum number of opened files +# Override the maximum number of opened files. +# This only works with traditional init scripts. +# In the systemd world, the limit can only be changed by overriding +# LimitNOFILE for libvirtd.service. To do that, just create a *.conf +# file in /etc/systemd/system/libvirtd.service.d/ (for example +# /etc/systemd/system/libvirtd.service.d/openfiles.conf) and write +# the following two lines in it: +# [Service] +# LimitNOFILE=2048 +# #LIBVIRTD_NOFILES_LIMIT=2048