diff --git a/conf.d/._cfg0000_dmcrypt b/conf.d/._cfg0000_dmcrypt deleted file mode 100644 index 0f6b554..0000000 --- a/conf.d/._cfg0000_dmcrypt +++ /dev/null @@ -1,105 +0,0 @@ -# /etc/conf.d/dmcrypt - -# For people who run dmcrypt on top of some other layer (like raid), -# use rc_need to specify that requirement. See the runscript(8) man -# page for more information. - -#-------------------- -# Instructions -#-------------------- - -# Note regarding the syntax of this file. This file is *almost* bash, -# but each line is evaluated separately. Separate swaps/targets can be -# specified. The init-script which reads this file assumes that a -# swap= or target= line starts a new section, similar to lilo or grub -# configuration. - -# Note when using gpg keys and /usr on a separate partition, you will -# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly -# and ensure that gpg has been compiled statically. -# See http://bugs.gentoo.org/90482 for more information. - -# Note that the init-script which reads this file detects whether your -# partition is LUKS or not. No mkfs is run unless you specify a makefs -# option. - -# Global options: -#---------------- - -# Max number of checks to perform (1 per second) -#dmcrypt_max_timeout=120 - -# Arguments: -#----------- -# target= == Mapping name for partition. -# swap= == Mapping name for swap partition. -# source='' == Real device for partition. -# Note: You can (and should) specify a tag like UUID -# for blkid (see -t option). This is safer than using -# the full path to the device. -# key='[:]' == Fullpath from / or from inside removable media. -# remdev='' == Device that will be assigned to removable media. -# gpg_options='' == Default are --quiet --decrypt -# options='' == cryptsetup, for LUKS you can only use --readonly -# loop_file='' == Loopback file. -# Note: If you omit $source, then a free loopback will -# be looked up automatically. -# pre_mount='cmds' == commands to execute before mounting partition. -# post_mount='cmds' == commands to execute after mounting partition. -#----------- -# Supported Modes -# gpg == decrypt and pipe key into cryptsetup. -# Note: new-line character must not be part of key. -# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' - -#-------------------- -# dm-crypt examples -#-------------------- - -## swap -# Swap partitions. These should come first so that no keys make their -# way into unencrypted swap. -# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom -# If no makefs is given then mkswap will be assumed -#swap=crypt-swap -#source='/dev/hda2' - -## /home with passphrase -#target=crypt-home -#source='/dev/hda5' - -## /home with regular keyfile -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' - -## /home with gpg protected key -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' - -## /home with regular keyfile on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' -#remdev='/dev/sda1' - -##/home with gpg protected key on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' -#remdev='/dev/sda1' - -##/tmp with regular keyfile -#target=crypt-tmp -#source='/dev/hda6' -#key='/full/path/to/tmpkey' -#pre_mount='/sbin/mkreiserfs -f -f ${dev}' -#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' - -## Loopback file example -#target='crypt-loop-home' -#source='/dev/loop0' -#loop_file='/mnt/crypt/home' - -# The file must be terminated by a newline. Or leave this comment last. diff --git a/conf.d/dmcrypt b/conf.d/dmcrypt index 9747dff..0f6b554 100644 --- a/conf.d/dmcrypt +++ b/conf.d/dmcrypt @@ -34,11 +34,16 @@ # target= == Mapping name for partition. # swap= == Mapping name for swap partition. # source='' == Real device for partition. +# Note: You can (and should) specify a tag like UUID +# for blkid (see -t option). This is safer than using +# the full path to the device. # key='[:]' == Fullpath from / or from inside removable media. # remdev='' == Device that will be assigned to removable media. # gpg_options='' == Default are --quiet --decrypt # options='' == cryptsetup, for LUKS you can only use --readonly # loop_file='' == Loopback file. +# Note: If you omit $source, then a free loopback will +# be looked up automatically. # pre_mount='cmds' == commands to execute before mounting partition. # post_mount='cmds' == commands to execute after mounting partition. #----------- @@ -96,3 +101,5 @@ #target='crypt-loop-home' #source='/dev/loop0' #loop_file='/mnt/crypt/home' + +# The file must be terminated by a newline. Or leave this comment last. diff --git a/couchdb/._cfg0000_default.ini b/couchdb/._cfg0000_default.ini deleted file mode 100644 index 21e7a93..0000000 --- a/couchdb/._cfg0000_default.ini +++ /dev/null @@ -1,355 +0,0 @@ -; etc/couchdb/default.ini.tpl. Generated from default.ini.tpl.in by configure. - -; Upgrading CouchDB will overwrite this file. -[vendor] -name = The Apache Software Foundation -version = 1.5.1 - -[couchdb] -database_dir = /var/lib/couchdb -view_index_dir = /var/lib/couchdb -util_driver_dir = /usr/lib64/couchdb/erlang/lib/couch-1.5.1/priv/lib -max_document_size = 4294967296 ; 4 GB -os_process_timeout = 5000 ; 5 seconds. for view and external servers. -max_dbs_open = 100 -delayed_commits = true ; set this to false to ensure an fsync before 201 Created is returned -uri_file = /var/run/couchdb/couch.uri -; Method used to compress everything that is appended to database and view index files, except -; for attachments (see the attachments section). Available methods are: -; -; none - no compression -; snappy - use google snappy, a very fast compressor/decompressor -; deflate_[N] - use zlib's deflate, N is the compression level which ranges from 1 (fastest, -; lowest compression ratio) to 9 (slowest, highest compression ratio) -file_compression = snappy -; Higher values may give better read performance due to less read operations -; and/or more OS page cache hits, but they can also increase overall response -; time for writes when there are many attachment write requests in parallel. -attachment_stream_buffer_size = 4096 - -plugin_dir = /usr/lib64/couchdb/plugins - -[database_compaction] -; larger buffer sizes can originate smaller files -doc_buffer_size = 524288 ; value in bytes -checkpoint_after = 5242880 ; checkpoint after every N bytes were written - -[view_compaction] -; larger buffer sizes can originate smaller files -keyvalue_buffer_size = 2097152 ; value in bytes - -[httpd] -port = 5984 -bind_address = 127.0.0.1 -authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} -default_handler = {couch_httpd_db, handle_request} -secure_rewrites = true -vhost_global_handlers = _utils, _uuids, _session, _oauth, _users -allow_jsonp = false -; Options for the MochiWeb HTTP server. -;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] -; For more socket options, consult Erlang's module 'inet' man page. -;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] -log_max_chunk_size = 1000000 -enable_cors = false - -[ssl] -port = 6984 - -[log] -file = /var/log/couchdb/couch.log -level = info -include_sasl = true - -[couch_httpd_auth] -authentication_db = _users -authentication_redirect = /_utils/session.html -require_valid_user = false -timeout = 600 ; number of seconds before automatic logout -auth_cache_size = 50 ; size is number of cache entries -allow_persistent_cookies = false ; set to true to allow persistent cookies -iterations = 10 ; iterations for password hashing -; comma-separated list of public fields, 404 if empty -; public_fields = - -[cors] -credentials = false -; List of origins separated by a comma, * means accept all -; Origins must include the scheme: http://example.com -; You can’t set origins: * and credentials = true at the same time. -;origins = * -; List of accepted headers separated by a comma -; headers = -; List of accepted methods -; methods = - - -; Configuration for a vhost -;[cors:http://example.com] -; credentials = false -; List of origins separated by a comma -; Origins must include the scheme: http://example.com -; You can’t set origins: * and credentials = true at the same time. -;origins = -; List of accepted headers separated by a comma -; headers = -; List of accepted methods -; methods = - -[couch_httpd_oauth] -; If set to 'true', oauth token and consumer secrets will be looked up -; in the authentication database (_users). These secrets are stored in -; a top level property named "oauth" in user documents. Example: -; { -; "_id": "org.couchdb.user:joe", -; "type": "user", -; "name": "joe", -; "password_sha": "fe95df1ca59a9b567bdca5cbaf8412abd6e06121", -; "salt": "4e170ffeb6f34daecfd814dfb4001a73" -; "roles": ["foo", "bar"], -; "oauth": { -; "consumer_keys": { -; "consumerKey1": "key1Secret", -; "consumerKey2": "key2Secret" -; }, -; "tokens": { -; "token1": "token1Secret", -; "token2": "token2Secret" -; } -; } -; } -use_users_db = false - -[query_servers] -javascript = /usr/bin/couchjs /usr/share/couchdb/server/main.js -coffeescript = /usr/bin/couchjs /usr/share/couchdb/server/main-coffee.js - - -; Changing reduce_limit to false will disable reduce_limit. -; If you think you're hitting reduce_limit with a "good" reduce function, -; please let us know on the mailing list so we can fine tune the heuristic. -[query_server_config] -reduce_limit = true -os_process_limit = 25 - -[daemons] -index_server={couch_index_server, start_link, []} -external_manager={couch_external_manager, start_link, []} -query_servers={couch_query_servers, start_link, []} -vhosts={couch_httpd_vhost, start_link, []} -httpd={couch_httpd, start_link, []} -stats_aggregator={couch_stats_aggregator, start, []} -stats_collector={couch_stats_collector, start, []} -uuids={couch_uuids, start, []} -auth_cache={couch_auth_cache, start_link, []} -replicator_manager={couch_replicator_manager, start_link, []} -os_daemons={couch_os_daemons, start_link, []} -compaction_daemon={couch_compaction_daemon, start_link, []} - -[httpd_global_handlers] -/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>} -favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "/usr/share/couchdb/www"} - -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/share/couchdb/www"} -_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req} -_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req} -_config = {couch_httpd_misc_handlers, handle_config_req} -_replicate = {couch_replicator_httpd, handle_req} -_uuids = {couch_httpd_misc_handlers, handle_uuids_req} -_restart = {couch_httpd_misc_handlers, handle_restart_req} -_stats = {couch_httpd_stats_handlers, handle_stats_req} -_log = {couch_httpd_misc_handlers, handle_log_req} -_session = {couch_httpd_auth, handle_session_req} -_oauth = {couch_httpd_oauth, handle_oauth_req} -_db_updates = {couch_dbupdates_httpd, handle_req} -_plugins = {couch_plugins_httpd, handle_req} - -[httpd_db_handlers] -_all_docs = {couch_mrview_http, handle_all_docs_req} -_changes = {couch_httpd_db, handle_changes_req} -_compact = {couch_httpd_db, handle_compact_req} -_design = {couch_httpd_db, handle_design_req} -_temp_view = {couch_mrview_http, handle_temp_view_req} -_view_cleanup = {couch_mrview_http, handle_cleanup_req} - -; The external module takes an optional argument allowing you to narrow it to a -; single script. Otherwise the script name is inferred from the first path section -; after _external's own path. -; _mypath = {couch_httpd_external, handle_external_req, <<"mykey">>} -; _external = {couch_httpd_external, handle_external_req} - -[httpd_design_handlers] -_compact = {couch_mrview_http, handle_compact_req} -_info = {couch_mrview_http, handle_info_req} -_list = {couch_mrview_show, handle_view_list_req} -_rewrite = {couch_httpd_rewrite, handle_rewrite_req} -_show = {couch_mrview_show, handle_doc_show_req} -_update = {couch_mrview_show, handle_doc_update_req} -_view = {couch_mrview_http, handle_view_req} - -; enable external as an httpd handler, then link it with commands here. -; note, this api is still under consideration. -; [external] -; mykey = /path/to/mycommand - -; Here you can setup commands for CouchDB to manage -; while it is alive. It will attempt to keep each command -; alive if it exits. -; [os_daemons] -; some_daemon_name = /path/to/script -with args - - -[uuids] -; Known algorithms: -; random - 128 bits of random awesome -; All awesome, all the time. -; sequential - monotonically increasing ids with random increments -; First 26 hex characters are random. Last 6 increment in -; random amounts until an overflow occurs. On overflow, the -; random prefix is regenerated and the process starts over. -; utc_random - Time since Jan 1, 1970 UTC with microseconds -; First 14 characters are the time in hex. Last 18 are random. -; utc_id - Time since Jan 1, 1970 UTC with microseconds, plus utc_id_suffix string -; First 14 characters are the time in hex. uuids/utc_id_suffix string value is appended to these. -algorithm = sequential -; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm. -; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids. -utc_id_suffix = -# Maximum number of UUIDs retrievable from /_uuids in a single request -max_count = 1000 - -[stats] -; rate is in milliseconds -rate = 1000 -; sample intervals are in seconds -samples = [0, 60, 300, 900] - -[attachments] -compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression -compressible_types = text/*, application/javascript, application/json, application/xml - -[replicator] -db = _replicator -; Maximum replicaton retry count can be a non-negative integer or "infinity". -max_replication_retry_count = 10 -; More worker processes can give higher network throughput but can also -; imply more disk and network IO. -worker_processes = 4 -; With lower batch sizes checkpoints are done more frequently. Lower batch sizes -; also reduce the total amount of used RAM memory. -worker_batch_size = 500 -; Maximum number of HTTP connections per replication. -http_connections = 20 -; HTTP connection timeout per replication. -; Even for very fast/reliable networks it might need to be increased if a remote -; database is too busy. -connection_timeout = 30000 -; If a request fails, the replicator will retry it up to N times. -retries_per_request = 10 -; Some socket options that might boost performance in some scenarios: -; {nodelay, boolean()} -; {sndbuf, integer()} -; {recbuf, integer()} -; {priority, integer()} -; See the `inet` Erlang module's man page for the full list of options. -socket_options = [{keepalive, true}, {nodelay, false}] -; Path to a file containing the user's certificate. -;cert_file = /full/path/to/server_cert.pem -; Path to file containing user's private PEM encoded key. -;key_file = /full/path/to/server_key.pem -; String containing the user's password. Only used if the private keyfile is password protected. -;password = somepassword -; Set to true to validate peer certificates. -verify_ssl_certificates = false -; File containing a list of peer trusted certificates (in the PEM format). -;ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt -; Maximum peer certificate depth (must be set even if certificate validation is off). -ssl_certificate_max_depth = 3 - -[compaction_daemon] -; The delay, in seconds, between each check for which database and view indexes -; need to be compacted. -check_interval = 300 -; If a database or view index file is smaller then this value (in bytes), -; compaction will not happen. Very small files always have a very high -; fragmentation therefore it's not worth to compact them. -min_file_size = 131072 - -[compactions] -; List of compaction rules for the compaction daemon. -; The daemon compacts databases and their respective view groups when all the -; condition parameters are satisfied. Configuration can be per database or -; global, and it has the following format: -; -; database_name = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ] -; _default = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ] -; -; Possible parameters: -; -; * db_fragmentation - If the ratio (as an integer percentage), of the amount -; of old data (and its supporting metadata) over the database -; file size is equal to or greater then this value, this -; database compaction condition is satisfied. -; This value is computed as: -; -; (file_size - data_size) / file_size * 100 -; -; The data_size and file_size values can be obtained when -; querying a database's information URI (GET /dbname/). -; -; * view_fragmentation - If the ratio (as an integer percentage), of the amount -; of old data (and its supporting metadata) over the view -; index (view group) file size is equal to or greater then -; this value, then this view index compaction condition is -; satisfied. This value is computed as: -; -; (file_size - data_size) / file_size * 100 -; -; The data_size and file_size values can be obtained when -; querying a view group's information URI -; (GET /dbname/_design/groupname/_info). -; -; * from _and_ to - The period for which a database (and its view groups) compaction -; is allowed. The value for these parameters must obey the format: -; -; HH:MM - HH:MM (HH in [0..23], MM in [0..59]) -; -; * strict_window - If a compaction is still running after the end of the allowed -; period, it will be canceled if this parameter is set to 'true'. -; It defaults to 'false' and it's meaningful only if the *period* -; parameter is also specified. -; -; * parallel_view_compaction - If set to 'true', the database and its views are -; compacted in parallel. This is only useful on -; certain setups, like for example when the database -; and view index directories point to different -; disks. It defaults to 'false'. -; -; Before a compaction is triggered, an estimation of how much free disk space is -; needed is computed. This estimation corresponds to 2 times the data size of -; the database or view index. When there's not enough free disk space to compact -; a particular database or view index, a warning message is logged. -; -; Examples: -; -; 1) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}] -; The `foo` database is compacted if its fragmentation is 70% or more. -; Any view index of this database is compacted only if its fragmentation -; is 60% or more. -; -; 2) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}] -; Similar to the preceding example but a compaction (database or view index) -; is only triggered if the current time is between midnight and 4 AM. -; -; 3) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}] -; Similar to the preceding example - a compaction (database or view index) -; is only triggered if the current time is between midnight and 4 AM. If at -; 4 AM the database or one of its views is still compacting, the compaction -; process will be canceled. -; -; 4) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}, {parallel_view_compaction, true}] -; Similar to the preceding example, but a database and its views can be -; compacted in parallel. -; -;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}] - diff --git a/couchdb/._cfg0000_local.ini b/couchdb/._cfg0000_local.ini deleted file mode 100644 index 8aae331..0000000 --- a/couchdb/._cfg0000_local.ini +++ /dev/null @@ -1,97 +0,0 @@ -; CouchDB Configuration Settings - -; Custom settings should be made in this file. They will override settings -; in default.ini, but unlike changes made to default.ini, this file won't be -; overwritten on server upgrade. - -[couchdb] -;max_document_size = 4294967296 ; bytes - -[httpd] -;port = 5984 -;bind_address = 127.0.0.1 -; Options for the MochiWeb HTTP server. -;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] -; For more socket options, consult Erlang's module 'inet' man page. -;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] - -; Uncomment next line to trigger basic-auth popup on unauthorized requests. -;WWW-Authenticate = Basic realm="administrator" - -; Uncomment next line to set the configuration modification whitelist. Only -; whitelisted values may be changed via the /_config URLs. To allow the admin -; to change this value over HTTP, remember to include {httpd,config_whitelist} -; itself. Excluding it from the list would require editing this file to update -; the whitelist. -;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}] - -[query_servers] -;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js - - -[httpd_global_handlers] -;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>} - -[couch_httpd_auth] -; If you set this to true, you should also uncomment the WWW-Authenticate line -; above. If you don't configure a WWW-Authenticate header, CouchDB will send -; Basic realm="server" in order to prevent you getting logged out. -; require_valid_user = false - -[log] -;level = debug - -[log_level_by_module] -; In this section you can specify any of the four log levels 'none', 'info', -; 'error' or 'debug' on a per-module basis. See src/*/*.erl for various -; modules. -;couch_httpd = error - - -[os_daemons] -; For any commands listed here, CouchDB will attempt to ensure that -; the process remains alive. Daemons should monitor their environment -; to know when to exit. This can most easily be accomplished by exiting -; when stdin is closed. -;foo = /path/to/command -with args - -[daemons] -; enable SSL support by uncommenting the following line and supply the PEM's below. -; the default ssl port CouchDB listens on is 6984 -; httpsd = {couch_httpd, start_link, [https]} - -[ssl] -;cert_file = /full/path/to/server_cert.pem -;key_file = /full/path/to/server_key.pem -;password = somepassword -; set to true to validate peer certificates -verify_ssl_certificates = false -; Path to file containing PEM encoded CA certificates (trusted -; certificates used for verifying a peer certificate). May be omitted if -; you do not want to verify the peer. -;cacert_file = /full/path/to/cacertf -; The verification fun (optional) if not specified, the default -; verification fun will be used. -;verify_fun = {Module, VerifyFun} -; maximum peer certificate depth -ssl_certificate_max_depth = 1 - -; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to -; the Virual Host will be redirected to the path. In the example below all requests -; to http://example.com/ are redirected to /database. -; If you run CouchDB on a specific port, include the port number in the vhost: -; example.com:5984 = /database -[vhosts] -;example.com = /database/ - -[update_notification] -;unique notifier name=/full/path/to/exe -with "cmd line arg" - -; To create an admin account uncomment the '[admins]' section below and add a -; line in the format 'username = password'. When you next start CouchDB, it -; will change the password to a hash (so that your passwords don't linger -; around in plain-text files). You can add more admin accounts with more -; 'username = password' lines. Don't forget to restart CouchDB after -; changing this. -[admins] -;admin = mysecretpassword diff --git a/couchdb/default.ini b/couchdb/default.ini index ad5d83d..21e7a93 100644 --- a/couchdb/default.ini +++ b/couchdb/default.ini @@ -3,12 +3,12 @@ ; Upgrading CouchDB will overwrite this file. [vendor] name = The Apache Software Foundation -version = 1.6.1 +version = 1.5.1 [couchdb] database_dir = /var/lib/couchdb view_index_dir = /var/lib/couchdb -util_driver_dir = /usr/lib64/couchdb/erlang/lib/couch-1.6.1/priv/lib +util_driver_dir = /usr/lib64/couchdb/erlang/lib/couch-1.5.1/priv/lib max_document_size = 4294967296 ; 4 GB os_process_timeout = 5000 ; 5 seconds. for view and external servers. max_dbs_open = 100 @@ -29,8 +29,6 @@ attachment_stream_buffer_size = 4096 plugin_dir = /usr/lib64/couchdb/plugins -; etc/couchdb/default.ini.tpl. Generated from default.ini.tpl.in by configure. - [database_compaction] ; larger buffer sizes can originate smaller files doc_buffer_size = 524288 ; value in bytes @@ -52,11 +50,8 @@ allow_jsonp = false ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] ; For more socket options, consult Erlang's module 'inet' man page. ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] -socket_options = [{recbuf, 262144}, {sndbuf, 262144}] log_max_chunk_size = 1000000 enable_cors = false -; CouchDB can optionally enforce a maximum uri length; -; max_uri_length = 8000 [ssl] port = 6984 @@ -74,8 +69,6 @@ timeout = 600 ; number of seconds before automatic logout auth_cache_size = 50 ; size is number of cache entries allow_persistent_cookies = false ; set to true to allow persistent cookies iterations = 10 ; iterations for password hashing -; min_iterations = 1 -; max_iterations = 1000000000 ; comma-separated list of public fields, 404 if empty ; public_fields = @@ -128,8 +121,8 @@ credentials = false use_users_db = false [query_servers] -javascript = /usr/local/bin/couchjs /usr/local/share/couchdb/server/main.js -coffeescript = /usr/local/bin/couchjs /usr/local/share/couchdb/server/main-coffee.js +javascript = /usr/bin/couchjs /usr/share/couchdb/server/main.js +coffeescript = /usr/bin/couchjs /usr/share/couchdb/server/main-coffee.js ; Changing reduce_limit to false will disable reduce_limit. @@ -155,9 +148,9 @@ compaction_daemon={couch_compaction_daemon, start_link, []} [httpd_global_handlers] / = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>} -favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "/usr/local/share/couchdb/www"} +favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "/usr/share/couchdb/www"} -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/local/share/couchdb/www"} +_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/share/couchdb/www"} _all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req} _active_tasks = {couch_httpd_misc_handlers, handle_task_status_req} _config = {couch_httpd_misc_handlers, handle_config_req} @@ -359,3 +352,4 @@ min_file_size = 131072 ; compacted in parallel. ; ;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}] + diff --git a/couchdb/local.ini b/couchdb/local.ini index a2a2335..905182e 100644 --- a/couchdb/local.ini +++ b/couchdb/local.ini @@ -6,7 +6,7 @@ [couchdb] ;max_document_size = 4294967296 ; bytes -uuid = 1c971bb8652d1deae6c5428a0642ad97 +uuid = ffef29560c9d96c5157c4bae04eb29e7 [httpd] ;port = 5984 @@ -96,4 +96,3 @@ ssl_certificate_max_depth = 1 ; changing this. [admins] ;admin = mysecretpassword - diff --git a/cups/._cfg0000_cups-files.conf b/cups/._cfg0000_cups-files.conf deleted file mode 100644 index 44dc3fe..0000000 --- a/cups/._cfg0000_cups-files.conf +++ /dev/null @@ -1,93 +0,0 @@ -# -# File/directory/user/group configuration file for the CUPS scheduler. -# See "man cups-files.conf" for a complete description of this file. -# - -# List of events that are considered fatal errors for the scheduler... -#FatalErrors config - -# Do we call fsync() after writing configuration or status files? -#SyncOnClose No - -# Default user and group for filters/backends/helper programs; this cannot be -# any user or group that resolves to ID 0 for security reasons... -#User lp -#Group lp - -# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules... -# This cannot contain the Group value for security reasons... -SystemGroup lpadmin - - -# User that is substituted for unauthenticated (remote) root accesses... -#RemoteRoot remroot - -# Do we allow file: device URIs other than to /dev/null? -#FileDevice No - -# Permissions for configuration and log files... -#ConfigFilePerm 0640 -#LogFilePerm 0644 - -# Location of the file logging all access to the scheduler; may be the name -# "syslog". If not an absolute path, the value of ServerRoot is used as the -# root directory. Also see the "AccessLogLevel" directive in cupsd.conf. -AccessLog /var/log/cups/access_log - -# Location of cache files used by the scheduler... -#CacheDir /var/cache/cups - -# Location of data files used by the scheduler... -#DataDir /usr/share/cups - -# Location of the static web content served by the scheduler... -#DocumentRoot /usr/share/cups/html - -# Location of the file logging all messages produced by the scheduler and any -# helper programs; may be the name "syslog". If not an absolute path, the value -# of ServerRoot is used as the root directory. Also see the "LogLevel" -# directive in cupsd.conf. -ErrorLog /var/log/cups/error_log - -# Location of fonts used by older print filters... -#FontPath /usr/share/cups/fonts - -# Location of LPD configuration -#LPDConfigFile xinetd:///etc/xinetd.d/cups-lpd - -# Location of the file logging all pages printed by the scheduler and any -# helper programs; may be the name "syslog". If not an absolute path, the value -# of ServerRoot is used as the root directory. Also see the "PageLogFormat" -# directive in cupsd.conf. -PageLog /var/log/cups/page_log - -# Location of the file listing all of the local printers... -#Printcap /etc/printcap - -# Format of the Printcap file... -#PrintcapFormat bsd -#PrintcapFormat plist -#PrintcapFormat solaris - -# Location of all spool files... -#RequestRoot /var/spool/cups - -# Location of helper programs... -#ServerBin /usr/lib/cups - -# SSL/TLS keychain for the scheduler... -#ServerKeychain ssl - -# Location of other configuration files... -#ServerRoot /etc/cups - -# Location of Samba configuration file... -#SMBConfigFile - -# Location of scheduler state files... -#StateDir /run/cups - -# Location of scheduler/helper temporary files. This directory is emptied on -# scheduler startup and cannot be one of the standard (public) temporary -# directory locations for security reasons... -#TempDir /var/spool/cups/tmp diff --git a/cups/cups-files.conf b/cups/cups-files.conf index 9cbbad8..44dc3fe 100644 --- a/cups/cups-files.conf +++ b/cups/cups-files.conf @@ -75,11 +75,8 @@ PageLog /var/log/cups/page_log # Location of helper programs... #ServerBin /usr/lib/cups -# SSL/TLS certificate for the scheduler... -#ServerCertificate ssl/server.crt - -# SSL/TLS private key for the scheduler... -#ServerKey ssl/server.key +# SSL/TLS keychain for the scheduler... +#ServerKeychain ssl # Location of other configuration files... #ServerRoot /etc/cups diff --git a/gimp/2.0/._cfg0000_gimprc b/gimp/2.0/._cfg0000_gimprc deleted file mode 100644 index 1f3f961..0000000 --- a/gimp/2.0/._cfg0000_gimprc +++ /dev/null @@ -1,721 +0,0 @@ -# This is the system-wide gimprc file. Any change made in this file will -# affect all users of this system, provided that they are not overriding the -# default values in their personal gimprc file. -# -# Lines that start with a '#' are comments. Blank lines are ignored. -# -# By default everything in this file is commented out. The file then -# documents the default values and shows what changes are possible. -# -# The variable ${gimp_dir} is set to the value of the environment variable -# GIMP2_DIRECTORY or, if that is not set, the compiled-in default value is -# used. If GIMP2_DIRECTORY is not an absolute path, it is interpreted -# relative to your home directory. - -# Sets the folder for temporary storage. Files will appear here during the -# course of running GIMP. Most files will disappear when GIMP exits, but -# some files are likely to remain, so it is best if this folder not be one -# that is shared by other users. This is a single folder. -# -# (temp-path "${gimp_dir}/tmp") - -# Sets the swap file location. GIMP uses a tile based memory allocation -# scheme. The swap file is used to quickly and easily swap tiles out to disk -# and back in. Be aware that the swap file can easily get very large if GIMP -# is used with large images. Also, things can get horribly slow if the swap -# file is created on a folder that is mounted over NFS. For these reasons, -# it may be desirable to put your swap file in "/tmp". This is a single -# folder. -# -# (swap-path "${gimp_dir}") - -# Sets how many processors GIMP should try to use simultaneously. This is an -# integer value. -# -# (num-processors 1) - -# When the amount of pixel data exceeds this limit, GIMP will start to swap -# tiles to disk. This is a lot slower but it makes it possible to work on -# images that wouldn't fit into memory otherwise. If you have a lot of RAM, -# you may want to set this to a higher value. The integer size can contain a -# suffix of 'B', 'K', 'M' or 'G' which makes GIMP interpret the size as being -# specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is -# specified the size defaults to being specified in kilobytes. -# -# (tile-cache-size 6132474k) - -# Specifies the language to use for the user interface. This is a string -# value. -# -# - -# Sets the level of interpolation used for scaling and other transformations. -# Possible values are none, linear, cubic and lanczos. -# -# (interpolation-type cubic) - -# Tools such as fuzzy-select and bucket fill find regions based on a -# seed-fill algorithm. The seed fill starts at the initially selected pixel -# and progresses in all directions until the difference of pixel intensity -# from the original is greater than a specified threshold. This value -# represents the default threshold. This is an integer value. -# -# (default-threshold 15) - -# Sets the plug-in search path. This is a colon-separated list of folders to -# search. -# -# (plug-in-path "${gimp_dir}/plug-ins:${gimp_plug_in_dir}/plug-ins") - -# Sets the module search path. This is a colon-separated list of folders to -# search. -# -# (module-path "${gimp_dir}/modules:${gimp_plug_in_dir}/modules") - -# Sets the interpreter search path. This is a colon-separated list of -# folders to search. -# -# (interpreter-path "${gimp_dir}/interpreters:${gimp_plug_in_dir}/interpreters") - -# Sets the environ search path. This is a colon-separated list of folders to -# search. -# -# (environ-path "${gimp_dir}/environ:${gimp_plug_in_dir}/environ") - -# Sets the brush search path. This is a colon-separated list of folders to -# search. -# -# (brush-path "${gimp_dir}/brushes:${gimp_data_dir}/brushes") - -# This is a colon-separated list of folders to search. -# -# (brush-path-writable "${gimp_dir}/brushes") - -# Sets the dynamics search path. This is a colon-separated list of folders -# to search. -# -# (dynamics-path "${gimp_dir}/dynamics:${gimp_data_dir}/dynamics") - -# This is a colon-separated list of folders to search. -# -# (dynamics-path-writable "${gimp_dir}/dynamics") - -# Sets the pattern search path. This is a colon-separated list of folders to -# search. -# -# (pattern-path "${gimp_dir}/patterns:${gimp_data_dir}/patterns") - -# This is a colon-separated list of folders to search. -# -# (pattern-path-writable "${gimp_dir}/patterns") - -# Sets the palette search path. This is a colon-separated list of folders to -# search. -# -# (palette-path "${gimp_dir}/palettes:${gimp_data_dir}/palettes") - -# This is a colon-separated list of folders to search. -# -# (palette-path-writable "${gimp_dir}/palettes") - -# Sets the gradient search path. This is a colon-separated list of folders -# to search. -# -# (gradient-path "${gimp_dir}/gradients:${gimp_data_dir}/gradients") - -# This is a colon-separated list of folders to search. -# -# (gradient-path-writable "${gimp_dir}/gradients") - -# Sets the dynamics search path. This is a colon-separated list of folders -# to search. -# -# (tool-preset-path "${gimp_dir}/tool-presets:${gimp_data_dir}/tool-presets") - -# This is a colon-separated list of folders to search. -# -# (tool-preset-path-writable "${gimp_dir}/tool-presets") - -# Where to look for fonts in addition to the system-wide installed fonts. -# This is a colon-separated list of folders to search. -# -# (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts") - -# Specify a default brush. The brush is searched for in the specified brush -# path. This is a string value. -# -# (default-brush "Round Fuzzy") - -# Specify a default dynamics. The dynamics is searched for in the specified -# dynamics path. This is a string value. -# -# (default-dynamics "Dynamics Off") - -# Specify a default pattern. This is a string value. -# -# (default-pattern "Pine") - -# Specify a default palette. This is a string value. -# -# (default-palette "Default") - -# Specify a default gradient. This is a string value. -# -# (default-gradient "FG to BG (RGB)") - -# Specify a default tool preset. The tool preset is searched for in the -# specified tool prests path. This is a string value. -# -# (default-tool-preset "Current Options") - -# Specify a default font. This is a string value. -# -# (default-font "Sans") - -# When enabled, the selected brush will be used for all tools. Possible -# values are yes and no. -# -# (global-brush yes) - -# When enabled, the selected dynamics will be used for all tools. Possible -# values are yes and no. -# -# (global-dynamics yes) - -# When enabled, the selected pattern will be used for all tools. Possible -# values are yes and no. -# -# (global-pattern yes) - -# When enabled, the selected palette will be used for all tools. Possible -# values are yes and no. -# -# (global-palette yes) - -# When enabled, the selected gradient will be used for all tools. Possible -# values are yes and no. -# -# (global-gradient yes) - -# When enabled, the selected font will be used for all tools. Possible -# values are yes and no. -# -# (global-font yes) - -# Sets the default image in the "File/New" dialog. This is a parameter list. -# -# (default-image -# (width 640) -# (height 400) -# (unit pixels) -# (xresolution 72.000000) -# (yresolution 72.000000) -# (resolution-unit inches) -# (image-type rgb) -# (fill-type background-fill) -# (comment "Created with GIMP")) - -# Specify a default image grid. This is a parameter list. -# -# (default-grid -# (style solid) -# (fgcolor (color-rgba 0.000000 0.000000 0.000000 1.000000)) -# (bgcolor (color-rgba 1.000000 1.000000 1.000000 1.000000)) -# (xspacing 10.000000) -# (yspacing 10.000000) -# (spacing-unit inches) -# (xoffset 0.000000) -# (yoffset 0.000000) -# (offset-unit inches)) - -# Sets the minimal number of operations that can be undone. More undo levels -# are kept available until the undo-size limit is reached. This is an -# integer value. -# -# (undo-levels 5) - -# Sets an upper limit to the memory that is used per image to keep operations -# on the undo stack. Regardless of this setting, at least as many undo-levels -# as configured can be undone. The integer size can contain a suffix of 'B', -# 'K', 'M' or 'G' which makes GIMP interpret the size as being specified in -# bytes, kilobytes, megabytes or gigabytes. If no suffix is specified the -# size defaults to being specified in kilobytes. -# -# (undo-size 64M) - -# Sets the size of the previews in the Undo History. Possible values are -# tiny, extra-small, small, medium, large, extra-large, huge, enormous and -# gigantic. -# -# (undo-preview-size large) - -# How many recently used plug-ins to keep on the Filters menu. This is an -# integer value. -# -# (plug-in-history-size 10) - -# Sets the pluginrc search path. This is a single filename. -# -# (pluginrc-path "${gimp_dir}/pluginrc") - -# Sets whether GIMP should create previews of layers and channels. Previews -# in the layers and channels dialog are nice to have but they can slow things -# down when working with large images. Possible values are yes and no. -# -# (layer-previews yes) - -# Sets the preview size used for layers and channel previews in newly created -# dialogs. Possible values are tiny, extra-small, small, medium, large, -# extra-large, huge, enormous and gigantic. -# -# (layer-preview-size medium) - -# Sets the size of the thumbnail shown in the Open dialog. Possible values -# are none, normal and large. -# -# (thumbnail-size normal) - -# The thumbnail in the Open dialog will be automatically updated if the file -# being previewed is smaller than the size set here. The integer size can -# contain a suffix of 'B', 'K', 'M' or 'G' which makes GIMP interpret the -# size as being specified in bytes, kilobytes, megabytes or gigabytes. If no -# suffix is specified the size defaults to being specified in kilobytes. -# -# (thumbnail-filesize-limit 4M) - -# Defines the color management behavior. This is a parameter list. -# -# (color-management -# (mode display) -# (display-profile-from-gdk no) -# (display-rendering-intent perceptual) -# (simulation-rendering-intent perceptual) -# (simulation-gamut-check no) -# (out-of-gamut-color (color-rgb 0.501961 0.501961 0.501961)) -# (display-module "CdisplayLcms")) - -# How to handle embedded color profiles when opening a file. Possible values -# are ask, keep and convert. -# -# (color-profile-policy ask) - -# Keep a permanent record of all opened and saved files in the Recent -# Documents list. Possible values are yes and no. -# -# (save-document-history yes) - -# Sets the default quick mask color. The color is specified in the form -# (color-rgba red green blue alpha) with channel values as floats in the -# range of 0.0 to 1.0. -# -# (quick-mask-color (color-rgba 1.000000 0.000000 0.000000 0.500000)) - -# Sets the size of the checkerboard used to display transparency. Possible -# values are small-checks, medium-checks and large-checks. -# -# (transparency-size medium-checks) - -# Sets the manner in which transparency is displayed in images. Possible -# values are light-checks, gray-checks, dark-checks, white-only, gray-only -# and black-only. -# -# (transparency-type gray-checks) - -# This is the distance in pixels where Guide and Grid snapping activates. -# This is an integer value. -# -# (snap-distance 8) - -# Speed of marching ants in the selection outline. This value is in -# milliseconds (less time indicates faster marching). This is an integer -# value. -# -# (marching-ants-speed 200) - -# When enabled, the image window will automatically resize itself when -# zooming into and out of images. Possible values are yes and no. -# -# (resize-windows-on-zoom no) - -# When enabled, the image window will automatically resize itself whenever -# the physical image size changes. Possible values are yes and no. -# -# (resize-windows-on-resize no) - -# When enabled, this will ensure that each pixel of an image gets mapped to a -# pixel on the screen. Possible values are yes and no. -# -# (default-dot-for-dot yes) - -# When enabled, this will ensure that the full image is visible after a file -# is opened, otherwise it will be displayed with a scale of 1:1. Possible -# values are yes and no. -# -# (initial-zoom-to-fit yes) - -# When enabled, the X server is queried for the mouse's current position on -# each motion event, rather than relying on the position hint. This means -# painting with large brushes should be more accurate, but it may be slower. -# Conversely, on some X servers enabling this option results in faster -# painting. Possible values are yes and no. -# -# (perfect-mouse yes) - -# Sets the type of mouse pointers to use. Possible values are tool-icon, -# tool-crosshair and crosshair. -# -# (cursor-mode tool-icon) - -# Context-dependent mouse pointers are helpful. They are enabled by default. -# However, they require overhead that you may want to do without. Possible -# values are yes and no. -# -# (cursor-updating yes) - -# When enabled, all paint tools will show a preview of the current brush's -# outline. Possible values are yes and no. -# -# (show-brush-outline yes) - -# When enabled, the mouse pointer will be shown over the image while using a -# paint tool. Possible values are yes and no. -# -# (show-paint-tool-cursor yes) - -# Sets the text to appear in image window titles. This is a format string; -# certain % character sequences are recognised and expanded as follows: -# -# %% literal percent sign -# %f bare filename, or "Untitled" -# %F full path to file, or "Untitled" -# %p PDB image id -# %i view instance number -# %t image type (RGB, grayscale, indexed) -# %z zoom factor as a percentage -# %s source scale factor -# %d destination scale factor -# %Dx expands to x if the image is dirty, the empty string otherwise -# %Cx expands to x if the image is clean, the empty string otherwise -# %B expands to (modified) if the image is dirty, the empty string otherwise -# %A expands to (clean) if the image is clean, the empty string otherwise -# %l the number of layers -# %L the number of layers (long form) -# %m memory used by the image -# %n the name of the active layer/channel -# %P the PDB id of the active layer/channel -# %w image width in pixels -# %W image width in real-world units -# %h image height in pixels -# %H image height in real-world units -# %M the image size expressed in megapixels -# %u unit symbol -# %U unit abbreviation -# -# -# (image-title-format "%D*%f-%p.%i (%t, %L) %wx%h") - -# Sets the text to appear in image window status bars. This is a format -# string; certain % character sequences are recognised and expanded as -# follows: -# -# %% literal percent sign -# %f bare filename, or "Untitled" -# %F full path to file, or "Untitled" -# %p PDB image id -# %i view instance number -# %t image type (RGB, grayscale, indexed) -# %z zoom factor as a percentage -# %s source scale factor -# %d destination scale factor -# %Dx expands to x if the image is dirty, the empty string otherwise -# %Cx expands to x if the image is clean, the empty string otherwise -# %B expands to (modified) if the image is dirty, the empty string otherwise -# %A expands to (clean) if the image is clean, the empty string otherwise -# %l the number of layers -# %L the number of layers (long form) -# %m memory used by the image -# %n the name of the active layer/channel -# %P the PDB id of the active layer/channel -# %w image width in pixels -# %W image width in real-world units -# %h image height in pixels -# %H image height in real-world units -# %M the image size expressed in megapixels -# %u unit symbol -# %U unit abbreviation -# -# -# (image-status-format "%n (%m)") - -# Sets the monitor's horizontal resolution, in dots per inch. If set to 0, -# forces the X server to be queried for both horizontal and vertical -# resolution information. This is a float value. -# -# (monitor-xresolution 96.000000) - -# Sets the monitor's vertical resolution, in dots per inch. If set to 0, -# forces the X server to be queried for both horizontal and vertical -# resolution information. This is a float value. -# -# (monitor-yresolution 96.000000) - -# When enabled, GIMP will use the monitor resolution from the windowing -# system. Possible values are yes and no. -# -# (monitor-resolution-from-windowing-system yes) - -# Sets the size of the navigation preview available in the lower right corner -# of the image window. Possible values are tiny, extra-small, small, medium, -# large, extra-large, huge, enormous and gigantic. -# -# (navigation-preview-size medium) - -# Sets the default settings for the image view. This is a parameter list. -# -# (default-view -# (show-menubar yes) -# (show-statusbar yes) -# (show-rulers yes) -# (show-scrollbars yes) -# (show-selection yes) -# (show-layer-boundary yes) -# (show-guides yes) -# (show-grid no) -# (show-sample-points yes) -# (padding-mode default) -# (padding-color (color-rgb 1.000000 1.000000 1.000000))) - -# Sets the default settings used when an image is viewed in fullscreen mode. -# This is a parameter list. -# -# (default-fullscreen-view -# (show-menubar yes) -# (show-statusbar yes) -# (show-rulers yes) -# (show-scrollbars yes) -# (show-selection yes) -# (show-layer-boundary yes) -# (show-guides yes) -# (show-grid no) -# (show-sample-points yes) -# (padding-mode default) -# (padding-color (color-rgb 1.000000 1.000000 1.000000))) - -# Snap to guides by default in new image windows. Possible values are yes -# and no. -# -# (default-snap-to-guides yes) - -# Snap to the grid by default in new image windows. Possible values are yes -# and no. -# -# (default-snap-to-grid no) - -# Snap to the canvas edge by default in new image windows. Possible values -# are yes and no. -# -# (default-snap-to-canvas no) - -# Snap to the active path by default in new image windows. Possible values -# are yes and no. -# -# (default-snap-to-path no) - -# When enabled, an image will become the active image when its image window -# receives the focus. This is useful for window managers using "click to -# focus". Possible values are yes and no. -# -# (activate-on-focus yes) - -# What to do when the space bar is pressed in the image window. Possible -# values are none, pan and move. -# -# (space-bar-action pan) - -# There's a tradeoff between speed and quality of the zoomed-out display. -# Possible values are low and high. -# -# (zoom-quality high) - -# Bugs in event history buffer are frequent so in case of cursor offset -# problems turning it off helps. Possible values are yes and no. -# -# (use-event-history no) - -# If enabled, the move tool sets the edited layer or path as active. This -# used to be the default behaviour in older versions. Possible values are -# yes and no. -# -# (move-tool-changes-active no) - -# How many recent settings to keep around in color correction tools This is -# an integer value. -# -# (image-map-tool-max-recent 10) - -# When enabled, GIMP will not save an image if it has not been changed since -# it was opened. Possible values are yes and no. -# -# (trust-dirty-flag no) - -# Remember the current tool, pattern, color, and brush across GIMP sessions. -# Possible values are yes and no. -# -# (save-device-status no) - -# Save the positions and sizes of the main dialogs when GIMP exits. Possible -# values are yes and no. -# -# (save-session-info yes) - -# Let GIMP try to restore your last saved session on each startup. Possible -# values are yes and no. -# -# (restore-session yes) - -# Save the tool options when GIMP exits. Possible values are yes and no. -# -# (save-tool-options no) - -# Show a tooltip when the pointer hovers over an item. Possible values are -# yes and no. -# -# (show-tooltips yes) - -# When enabled, menus can be torn off. Possible values are yes and no. -# -# (tearoff-menus yes) - -# When enabled, you can change keyboard shortcuts for menu items by hitting a -# key combination while the menu item is highlighted. Possible values are -# yes and no. -# -# (can-change-accels no) - -# Save changed keyboard shortcuts when GIMP exits. Possible values are yes -# and no. -# -# (save-accels yes) - -# Restore saved keyboard shortcuts on each GIMP startup. Possible values are -# yes and no. -# -# (restore-accels yes) - -# How many recently opened image filenames to keep on the File menu. This is -# an integer value. -# -# (last-opened-size 10) - -# GIMP will warn the user if an attempt is made to create an image that would -# take more memory than the size specified here. The integer size can -# contain a suffix of 'B', 'K', 'M' or 'G' which makes GIMP interpret the -# size as being specified in bytes, kilobytes, megabytes or gigabytes. If no -# suffix is specified the size defaults to being specified in kilobytes. -# -# (max-new-image-size 128M) - -# Show the current foreground and background colors in the toolbox. Possible -# values are yes and no. -# -# (toolbox-color-area yes) - -# Show the currently selected brush, pattern and gradient in the toolbox. -# Possible values are yes and no. -# -# (toolbox-foo-area no) - -# Show the currently active image in the toolbox. Possible values are yes -# and no. -# -# (toolbox-image-area no) - -# Show the GIMP mascot at the top of the toolbox. Possible values are yes -# and no. -# -# (toolbox-wilber yes) - -# Sets the theme search path. This is a colon-separated list of folders to -# search. -# -# (theme-path "${gimp_dir}/themes:${gimp_data_dir}/themes") - -# The name of the theme to use. This is a string value. -# -# (theme "Default") - -# When enabled, pressing F1 will open the help browser. Possible values are -# yes and no. -# -# (use-help yes) - -# When enabled, dialogs will show a help button that gives access to the -# related help page. Without this button, the help page can still be reached -# by pressing F1. Possible values are yes and no. -# -# (show-help-button yes) - -# Specifies the language preferences used by the help system. This is a -# colon-separated list of language identifiers with decreasing priority. If -# empty, the language is taken from the user's locale setting. This is a -# string value. -# -# (help-locales "") - -# Sets the browser used by the help system. Possible values are gimp and -# web-browser. -# -# (help-browser gimp) - -# When enabled, the online user manual will be used by the help system. -# Otherwise the locally installed copy is used. Possible values are yes and -# no. -# -# (user-manual-online yes) - -# The location of the online user manual. This is used if -# 'user-manual-online' is enabled. This is a string value. -# -# (user-manual-online-uri "http://docs.gimp.org/2.8") - -# The window type hint that is set on dock windows and the toolbox window. -# This may affect the way your window manager decorates and handles these -# windows. Possible values are normal, utility and keep-above. -# -# (dock-window-hint utility) - -# Sets the pixel format to use for mouse pointers. Possible values are -# bitmap and pixbuf. -# -# (cursor-format pixbuf) - -# Sets the handedness for cursor positioning. Possible values are left and -# right. -# -# (cursor-handedness right) - -# Where to search for fractals used by the Fractal Explorer plug-in. This is -# a colon-separated list of folders to search. -# -# (fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer") - -# Where to search for Gfig figures used by the Gfig plug-in. This is a -# colon-separated list of folders to search. -# -# (gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig") - -# Where to search for gflares used by the GFlare plug-in. This is a -# colon-separated list of folders to search. -# -# (gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare") - -# Where to search for data used by the Gimpressionist plug-in. This is a -# colon-separated list of folders to search. -# -# (gimpressionist-path "${gimp_dir}/gimpressionist:${gimp_data_dir}/gimpressionist") - -# This path will be searched for scripts when the Script-Fu plug-in is run. -# This is a colon-separated list of folders to search. -# -# (script-fu-path "${gimp_dir}/scripts:${gimp_data_dir}/scripts") - diff --git a/gimp/2.0/gimprc b/gimp/2.0/gimprc index 1efcc43..1f3f961 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 2147483647) +# (tile-cache-size 6132474k) # Specifies the language to use for the user interface. This is a string # value. @@ -447,11 +447,6 @@ # # (image-status-format "%n (%m)") -# Ask for confirmation before closing an image without saving. Possible -# values are yes and no. -# -# (confirm-on-close yes) - # Sets the monitor's horizontal resolution, in dots per inch. If set to 0, # forces the X server to be queried for both horizontal and vertical # resolution information. This is a float value. @@ -676,7 +671,7 @@ # Otherwise the locally installed copy is used. Possible values are yes and # no. # -# (user-manual-online no) +# (user-manual-online yes) # The location of the online user manual. This is used if # 'user-manual-online' is enabled. This is a string value. diff --git a/modprobe.d/._cfg0000_nvidia.conf b/modprobe.d/._cfg0000_nvidia.conf deleted file mode 100644 index 8744991..0000000 --- a/modprobe.d/._cfg0000_nvidia.conf +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/nvidia-drivers-349.16/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=27 NVreg_ModifyDeviceFiles=1 diff --git a/modprobe.d/nvidia.conf b/modprobe.d/nvidia.conf index 55a57c6..8744991 100644 --- a/modprobe.d/nvidia.conf +++ b/modprobe.d/nvidia.conf @@ -4,7 +4,7 @@ alias /dev/nvidiactl char-major-195 # To tweak the driver the following options can be used, note that # you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/nvidia-drivers-343.36/README +# options see /usr/share/doc/nvidia-drivers-349.16/README # # !!! SECURITY WARNING !!! # DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW diff --git a/texmf/fmtutil.d/._cfg0000_format.texlive-latex.cnf b/texmf/fmtutil.d/._cfg0000_format.texlive-latex.cnf deleted file mode 100644 index 8722fc0..0000000 --- a/texmf/fmtutil.d/._cfg0000_format.texlive-latex.cnf +++ /dev/null @@ -1,7 +0,0 @@ -# Generated for texlive-latex by texlive-module.eclass -dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini -latex pdftex language.dat -translate-file=cp227.tcx *latex.ini -#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini -lualatex luatex language.dat,language.dat.lua lualatex.ini -pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex diff --git a/texmf/fmtutil.d/._cfg0000_format.texlive-mathextra.cnf b/texmf/fmtutil.d/._cfg0000_format.texlive-mathextra.cnf deleted file mode 100644 index 10e3467..0000000 --- a/texmf/fmtutil.d/._cfg0000_format.texlive-mathextra.cnf +++ /dev/null @@ -1,2 +0,0 @@ -# Generated for texlive-mathextra by texlive-module.eclass -amstex pdftex - -translate-file=cp227.tcx *amstex.ini diff --git a/texmf/fmtutil.d/format.texlive-latex.cnf b/texmf/fmtutil.d/format.texlive-latex.cnf index 6ab164c..8722fc0 100644 --- a/texmf/fmtutil.d/format.texlive-latex.cnf +++ b/texmf/fmtutil.d/format.texlive-latex.cnf @@ -1,6 +1,7 @@ -# Generated for texlive-latex by texlive-module.eclass +# Generated for texlive-latex by texlive-module.eclass dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini lualatex luatex language.dat,language.dat.lua lualatex.ini pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex diff --git a/texmf/fmtutil.d/format.texlive-mathextra.cnf b/texmf/fmtutil.d/format.texlive-mathextra.cnf index 4d2046a..10e3467 100644 --- a/texmf/fmtutil.d/format.texlive-mathextra.cnf +++ b/texmf/fmtutil.d/format.texlive-mathextra.cnf @@ -1,2 +1,2 @@ -# Generated for texlive-mathextra by texlive-module.eclass +# Generated for texlive-mathextra by texlive-module.eclass amstex pdftex - -translate-file=cp227.tcx *amstex.ini diff --git a/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf b/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf deleted file mode 100644 index b753274..0000000 --- a/texmf/web2c.d/._cfg0000_fmtutil-hdr.cnf +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $ -# Originally written by Thomas Esser, 1998. Public domain. -# -# As of TeX Live 2008, the final fmtutil.cnf is generated by -# tlmgr generate fmtutil. You can use -# tlmgr generate fmtutil -localcfg /some/file to make local additions. -# See tlmgr --help for more info. -# -# The format of the table is: -# -# format engine pattern-file arguments -# -# The last "argument" must be the name of the file on which to run -# the ini-engine (such as initex). If the ini-engine is e-TeX, and the -# e-TeX extensions should be enabled, the filename must be prefixed with -# a * character; this is essentially equivalent to the -etex option. -# -# fmtutil always passes the -ini option to the engine. -# If no pattern-file is desired, use -. -# Either spaces or tabs can be used as separators. -# -# Other notes: -# 1) tex and amstex just load hyphen.tex. No customization. -# You can have your own customized (via babel's hyphen.cfg) -# formats on top of plain by using "bplain.tex" instead of -# plain.tex (e.g., bplain.ini file for bplain format). -# -# 2) etex-based formats load language.def, not language.dat. -# -# 3) The symbolic link to the right engines (e.g. bplain -> tex) -# is generated by the "texlinks" script. -# -# 4) usual comments start with "# ", whereas disabled configurations -# start with "#! " in this file. - diff --git a/texmf/web2c.d/._cfg0000_updmap-hdr.cfg b/texmf/web2c.d/._cfg0000_updmap-hdr.cfg deleted file mode 100644 index db3560c..0000000 --- a/texmf/web2c.d/._cfg0000_updmap-hdr.cfg +++ /dev/null @@ -1,101 +0,0 @@ -# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ -# -# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by -# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. -# -# To make local customizations to the map files, using one of the -# following methods is simplest: -# 1) run -# updmap-sys --enable Map=foo.map -# for each map file. (Or MixedMap instead of Map, if your font has -# both Metafont and outline definitions.) See the updmap --help -# documentation. This will add lines to the updmap.cfg file in -# TEXMFSYSCONFIG (creating it if necessary). -# -# 2) put all your additional fonts into TEXMFLOCAL, edit -# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. -# -# See the output of updmap --help and/or -# http://tug.org/fonts/fontinstall.html for more. -# -# In any case, manual edits to TL's updmap.cfg files, psfonts.map, -# pdftex.map, etc., will be lost on update. So don't do that. -# -# The default settings of the updmap options (not maps) are also -# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from -# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other -# tree. - -# -# Options for updmap. - - -# dvipsPreferOutline -# -# Should dvips (by default) prefer bitmap fonts or outline fonts -# if both are available? Independent of this setting, outlines -# can be forced by putting "p psfonts_t1.map" into a config file -# that dvips reads. Bitmaps (for the fonts in question) can -# be forced by putting "p psfonts_pk.map" into a config file. -# We provide such config files which can be enabled via -# dvips -Poutline ... resp. dvips -Ppk ... -# -dvipsPreferOutline true - - -# LW35 -# -# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and -# how are the filenames chosen? Valid settings: -# URW: URW fonts with "vendor" filenames (e.g. n019064l.pfb) -# URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) -# ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) -# ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) -# -LW35 URWkb - - -# dvipsDownloadBase35 -# -# Should dvips (by default) download the standard 35 LaserWriter fonts -# with the document (then set dvipsDownloadBase35 true) or should these -# fonts be used from the ps interpreter / printer? -# Whatever the default is, the user can override it by specifying -# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download -# the LW35 fonts resp. use the built-in fonts. -# -dvipsDownloadBase35 true - - -# pdftexDownloadBase14 -# -# Should pdftex download the base 14 pdf fonts? Since some configurations -# (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The PDF files will get bigger, though. -# -pdftexDownloadBase14 true - - -# dvipdfmDownloadBase14 -# -# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations -# (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The pdf files will get bigger, though. -# -dvipdfmDownloadBase14 true - - -# kanjiEmbed -# -# updmap generates a file kanjix.map for usage with dvipdfmx. With this -# option one can switch between not embedding any kanji font, or -# any of the several available. -# -# The value can be any string. When updmap is run, the substring -# @kanjiEmbed@ in a map file name will be replaced with this value, and -# the respective map file used. -# -kanjiEmbed noEmbed - - -# (end of updmap-hdr.cfg) diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf index 1d93173..b753274 100644 --- a/texmf/web2c.d/fmtutil-hdr.cnf +++ b/texmf/web2c.d/fmtutil-hdr.cnf @@ -1,4 +1,4 @@ -# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $ +# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $ # Originally written by Thomas Esser, 1998. Public domain. # # As of TeX Live 2008, the final fmtutil.cnf is generated by @@ -13,7 +13,7 @@ # The last "argument" must be the name of the file on which to run # the ini-engine (such as initex). If the ini-engine is e-TeX, and the # e-TeX extensions should be enabled, the filename must be prefixed with -# a * character. +# a * character; this is essentially equivalent to the -etex option. # # fmtutil always passes the -ini option to the engine. # If no pattern-file is desired, use -. @@ -23,7 +23,7 @@ # 1) tex and amstex just load hyphen.tex. No customization. # You can have your own customized (via babel's hyphen.cfg) # formats on top of plain by using "bplain.tex" instead of -# plain.tex (see e.g. bplain.ini file for bplain format). +# plain.tex (e.g., bplain.ini file for bplain format). # # 2) etex-based formats load language.def, not language.dat. # diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg index 5eda450..db3560c 100644 --- a/texmf/web2c.d/updmap-hdr.cfg +++ b/texmf/web2c.d/updmap-hdr.cfg @@ -1,11 +1,10 @@ -# $Id: updmap-hdr.cfg 26891 2012-06-10 22:41:49Z karl $ +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ # -# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by -# concatenating updmap-hdr.cfg with all updmap.cfg files found. +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. # # To make local customizations to the map files, using one of the # following methods is simplest: -# # 1) run # updmap-sys --enable Map=foo.map # for each map file. (Or MixedMap instead of Map, if your font has @@ -21,7 +20,82 @@ # # In any case, manual edits to TL's updmap.cfg files, psfonts.map, # pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. + +# +# Options for updmap. + + +# dvipsPreferOutline # -# The default settings of the updmap options (not maps) are specified in -# TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in -# any other tree. +# Should dvips (by default) prefer bitmap fonts or outline fonts +# if both are available? Independent of this setting, outlines +# can be forced by putting "p psfonts_t1.map" into a config file +# that dvips reads. Bitmaps (for the fonts in question) can +# be forced by putting "p psfonts_pk.map" into a config file. +# We provide such config files which can be enabled via +# dvips -Poutline ... resp. dvips -Ppk ... +# +dvipsPreferOutline true + + +# LW35 +# +# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and +# how are the filenames chosen? Valid settings: +# URW: URW fonts with "vendor" filenames (e.g. n019064l.pfb) +# URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) +# ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) +# ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) +# +LW35 URWkb + + +# dvipsDownloadBase35 +# +# Should dvips (by default) download the standard 35 LaserWriter fonts +# with the document (then set dvipsDownloadBase35 true) or should these +# fonts be used from the ps interpreter / printer? +# Whatever the default is, the user can override it by specifying +# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download +# the LW35 fonts resp. use the built-in fonts. +# +dvipsDownloadBase35 true + + +# pdftexDownloadBase14 +# +# Should pdftex download the base 14 pdf fonts? Since some configurations +# (ps / pdf tools / printers) use bad default fonts, it is safer to download +# the fonts. The PDF files will get bigger, though. +# +pdftexDownloadBase14 true + + +# dvipdfmDownloadBase14 +# +# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations +# (ps / pdf tools / printers) use bad default fonts, it is safer to download +# the fonts. The pdf files will get bigger, though. +# +dvipdfmDownloadBase14 true + + +# kanjiEmbed +# +# updmap generates a file kanjix.map for usage with dvipdfmx. With this +# option one can switch between not embedding any kanji font, or +# any of the several available. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. +# +kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg)