From: Frank Brehm Date: Sat, 22 Feb 2014 08:06:38 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=945e2f2e0df5cbaf12375a3eb297725bd25a55df;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/cups/printers.conf b/cups/printers.conf index f009e8fb..8abb40e9 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.6.4 -# Written by cupsd on 2014-02-09 17:40 +# Written by cupsd on 2014-02-11 00:05 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 6ea85611..18c17e2d 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2944,39 +2944,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3049,9 +3049,9 @@ - - - + + + @@ -18190,13 +18190,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18206,13 +18204,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18222,13 +18218,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18238,13 +18232,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18254,13 +18246,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18270,13 +18260,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18286,13 +18274,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18302,13 +18288,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18318,13 +18302,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18334,13 +18316,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18350,13 +18330,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18366,13 +18344,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18382,13 +18358,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18398,13 +18372,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18414,13 +18386,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18430,13 +18400,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18446,13 +18414,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18462,13 +18428,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18478,13 +18442,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18494,13 +18456,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18510,13 +18470,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -20244,13 +20202,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20258,7 +20216,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -20266,13 +20224,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20280,7 +20238,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -20288,13 +20246,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20302,7 +20260,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -20310,13 +20268,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20324,7 +20282,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -20332,13 +20290,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20346,7 +20304,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -20354,13 +20312,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20368,7 +20326,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -20376,13 +20334,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20390,7 +20348,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20676,13 +20634,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20690,7 +20648,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/openvpn/hidrive/ca.drive.strato.com.crt b/openvpn/hidrive/ca.drive.strato.com.crt new file mode 100644 index 00000000..f72c9401 --- /dev/null +++ b/openvpn/hidrive/ca.drive.strato.com.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEOzCCAyOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJERTEP +MA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xIDAeBgNVBAoTF1N0cmF0 +byBSZWNoZW56ZW50cnVtIEFHMSMwIQYDVQQDExpTdHJhdG8gUmVjaGVuemVudHJ1 +bSBBRyBDQTAeFw0wOTA5MTExMDQzMTFaFw0yOTA5MTExMDQzMTFaMHYxCzAJBgNV +BAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEgMB4GA1UE +ChMXU3RyYXRvIFJlY2hlbnplbnRydW0gQUcxIzAhBgNVBAMTGlN0cmF0byBSZWNo +ZW56ZW50cnVtIEFHIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +0Pe72T2CTfhv9nNkpmMJuV/oEb7UCJO3f3Z47Hk3O8xd/rzyFvYjmOPFiHt5rHdj +QcqmBiWUKGdvcWsC/brK9KfBx4BPKc/yUrlWx8Kscsc1omYdbCdcGOJFbxJLGkSB +K8j3ebuUdb+Lx9EpzKrDvYcteCraI0X/VyT6Uwdaw6hpNvyNnzpcf3NzmF8X4Fug +CDMUpe8YRg+leaQe++To6Ef73Ikia99R6guEk2NErO9HLwCLzlK55ICPMAenywAV +uAvKP0gp0cywyjZ5pGjDNXFlsfUyKhQYdtsoGcs6I3qrCnu20Qdt2EPgttCtJcP0 +mcqzb7zrBjAbGNxqfgDOIQIDAQABo4HTMIHQMB0GA1UdDgQWBBQAGsZhcOA1JR9P +oRII3HNb6eTIqDCBoAYDVR0jBIGYMIGVgBQAGsZhcOA1JR9PoRII3HNb6eTIqKF6 +pHgwdjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy +bGluMSAwHgYDVQQKExdTdHJhdG8gUmVjaGVuemVudHJ1bSBBRzEjMCEGA1UEAxMa +U3RyYXRvIFJlY2hlbnplbnRydW0gQUcgQ0GCAQAwDAYDVR0TBAUwAwEB/zANBgkq +hkiG9w0BAQUFAAOCAQEAVPK504dvYp5n5tcejFNNdaoZi1+9uNqaBzJRrMRyZG0w +ufZZy5hvtWThF+OfQscmdGXbsAN+eld+/c1S7xgpgCbFFjZIh+Yc3D8eUuTMniYH +v6Ih+80BwfvWQ9ZekOyouoc/g7XvhZib7nzq0KIPIQbY/D5oFVPOjGqN0m2tU0Li +h0o5L1p0ABPXKSyIPW7tFhxmnQId990RzB3NSqd9dkJKIm1OIdv9GFfbFHRDheYs +66bv79XSkLxeF1/McNxtH76oB8DktSowzt1lcMgosa8KCcWUa4FxgS8Zn33lA6Q0 +SWuvizaQgM0AFFHk8s1nPlSeXRDu0+uPpMOpaQ50qg== +-----END CERTIFICATE----- diff --git a/openvpn/hidrive/frank.brehm.credentials b/openvpn/hidrive/frank.brehm.credentials new file mode 100644 index 00000000..7ff08281 --- /dev/null +++ b/openvpn/hidrive/frank.brehm.credentials @@ -0,0 +1,2 @@ +frank.brehm +5eZXG-Ec diff --git a/openvpn/hidrive/hidrive.strato.com.ovpn b/openvpn/hidrive/hidrive.strato.com.ovpn new file mode 100644 index 00000000..1d96f706 --- /dev/null +++ b/openvpn/hidrive/hidrive.strato.com.ovpn @@ -0,0 +1,8 @@ +dev tun +client +remote openvpn.hidrive.strato.com +auth-user-pass /etc/openvpn/hidrive/frank.brehm.credentials +auth-retry interact +ca /etc/openvpn/hidrive/ca.drive.strato.com.crt +tls-auth /etc/openvpn/hidrive/tls-auth.key +ns-cert-type server diff --git a/openvpn/hidrive/tls-auth.key b/openvpn/hidrive/tls-auth.key new file mode 100644 index 00000000..396172c1 --- /dev/null +++ b/openvpn/hidrive/tls-auth.key @@ -0,0 +1,21 @@ +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +aa21c5facb594491bc40959f73ff1f79 +be815195f2b9b22d3c672e9580db574a +ada6fa5e22a9be42c744b91fe988f4fc +582480ae85ea00fd59b60757d7cf859d +ceb3ca0f35b0ba9af1947521de78a917 +7947ffb55a1fef3d800779fac89d2879 +fe9f8fd87a99b1f82561ab9b2e91e5c2 +e788f92016f5f47ba1ff158897a26a5c +79f627de5c48a9828c0ca4df34b5ef40 +eab016669f28e0c84ed6c7974a12ec19 +15a16e213d4a70832c85b59ccc74277f +da3309006c90289f1fca2c726eada188 +3a86299a865149b7e178ad6235e1a153 +775896594296ff24d2ab63f881021a2b +8a23e100df2153e332c0d0bb555185eb +2da94fd9b2b1b950acd075044607eddf +-----END OpenVPN Static key V1----- diff --git a/portage/make.conf b/portage/make.conf index 884ef137..3c66d5f6 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -40,7 +40,8 @@ ACCEPT_LICENSE=" \ Oracle-BCLA-JavaSE \ " -EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=2 --load-average=8 --ignore-built-slot-operator-deps=y" +#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8" +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y" #EMERGE_DEFAULT_OPTS="--with-bdeps y --load-average=10 --ignore-built-slot-operator-deps=y" #EMERGE_DEFAULT_OPTS="--with-bdeps y"