From: Frank Brehm Date: Wed, 28 Dec 2016 12:07:24 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=99a9d73e8e6ab7dd46ae1ce890c6945a7463547a;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 5623bc5..e1313b1 100755 --- a/.etckeeper +++ b/.etckeeper @@ -148,14 +148,38 @@ maybe chmod 0644 'conf.d/udev' maybe chmod 0644 'conf.d/urandom' maybe chmod 0700 'config-archive' maybe chmod 0755 'config-archive/etc' +maybe chmod 0755 'config-archive/etc/apache2' +maybe chmod 0755 'config-archive/etc/apache2/modules.d' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf.dist.new' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_languages.conf' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_languages.conf.dist.new' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_autoindex.conf' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_autoindex.conf.dist.new' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_log_config.conf' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_log_config.conf.dist.new' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_mime.conf' +maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_mime.conf.dist.new' +maybe chmod 0755 'config-archive/etc/apache2/vhosts.d' +maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/00_default_vhost.conf' +maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/00_default_vhost.conf.dist.new' +maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include' +maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include.dist.new' +maybe chmod 0755 'config-archive/etc/conf.d' +maybe chmod 0644 'config-archive/etc/conf.d/apache2' +maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist.new' maybe chmod 0644 'config-archive/etc/genkernel.conf' -maybe chmod 0644 'config-archive/etc/genkernel.conf.dist.new' +maybe chmod 0644 'config-archive/etc/genkernel.conf.dist' +maybe chmod 0644 'config-archive/etc/hosts' +maybe chmod 0644 'config-archive/etc/hosts.dist' maybe chmod 0755 'config-archive/etc/layman' maybe chmod 0644 'config-archive/etc/layman/layman.cfg' maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist.new' maybe chmod 0644 'config-archive/etc/locale.gen' maybe chmod 0644 'config-archive/etc/locale.gen.dist.new' maybe chmod 0755 'config-archive/etc/logrotate.d' +maybe chmod 0644 'config-archive/etc/logrotate.d/apache2' +maybe chmod 0644 'config-archive/etc/logrotate.d/apache2.dist.new' maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog' maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new' maybe chmod 0644 'config-archive/etc/rsyslog.conf' diff --git a/config-archive/etc/apache2/modules.d/00_default_settings.conf b/config-archive/etc/apache2/modules.d/00_default_settings.conf new file mode 100644 index 0000000..5d41941 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_default_settings.conf @@ -0,0 +1,131 @@ +# This configuration file reflects default settings for Apache HTTP Server. +# You may change these, but chances are that you may not need to. + +# Timeout: The number of seconds before receives and sends time out. +Timeout 300 + +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +KeepAlive On + +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +MaxKeepAliveRequests 100 + +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +KeepAliveTimeout 15 + +# UseCanonicalName: Determines how Apache constructs self-referencing +# URLs and the SERVER_NAME and SERVER_PORT variables. +# When set "Off", Apache will use the Hostname and Port supplied +# by the client. When set "On", Apache will use the value of the +# ServerName directive. +UseCanonicalName Off + +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +AccessFileName .htaccess + +# ServerTokens +# This directive configures what you return as the Server HTTP response +# Header. The default is 'Full' which sends information about the OS-Type +# and compiled in modules. +# Set to one of: Full | OS | Minor | Minimal | Major | Prod +# where Full conveys the most information, and Prod the least. +ServerTokens Prod + +# TraceEnable +# This directive overrides the behavior of TRACE for both the core server and +# mod_proxy. The default TraceEnable on permits TRACE requests per RFC 2616, +# which disallows any request body to accompany the request. TraceEnable off +# causes the core server and mod_proxy to return a 405 (Method not allowed) +# error to the client. +# For security reasons this is turned off by default. (bug #240680) +TraceEnable off + +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +ServerSignature On + +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +HostnameLookups Off + +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall is used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +EnableMMAP On +EnableSendfile On + +# FileETag: Configures the file attributes that are used to create +# the ETag (entity tag) response header field when the document is +# based on a static file. (The ETag value is used in cache management +# to save network bandwidth.) +FileETag INode MTime Size + +# ContentDigest: This directive enables the generation of Content-MD5 +# headers as defined in RFC1864 respectively RFC2616. +# The Content-MD5 header provides an end-to-end message integrity +# check (MIC) of the entity-body. A proxy or client may check this +# header for detecting accidental modification of the entity-body +# in transit. +# Note that this can cause performance problems on your server since +# the message digest is computed on every request (the values are +# not cached). +# Content-MD5 is only sent for documents served by the core, and not +# by any module. For example, SSI documents, output from CGI scripts, +# and byte range responses do not have this header. +ContentDigest Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +ErrorLog /var/log/apache2/error.log + +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +LogLevel warn + +# We configure the "default" to be a very restrictive set of features. + + Options FollowSymLinks + AllowOverride None + Require all denied + + +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Options can be used for the +# same purpose, but it is much slower. +# +# Do not change this entry unless you know what you are doing. + + DirectoryIndex index.html index.html.var index.shtml index.htm + + +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. + + Require all denied + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_default_settings.conf.dist.new b/config-archive/etc/apache2/modules.d/00_default_settings.conf.dist.new new file mode 100644 index 0000000..38635aa --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_default_settings.conf.dist.new @@ -0,0 +1,131 @@ +# This configuration file reflects default settings for Apache HTTP Server. +# You may change these, but chances are that you may not need to. + +# Timeout: The number of seconds before receives and sends time out. +Timeout 300 + +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +KeepAlive On + +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +MaxKeepAliveRequests 100 + +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +KeepAliveTimeout 15 + +# UseCanonicalName: Determines how Apache constructs self-referencing +# URLs and the SERVER_NAME and SERVER_PORT variables. +# When set "Off", Apache will use the Hostname and Port supplied +# by the client. When set "On", Apache will use the value of the +# ServerName directive. +UseCanonicalName Off + +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +AccessFileName .htaccess + +# ServerTokens +# This directive configures what you return as the Server HTTP response +# Header. The default is 'Full' which sends information about the OS-Type +# and compiled in modules. +# Set to one of: Full | OS | Minor | Minimal | Major | Prod +# where Full conveys the most information, and Prod the least. +ServerTokens Prod + +# TraceEnable +# This directive overrides the behavior of TRACE for both the core server and +# mod_proxy. The default TraceEnable on permits TRACE requests per RFC 2616, +# which disallows any request body to accompany the request. TraceEnable off +# causes the core server and mod_proxy to return a 405 (Method not allowed) +# error to the client. +# For security reasons this is turned off by default. (bug #240680) +TraceEnable off + +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +ServerSignature On + +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +HostnameLookups Off + +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall is used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +EnableMMAP On +EnableSendfile Off + +# FileETag: Configures the file attributes that are used to create +# the ETag (entity tag) response header field when the document is +# based on a static file. (The ETag value is used in cache management +# to save network bandwidth.) +FileETag MTime Size + +# ContentDigest: This directive enables the generation of Content-MD5 +# headers as defined in RFC1864 respectively RFC2616. +# The Content-MD5 header provides an end-to-end message integrity +# check (MIC) of the entity-body. A proxy or client may check this +# header for detecting accidental modification of the entity-body +# in transit. +# Note that this can cause performance problems on your server since +# the message digest is computed on every request (the values are +# not cached). +# Content-MD5 is only sent for documents served by the core, and not +# by any module. For example, SSI documents, output from CGI scripts, +# and byte range responses do not have this header. +ContentDigest Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +ErrorLog /var/log/apache2/error_log + +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +LogLevel warn + +# We configure the "default" to be a very restrictive set of features. + + Options FollowSymLinks + AllowOverride None + Require all denied + + +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Options can be used for the +# same purpose, but it is much slower. +# +# Do not change this entry unless you know what you are doing. + + DirectoryIndex index.html index.html.var + + +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. + + Require all denied + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_languages.conf b/config-archive/etc/apache2/modules.d/00_languages.conf new file mode 100644 index 0000000..48af93d --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_languages.conf @@ -0,0 +1,133 @@ +# Settings for hosting different languages. + +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# It is generally better to not mark a page as +# being a certain language than marking it with the wrong +# language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +LanguagePriority de en ca cs da el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW + +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +ForceLanguagePriority Prefer Fallback + +# Commonly used filename extensions to character sets. You probably +# want to avoid clashes with the language extensions, unless you +# are good at carefully testing your setup after each change. +# See http://www.iana.org/assignments/character-sets for the +# official list of charset names and their respective RFCs. +AddCharset us-ascii.ascii .us-ascii +AddCharset ISO-8859-1 .iso8859-1 .latin1 +AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen +AddCharset ISO-8859-3 .iso8859-3 .latin3 +AddCharset ISO-8859-4 .iso8859-4 .latin4 +AddCharset ISO-8859-5 .iso8859-5 .cyr .iso-ru +AddCharset ISO-8859-6 .iso8859-6 .arb .arabic +AddCharset ISO-8859-7 .iso8859-7 .grk .greek +AddCharset ISO-8859-8 .iso8859-8 .heb .hebrew +AddCharset ISO-8859-9 .iso8859-9 .latin5 .trk +AddCharset ISO-8859-10 .iso8859-10 .latin6 +AddCharset ISO-8859-13 .iso8859-13 +AddCharset ISO-8859-14 .iso8859-14 .latin8 +AddCharset ISO-8859-15 .iso8859-15 .latin9 +AddCharset ISO-8859-16 .iso8859-16 .latin10 +AddCharset ISO-2022-JP .iso2022-jp .jis +AddCharset ISO-2022-KR .iso2022-kr .kis +AddCharset ISO-2022-CN .iso2022-cn .cis +AddCharset Big5.Big5 .big5 .b5 +AddCharset cn-Big5 .cn-big5 +# For russian, more than one charset is used (depends on client, mostly): +AddCharset WINDOWS-1251 .cp-1251 .win-1251 +AddCharset CP866 .cp866 +AddCharset KOI8 .koi8 +AddCharset KOI8-E .koi8-e +AddCharset KOI8-r .koi8-r .koi8-ru +AddCharset KOI8-U .koi8-u +AddCharset KOI8-ru .koi8-uk .ua +AddCharset ISO-10646-UCS-2 .ucs2 +AddCharset ISO-10646-UCS-4 .ucs4 +AddCharset UTF-7 .utf7 +AddCharset UTF-8 .utf8 +AddCharset UTF-16 .utf16 +AddCharset UTF-16BE .utf16be +AddCharset UTF-16LE .utf16le +AddCharset UTF-32 .utf32 +AddCharset UTF-32BE .utf32be +AddCharset UTF-32LE .utf32le +AddCharset euc-cn .euc-cn +AddCharset euc-gb .euc-gb +AddCharset euc-jp .euc-jp +AddCharset euc-kr .euc-kr +# Not sure how euc-tw got in - IANA doesn't list it??? +AddCharset EUC-TW .euc-tw +AddCharset gb2312 .gb2312 .gb +AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2 +AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4 +AddCharset shift_jis .shift_jis .sjis + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_languages.conf.dist.new b/config-archive/etc/apache2/modules.d/00_languages.conf.dist.new new file mode 100644 index 0000000..c429bf9 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_languages.conf.dist.new @@ -0,0 +1,133 @@ +# Settings for hosting different languages. + +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# It is generally better to not mark a page as +# being a certain language than marking it with the wrong +# language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW + +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +ForceLanguagePriority Prefer Fallback + +# Commonly used filename extensions to character sets. You probably +# want to avoid clashes with the language extensions, unless you +# are good at carefully testing your setup after each change. +# See http://www.iana.org/assignments/character-sets for the +# official list of charset names and their respective RFCs. +AddCharset us-ascii.ascii .us-ascii +AddCharset ISO-8859-1 .iso8859-1 .latin1 +AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen +AddCharset ISO-8859-3 .iso8859-3 .latin3 +AddCharset ISO-8859-4 .iso8859-4 .latin4 +AddCharset ISO-8859-5 .iso8859-5 .cyr .iso-ru +AddCharset ISO-8859-6 .iso8859-6 .arb .arabic +AddCharset ISO-8859-7 .iso8859-7 .grk .greek +AddCharset ISO-8859-8 .iso8859-8 .heb .hebrew +AddCharset ISO-8859-9 .iso8859-9 .latin5 .trk +AddCharset ISO-8859-10 .iso8859-10 .latin6 +AddCharset ISO-8859-13 .iso8859-13 +AddCharset ISO-8859-14 .iso8859-14 .latin8 +AddCharset ISO-8859-15 .iso8859-15 .latin9 +AddCharset ISO-8859-16 .iso8859-16 .latin10 +AddCharset ISO-2022-JP .iso2022-jp .jis +AddCharset ISO-2022-KR .iso2022-kr .kis +AddCharset ISO-2022-CN .iso2022-cn .cis +AddCharset Big5.Big5 .big5 .b5 +AddCharset cn-Big5 .cn-big5 +# For russian, more than one charset is used (depends on client, mostly): +AddCharset WINDOWS-1251 .cp-1251 .win-1251 +AddCharset CP866 .cp866 +AddCharset KOI8 .koi8 +AddCharset KOI8-E .koi8-e +AddCharset KOI8-r .koi8-r .koi8-ru +AddCharset KOI8-U .koi8-u +AddCharset KOI8-ru .koi8-uk .ua +AddCharset ISO-10646-UCS-2 .ucs2 +AddCharset ISO-10646-UCS-4 .ucs4 +AddCharset UTF-7 .utf7 +AddCharset UTF-8 .utf8 +AddCharset UTF-16 .utf16 +AddCharset UTF-16BE .utf16be +AddCharset UTF-16LE .utf16le +AddCharset UTF-32 .utf32 +AddCharset UTF-32BE .utf32be +AddCharset UTF-32LE .utf32le +AddCharset euc-cn .euc-cn +AddCharset euc-gb .euc-gb +AddCharset euc-jp .euc-jp +AddCharset euc-kr .euc-kr +# Not sure how euc-tw got in - IANA doesn't list it??? +AddCharset EUC-TW .euc-tw +AddCharset gb2312 .gb2312 .gb +AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2 +AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4 +AddCharset shift_jis .shift_jis .sjis + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf b/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf new file mode 100644 index 0000000..c7e630b --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf @@ -0,0 +1,87 @@ + + + + +# We include the /icons/ alias for FancyIndexed directory listings. If +# you do not use FancyIndexing, you may comment this out. +Alias /icons/ "/usr/share/apache2/icons/" + + + Options Indexes MultiViews + AllowOverride None + Require all granted + + + +# Directives controlling the display of server-generated directory listings. +# +# To see the listing of a directory, the Options directive for the +# directory must include "Indexes", and the directory must not contain +# a file matching those listed in the DirectoryIndex directive. + +# IndexOptions: Controls the appearance of server-generated directory +# listings. +IndexOptions FancyIndexing VersionSort FoldersFirst HTMLTable IgnoreCase NameWidth=50 + +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +DefaultIcon /icons/unknown.gif + +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename + +AddDescription "GZIP compressed document" .gz +AddDescription "tar archive" .tar +AddDescription "GZIP compressed tar archive" .tgz +AddDescription "GZIP-komprimiertes Tar-Archiv" .tgz +AddDescription "PDF-Dokument" .pdf + +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. + +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf.dist.new b/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf.dist.new new file mode 100644 index 0000000..10bf483 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_autoindex.conf.dist.new @@ -0,0 +1,85 @@ + + + + +# We include the /icons/ alias for FancyIndexed directory listings. If +# you do not use FancyIndexing, you may comment this out. +Alias /icons/ "/usr/share/apache2/icons/" + + + Options Indexes MultiViews + AllowOverride None + Require all granted + + + +# Directives controlling the display of server-generated directory listings. +# +# To see the listing of a directory, the Options directive for the +# directory must include "Indexes", and the directory must not contain +# a file matching those listed in the DirectoryIndex directive. + +# IndexOptions: Controls the appearance of server-generated directory +# listings. +IndexOptions FancyIndexing VersionSort + +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +DefaultIcon /icons/unknown.gif + +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename + +#AddDescription "GZIP compressed document" .gz +#AddDescription "tar archive" .tar +#AddDescription "GZIP compressed tar archive" .tgz + +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. + +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_log_config.conf b/config-archive/etc/apache2/modules.d/00_mod_log_config.conf new file mode 100644 index 0000000..d4bd85c --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_log_config.conf @@ -0,0 +1,37 @@ + +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%T\" \"%v\" \"%f\"" full +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common + +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-Agent}i" agent +LogFormat "%v %h %l %u %t \"%r\" %>s %b %T" script +LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" VLOG=%{VLOG}e" vhost + + +# You need to enable mod_logio.c to use %I and %O +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%T\" \"%v\" \"%f\" %I %O" full_io +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio +LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" vhostio + + +# The location and format of the access logfile (Common Logfile Format). +# If you do not define any access logfiles within a +# container, they will be logged here. Contrariwise, if you *do* +# define per- access logfiles, transactions will be +# logged therein and *not* in this file. +CustomLog /var/log/apache2/access.log full + +# If you would like to have agent and referer logfiles, +# uncomment the following directives. +#CustomLog /var/log/apache2/referer_log referer +#CustomLog /var/log/apache2/agent_logs agent + +# If you prefer a logfile with access, agent, and referer information +# (Combined Logfile Format) you can use the following directive. +#CustomLog /var/log/apache2/access_log combined + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_log_config.conf.dist.new b/config-archive/etc/apache2/modules.d/00_mod_log_config.conf.dist.new new file mode 100644 index 0000000..ce0238e --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_log_config.conf.dist.new @@ -0,0 +1,35 @@ + +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common + +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-Agent}i" agent +LogFormat "%v %h %l %u %t \"%r\" %>s %b %T" script +LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" VLOG=%{VLOG}e" vhost + + +# You need to enable mod_logio.c to use %I and %O +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio +LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" vhostio + + +# The location and format of the access logfile (Common Logfile Format). +# If you do not define any access logfiles within a +# container, they will be logged here. Contrariwise, if you *do* +# define per- access logfiles, transactions will be +# logged therein and *not* in this file. +CustomLog /var/log/apache2/access_log common + +# If you would like to have agent and referer logfiles, +# uncomment the following directives. +#CustomLog /var/log/apache2/referer_log referer +#CustomLog /var/log/apache2/agent_logs agent + +# If you prefer a logfile with access, agent, and referer information +# (Combined Logfile Format) you can use the following directive. +#CustomLog /var/log/apache2/access_log combined + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_mime.conf b/config-archive/etc/apache2/modules.d/00_mod_mime.conf new file mode 100644 index 0000000..3940107 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_mime.conf @@ -0,0 +1,46 @@ + +# TypesConfig points to the file containing the list of mappings from +# filename extension to MIME-type. +TypesConfig /etc/mime.types + +# AddType allows you to add to or override the MIME configuration +# file specified in TypesConfig for specific file types. +#AddType application/x-gzip .tgz + +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +AddEncoding x-compress .Z +AddEncoding x-gzip .gz .tgz + +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz + +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) + +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +#AddHandler cgi-script .cgi + +# For type maps (negotiated resources): +AddHandler type-map var + +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +#AddType text/html .shtml +#AddOutputFilter INCLUDES .shtml + + + +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +MIMEMagicFile /etc/apache2/magic + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/modules.d/00_mod_mime.conf.dist.new b/config-archive/etc/apache2/modules.d/00_mod_mime.conf.dist.new new file mode 100644 index 0000000..fb8a9a5 --- /dev/null +++ b/config-archive/etc/apache2/modules.d/00_mod_mime.conf.dist.new @@ -0,0 +1,46 @@ + +# TypesConfig points to the file containing the list of mappings from +# filename extension to MIME-type. +TypesConfig /etc/mime.types + +# AddType allows you to add to or override the MIME configuration +# file specified in TypesConfig for specific file types. +#AddType application/x-gzip .tgz + +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +#AddEncoding x-compress .Z +#AddEncoding x-gzip .gz .tgz + +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz + +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) + +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +#AddHandler cgi-script .cgi + +# For type maps (negotiated resources): +#AddHandler type-map var + +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +#AddType text/html .shtml +#AddOutputFilter INCLUDES .shtml + + + +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +MIMEMagicFile /etc/apache2/magic + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf b/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf new file mode 100644 index 0000000..926d6bd --- /dev/null +++ b/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf @@ -0,0 +1,48 @@ +# Virtual Hosts +# +# If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# +# Please see the documentation at +# +# for further details before you try to setup virtual hosts. +# +# You may use the command line option '-S' to verify your virtual host +# configuration. + + +# see bug #178966 why this is in here + +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# Use name-based virtual hosting. +NameVirtualHost *:80 + +# When virtual hosts are enabled, the main host defined in the default +# httpd.conf configuration will go away. We redefine it here so that it is +# still available. +# +# If you disable this vhost by removing -D DEFAULT_VHOST from +# /etc/conf.d/apache2, the first defined virtual host elsewhere will be +# the default. + + ServerName berta.pixelpark.com + Include /etc/apache2/vhosts.d/default_vhost.include + + + ServerEnvironment apache apache + + + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf.dist.new b/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf.dist.new new file mode 100644 index 0000000..b9766b5 --- /dev/null +++ b/config-archive/etc/apache2/vhosts.d/00_default_vhost.conf.dist.new @@ -0,0 +1,45 @@ +# Virtual Hosts +# +# If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# +# Please see the documentation at +# +# for further details before you try to setup virtual hosts. +# +# You may use the command line option '-S' to verify your virtual host +# configuration. + + +# see bug #178966 why this is in here + +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# When virtual hosts are enabled, the main host defined in the default +# httpd.conf configuration will go away. We redefine it here so that it is +# still available. +# +# If you disable this vhost by removing -D DEFAULT_VHOST from +# /etc/conf.d/apache2, the first defined virtual host elsewhere will be +# the default. + + ServerName localhost + Include /etc/apache2/vhosts.d/default_vhost.include + + + ServerEnvironment apache apache + + + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/vhosts.d/default_vhost.include b/config-archive/etc/apache2/vhosts.d/default_vhost.include new file mode 100644 index 0000000..716adc2 --- /dev/null +++ b/config-archive/etc/apache2/vhosts.d/default_vhost.include @@ -0,0 +1,71 @@ +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +ServerAdmin frank.brehm@pixelpark.com + +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +# If you change this to something that isn't under /var/www then suexec +# will no longer work. +DocumentRoot "/var/www/localhost/htdocs" + +# This should be changed to whatever you set DocumentRoot to. + + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + Options Indexes FollowSymLinks + + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + AllowOverride All + + # Controls who can get stuff from this server. + Require all granted + + + + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/" + + +# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. + + AllowOverride None + Options None + Require all granted + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/apache2/vhosts.d/default_vhost.include.dist.new b/config-archive/etc/apache2/vhosts.d/default_vhost.include.dist.new new file mode 100644 index 0000000..af6ece8 --- /dev/null +++ b/config-archive/etc/apache2/vhosts.d/default_vhost.include.dist.new @@ -0,0 +1,71 @@ +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +ServerAdmin root@localhost + +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +# If you change this to something that isn't under /var/www then suexec +# will no longer work. +DocumentRoot "/var/www/localhost/htdocs" + +# This should be changed to whatever you set DocumentRoot to. + + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + Options Indexes FollowSymLinks + + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + AllowOverride All + + # Controls who can get stuff from this server. + Require all granted + + + + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/" + + +# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. + + AllowOverride None + Options None + Require all granted + + +# vim: ts=4 filetype=apache diff --git a/config-archive/etc/conf.d/apache2 b/config-archive/etc/conf.d/apache2 new file mode 100644 index 0000000..cb433cb --- /dev/null +++ b/config-archive/etc/conf.d/apache2 @@ -0,0 +1,76 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# When you install a module it is easy to activate or deactivate the modules +# and other features of apache using the APACHE2_OPTS line. Every module should +# install a configuration in /etc/apache2/modules.d. In that file will have an +# directive where NNN is the option to enable that module. +# +# Here are the options available in the default configuration: +# +# AUTH_DIGEST Enables mod_auth_digest +# AUTHNZ_LDAP Enables authentication through mod_ldap (available if USE=ldap) +# CACHE Enables mod_cache +# DAV Enables mod_dav +# ERRORDOCS Enables default error documents for many languages. +# INFO Enables mod_info, a useful module for debugging +# LANGUAGE Enables content-negotiation based on language and charset. +# LDAP Enables mod_ldap (available if USE=ldap) +# MANUAL Enables /manual/ to be the apache manual (available if USE=docs) +# MEM_CACHE Enables default configuration mod_mem_cache +# PROXY Enables mod_proxy +# SSL Enables SSL (available if USE=ssl) +# STATUS Enabled mod_status, a useful module for statistics +# SUEXEC Enables running CGI scripts (in USERDIR) through suexec. +# USERDIR Enables /~username mapping to /home/username/public_html +# +# +# The following two options provide the default virtual host for the HTTP and +# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache +# will not listen for incomming connections on the approriate port. +# +# DEFAULT_VHOST Enables name-based virtual hosts, with the default +# virtual host being in /var/www/localhost/htdocs +# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this +# when you enable SSL) +# +#APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" +#APACHE2_OPTS="-D DEFAULT_VHOST -D PHP -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE" +APACHE2_OPTS="-D DEFAULT_VHOST -D PHP -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE" + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/var/run/apache2.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/usr/lib64/apache2 + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/config-archive/etc/conf.d/apache2.dist.new b/config-archive/etc/conf.d/apache2.dist.new new file mode 100644 index 0000000..5826d36 --- /dev/null +++ b/config-archive/etc/conf.d/apache2.dist.new @@ -0,0 +1,74 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# When you install a module it is easy to activate or deactivate the modules +# and other features of apache using the APACHE2_OPTS line. Every module should +# install a configuration in /etc/apache2/modules.d. In that file will have an +# directive where NNN is the option to enable that module. +# +# Here are the options available in the default configuration: +# +# AUTH_DIGEST Enables mod_auth_digest +# AUTHNZ_LDAP Enables authentication through mod_ldap (available if USE=ldap) +# CACHE Enables mod_cache +# DAV Enables mod_dav +# ERRORDOCS Enables default error documents for many languages. +# INFO Enables mod_info, a useful module for debugging +# LANGUAGE Enables content-negotiation based on language and charset. +# LDAP Enables mod_ldap (available if USE=ldap) +# MANUAL Enables /manual/ to be the apache manual (available if USE=docs) +# MEM_CACHE Enables default configuration mod_mem_cache +# PROXY Enables mod_proxy +# SSL Enables SSL (available if USE=ssl) +# STATUS Enabled mod_status, a useful module for statistics +# SUEXEC Enables running CGI scripts (in USERDIR) through suexec. +# USERDIR Enables /~username mapping to /home/username/public_html +# +# +# The following two options provide the default virtual host for the HTTP and +# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache +# will not listen for incomming connections on the approriate port. +# +# DEFAULT_VHOST Enables name-based virtual hosts, with the default +# virtual host being in /var/www/localhost/htdocs +# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this +# when you enable SSL) +# +APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/var/run/apache2.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/usr/lib64/apache2 + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/config-archive/etc/genkernel.conf.dist b/config-archive/etc/genkernel.conf.dist new file mode 100644 index 0000000..bf0418d --- /dev/null +++ b/config-archive/etc/genkernel.conf.dist @@ -0,0 +1,297 @@ +# Configuration file for genkernel + +# This file is sourced by genkernel at startup and determines which options +# we will be using to compile our kernel. The order of precidence is simple, +# with the internal settings being least important, configuration file +# settings next, and command line options being most important. + +# =========Common Command Line Option Defaults========= + +# Should we install to $BOOTDIR? Default is "no" because genkernel is used in +# catalyst and stage building. +#INSTALL="yes" + +# Run 'make oldconfig' before compiling this kernel? +OLDCONFIG="yes" + +# Run 'make menuconfig' before compiling this kernel? +MENUCONFIG="no" + +# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel? +NCONFIG="no" + +# Note, that two previous lines are mutual exclusive (logically), while +# MENUCONFIG has a higher priority if both them is enabled. + +# Run 'make clean' before compilation? +# If set to NO, implies MRPROPER WILL NOT be run +# Also, if clean is NO, it won't copy over any configuration +# file, it will use what's there. +CLEAN="yes" + +# Run 'make mrproper' before configuration/compilation? +MRPROPER="yes" + +# Override the arch detection? +#ARCH_OVERRIDE="x86" + +# Mount BOOTDIR automatically if it isn't mounted? +MOUNTBOOT="yes" + +# Make symlinks in BOOTDIR automatically? +#SYMLINK="no" + +# Save the new configuration in /etc/kernels upon +# successfull compilation +SAVE_CONFIG="yes" + +# Use Color output in Genkernel? +USECOLOR="yes" + +# Clear build cache dir +#CLEAR_CACHE_DIR="yes" + +# Clear all tmp files and caches after genkernel has run +#POSTCLEAR="1" + +# Genkernel uses an independent configuration for MAKEOPTS, and does not source +# /etc/make.conf . You can override the default setting by uncommenting and +# tweaking the following line. Default setting is set up by +# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j +# argument is: *+1 +#MAKEOPTS="-j2" + +# Add in LVM support from static binaries if they exist on the system, or +# compile static LVM binaries if static ones do not exist. +#LVM="no" + +# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed. +#LUKS="no" + +# Add in GnuPG support +#GPG="no" + +# Add DMRAID support. +#DMRAID="no" + +# Include (or suppresses the inclusion of) busybox in the initrd or initramfs. +# If included, busybox is rebuilt if the cached copy is out of date. +#BUSYBOX="yes" + +# Use udev instead of mdev as the default device manager for the initramfs. +# If you use systemd and perhaps lvm, you _must_ keep this turned on. +#UDEV="yes" + +# Includes mdadm/mdmon binaries in initramfs. +# Without sys-fs/mdadm[static] installed, this will build a static mdadm. +#MDADM="no" + +# Specify a custom mdadm.conf. +# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect +# arrays during bootup. Usually, this should not be needed. +#MDADM_CONFIG="/etc/mdadm.conf" + +# Add Multipath support. +#MULTIPATH="no" + +# Add iSCSI support. +#ISCSI="no" + +# Add e2fsprogs support. +#E2FSPROGS="no" + +# Enable copying of firmware into initramfs +#FIRMWARE="no" +# Specify directory to pull from +#FIRMWARE_DIR="/lib/firmware" +# Specify specific firmware files to include. This overrides FIRMWARE_DIR +#FIRMWARE_FILES="" + +# Add new kernel to grub? +#BOOTLOADER="grub" + +# Enable splashutils in early space (initrd). Default is "no". +#SPLASH="yes" + +# Use this splash theme. If commented out - the "default" name theme is used. +# Also, SPLASH="yes" needs to be enabled for this one to one work. +# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space). +#SPLASH_THEME="gentoo" + +# Installs, or not, plymouth into the initramfs. If "splash" will be +# passed at boot, plymouth will be activated. +# PLYMOUTH="yes" + +# Embeds the given plymouth theme into the initramfs. +# PLYMOUTH_THEME="text" + +# =========Keymap Settings========= +# +# Force keymap selection at boot +#DOKEYMAPAUTO="yes" + + +# Disables keymap selection support +#KEYMAP="0" + + +# =========Low Level Compile Settings========= +# +# GNU Make to use for kernel. See also the --kernel-make command line option. +#KERNEL_MAKE="make" + +# Compiler to use for the kernel (e.g. distcc). See also the --kernel-cc +# command line option. +#KERNEL_CC="gcc" + +# Assembler to use for the kernel. See also the --kernel-as command line +# option. +#KERNEL_AS="as" + +# Linker to use for the kernel. See also the --kernel-ld command line option. +#KERNEL_LD="ld" + +# GNU Make to use for the utilities. See also the --utils-make command line +# option. +#UTILS_MAKE="make" + +# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc +# command line option. +#UTILS_CC="gcc" + +# Assembler to use for the utilities. See also the --utils-as command line +# option. +#UTILS_AS="as" + +# Linker to use for the utilities. See also the --utils-ld command line +# option. +#UTILS_LD="ld" + +# =========GENKERNEL LOCATION CONFIGURATION============ +# Variables: +# %%ARCH%% - Final determined architecture +# %%CACHE%% - Final determined cache location + +# Set genkernel's temporary work directory. Default is /var/tmp/genkernel +#TMPDIR="/var/tmp/genkernel" + +# Set the boot directory, default is /boot +#BOOTDIR="/boot" + +# Default share directory location +GK_SHARE="${GK_SHARE:-/usr/share/genkernel}" + +# Location of the default cache +CACHE_DIR="/var/cache/genkernel" +# Location of DISTDIR, where our source tarballs are stored +DISTDIR="/var/lib/genkernel/src" +# Log output file +LOGFILE="/var/log/genkernel.log" +# Debug Level +LOGLEVEL=1 + +# =========COMPILED UTILS CONFIGURATION============ +# +# Default location of kernel source +DEFAULT_KERNEL_SOURCE="/usr/src/linux" +# Default kernel config (only use to override using +# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) +#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config" + +# Specifies a user created busybox config +#BUSYBOX_CONFIG="/path/to/file" +#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat" + +# NOTE: Since genkernel 3.4.41 the version of +# busybox, lvm, mdadm, .. have been moved to +# /usr/share/genkernel/defaults/software.sh in order to +# reduce the merging you have to do during etc-update. +# You can still override these settings in here. + + +# =========MISC KERNEL CONFIGURATION============ +# +# Tag the kernel and ramdisk with a name: +# If not defined the option defaults to +# 'genkernel' +#KNAME="genkernel" + +# Append a text to the kernel/initrd's name, +# usefull to add a unique key like the actual date +#KAPPENDNAME="-$(date +%Y%m%d-%H%M%S)" + + +# This option is only valid if kerncache is +# defined. If there is a valid kerncache no checks +# will be made against a kernel source tree +#KERNEL_SOURCES="0" + + +# Build a static (monolithic kernel) +#BUILD_STATIC="1" + + +# Make and install kernelz image (PowerPC) +#GENZIMAGE="1" + + +# File to output a .tar.bz2'd kernel contents +# of /lib/modules/ and the kernel config +# NOTE: This is created before the callbacks +# are run! +#KERNCACHE="/path/to/file" + + +# Prefix to kernel module destination, modules +# will be installed in /lib/modules +# (.conf equivalent of --module-prefix=) +#INSTALL_MOD_PATH="" + + +# =========MISC INITRD CONFIGURATION============ +# +# Copy all kernel modules to the ramdisk +#ALLRAMDISKMODULES="1" + + +# Don't copy any modules to the ramdisk +#RAMDISKMODULES="0" + + +# File to output a .tar.bz2'd kernel and ramdisk: +# No modules outside of the ramdisk will be +# included... +#MINKERNPACKAGE="/path/to/file.bz2" + + +# File to output a .tar.bz2'd modules after the +# callbacks have run +#MODULESPACKAGE="/path/to/file.bz2" + + +# Directory structure to include in the initramfs, +# only available on >=2.6 kernels +#INITRAMFS_OVERLAY="" + + +# Build the generated initramfs into the kernel instead of +# keeping it as a separate file +#INTEGRATED_INITRAMFS="1" + + +# Compress generated initramfs +#COMPRESS_INITRD="yes" +# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest +# "best" selects the best available compression method +# "fastest" selects the fastest available compression method +#COMPRESS_INITRD_TYPE="best" + + +# Create a self-contained env in the initramfs +#NETBOOT="1" + + +# =========MISC BOOT CONFIGURATION============ +# +# Specify a default for real_root= +#REAL_ROOT="/dev/one/two/gentoo" diff --git a/config-archive/etc/genkernel.conf.dist.new b/config-archive/etc/genkernel.conf.dist.new deleted file mode 100644 index 898f4f9..0000000 --- a/config-archive/etc/genkernel.conf.dist.new +++ /dev/null @@ -1,293 +0,0 @@ -# Configuration file for genkernel - -# This file is sourced by genkernel at startup and determines which options -# we will be using to compile our kernel. The order of precidence is simple, -# with the internal settings being least important, configuration file -# settings next, and command line options being most important. - -# =========Common Command Line Option Defaults========= - -# Should we install to $BOOTDIR? Default is "no" because genkernel is used in -# catalyst and stage building. -#INSTALL="yes" - -# Run 'make oldconfig' before compiling this kernel? -OLDCONFIG="yes" - -# Run 'make menuconfig' before compiling this kernel? -MENUCONFIG="no" - -# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel? -NCONFIG="no" - -# Note, that two previous lines are mutual exclusive (logically), while -# MENUCONFIG has a higher priority if both them is enabled. - -# Run 'make clean' before compilation? -# If set to NO, implies MRPROPER WILL NOT be run -# Also, if clean is NO, it won't copy over any configuration -# file, it will use what's there. -CLEAN="yes" - -# Run 'make mrproper' before configuration/compilation? -MRPROPER="yes" - -# Override the arch detection? -#ARCH_OVERRIDE="x86" - -# Mount BOOTDIR automatically if it isn't mounted? -MOUNTBOOT="yes" - -# Make symlinks in BOOTDIR automatically? -#SYMLINK="no" - -# Save the new configuration in /etc/kernels upon -# successfull compilation -SAVE_CONFIG="yes" - -# Use Color output in Genkernel? -USECOLOR="yes" - -# Clear build cache dir -#CLEAR_CACHE_DIR="yes" - -# Clear all tmp files and caches after genkernel has run -#POSTCLEAR="1" - -# Genkernel uses an independent configuration for MAKEOPTS, and does not source -# /etc/make.conf . You can override the default setting by uncommenting and -# tweaking the following line. Default setting is set up by -# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j -# argument is: *+1 -#MAKEOPTS="-j2" - -# Add in LVM support from static binaries if they exist on the system, or -# compile static LVM binaries if static ones do not exist. -#LVM="no" - -# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed. -#LUKS="no" - -# Add in GnuPG support -#GPG="no" - -# Add DMRAID support. -#DMRAID="no" - -# Include (or suppresses the inclusion of) busybox in the initrd or initramfs. -# If included, busybox is rebuilt if the cached copy is out of date. -#BUSYBOX="yes" - -# Use udev instead of mdev as the default device manager for the initramfs. -# If you use systemd and perhaps lvm, you _must_ keep this turned on. -#UDEV="yes" - -# Includes mdadm/mdmon binaries in initramfs. -# Without sys-fs/mdadm[static] installed, this will build a static mdadm. -#MDADM="no" - -# Specify a custom mdadm.conf. -# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect -# arrays during bootup. Usually, this should not be needed. -#MDADM_CONFIG="/etc/mdadm.conf" - -# Add Multipath support. -#MULTIPATH="no" - -# Add iSCSI support. -#ISCSI="no" - -# Add e2fsprogs support. -#E2FSPROGS="no" - -# Enable copying of firmware into initramfs -#FIRMWARE="no" -# Specify directory to pull from -#FIRMWARE_DIR="/lib/firmware" -# Specify specific firmware files to include. This overrides FIRMWARE_DIR -#FIRMWARE_FILES="" - -# Add new kernel to grub? -#BOOTLOADER="grub" - -# Enable splashutils in early space (initrd). Default is "no". -#SPLASH="yes" - -# Use this splash theme. If commented out - the "default" name theme is used. -# Also, SPLASH="yes" needs to be enabled for this one to one work. -# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space). -#SPLASH_THEME="gentoo" - -# Installs, or not, plymouth into the initramfs. If "splash" will be -# passed at boot, plymouth will be activated. -# PLYMOUTH="yes" - -# Embeds the given plymouth theme into the initramfs. -# PLYMOUTH_THEME="text" - -# =========Keymap Settings========= -# -# Force keymap selection at boot -#DOKEYMAPAUTO="yes" - - -# Disables keymap selection support -#KEYMAP="0" - - -# =========Low Level Compile Settings========= -# -# GNU Make to use for kernel. See also the --kernel-make command line option. -#KERNEL_MAKE="make" - -# Compiler to use for the kernel (e.g. distcc). See also the --kernel-cc -# command line option. -#KERNEL_CC="gcc" - -# Assembler to use for the kernel. See also the --kernel-as command line -# option. -#KERNEL_AS="as" - -# Linker to use for the kernel. See also the --kernel-ld command line option. -#KERNEL_LD="ld" - -# GNU Make to use for the utilities. See also the --utils-make command line -# option. -#UTILS_MAKE="make" - -# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc -# command line option. -#UTILS_CC="gcc" - -# Assembler to use for the utilities. See also the --utils-as command line -# option. -#UTILS_AS="as" - -# Linker to use for the utilities. See also the --utils-ld command line -# option. -#UTILS_LD="ld" - -# =========GENKERNEL LOCATION CONFIGURATION============ -# Variables: -# %%ARCH%% - Final determined architecture -# %%CACHE%% - Final determined cache location - -# Set genkernel's temporary work directory. Default is /var/tmp/genkernel -#TMPDIR="/var/tmp/genkernel" - -# Set the boot directory, default is /boot -#BOOTDIR="/boot" - -# Default share directory location -GK_SHARE="${GK_SHARE:-/usr/share/genkernel}" - -# Location of the default cache -CACHE_DIR="/var/cache/genkernel" -# Location of DISTDIR, where our source tarballs are stored -DISTDIR="/var/lib/genkernel/src" -# Log output file -LOGFILE="/var/log/genkernel.log" -# Debug Level -LOGLEVEL=1 - -# =========COMPILED UTILS CONFIGURATION============ -# -# Default location of kernel source -DEFAULT_KERNEL_SOURCE="/usr/src/linux" -# Default kernel config (only use to override using -# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) -#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config" - -# Specifies a user created busybox config -#BUSYBOX_CONFIG="/path/to/file" -#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat" - -# NOTE: Since genkernel 3.4.41 the version of -# busybox, lvm, mdadm, .. have been moved to -# /usr/share/genkernel/defaults/software.sh in order to -# reduce the merging you have to do during etc-update. -# You can still override these settings in here. - - -# =========MISC KERNEL CONFIGURATION============ -# -# Tag the kernel and ramdisk with a name: -# If not defined the option defaults to -# 'genkernel' -#KNAME="genkernel" - - -# This option is only valid if kerncache is -# defined. If there is a valid kerncache no checks -# will be made against a kernel source tree -#KERNEL_SOURCES="0" - - -# Build a static (monolithic kernel) -#BUILD_STATIC="1" - - -# Make and install kernelz image (PowerPC) -#GENZIMAGE="1" - - -# File to output a .tar.bz2'd kernel contents -# of /lib/modules/ and the kernel config -# NOTE: This is created before the callbacks -# are run! -#KERNCACHE="/path/to/file" - - -# Prefix to kernel module destination, modules -# will be installed in /lib/modules -# (.conf equivalent of --module-prefix=) -#INSTALL_MOD_PATH="" - - -# =========MISC INITRD CONFIGURATION============ -# -# Copy all kernel modules to the ramdisk -#ALLRAMDISKMODULES="1" - - -# Don't copy any modules to the ramdisk -#RAMDISKMODULES="0" - - -# File to output a .tar.bz2'd kernel and ramdisk: -# No modules outside of the ramdisk will be -# included... -#MINKERNPACKAGE="/path/to/file.bz2" - - -# File to output a .tar.bz2'd modules after the -# callbacks have run -#MODULESPACKAGE="/path/to/file.bz2" - - -# Directory structure to include in the initramfs, -# only available on >=2.6 kernels -#INITRAMFS_OVERLAY="" - - -# Build the generated initramfs into the kernel instead of -# keeping it as a separate file -#INTEGRATED_INITRAMFS="1" - - -# Compress generated initramfs -#COMPRESS_INITRD="yes" -# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest -# "best" selects the best available compression method -# "fastest" selects the fastest available compression method -#COMPRESS_INITRD_TYPE="best" - - -# Create a self-contained env in the initramfs -#NETBOOT="1" - - -# =========MISC BOOT CONFIGURATION============ -# -# Specify a default for real_root= -#REAL_ROOT="/dev/one/two/gentoo" diff --git a/config-archive/etc/hosts b/config-archive/etc/hosts new file mode 100644 index 0000000..92c48b3 --- /dev/null +++ b/config-archive/etc/hosts @@ -0,0 +1,31 @@ +# /etc/hosts: Local Host Database +# +# This file describes a number of aliases-to-address mappings for the for +# local hosts that share this file. +# +# In the presence of the domain name service or NIS, this file may not be +# consulted at all; see /etc/host.conf for the resolution order. +# + +# IPv4 and IPv6 localhost aliases +127.0.0.1 berta.pixelpark.com berta localhost +::1 berta.pixelpark.com berta localhost + +# +# Imaginary network. +#10.0.0.2 myname +#10.0.0.3 myfriend +# +# According to RFC 1918, you can use the following IP networks for private +# nets which will never be connected to the Internet: +# +# 10.0.0.0 - 10.255.255.255 +# 172.16.0.0 - 172.31.255.255 +# 192.168.0.0 - 192.168.255.255 +# +# In case you want to be able to connect directly to the Internet (i.e. not +# behind a NAT, ADSL router, etc...), you need real official assigned +# numbers. Do not try to invent your own network numbers but instead get one +# from your network provider (if any) or from your regional registry (ARIN, +# APNIC, LACNIC, RIPE NCC, or AfriNIC.) +# diff --git a/config-archive/etc/hosts.dist b/config-archive/etc/hosts.dist new file mode 100644 index 0000000..b3d3721 --- /dev/null +++ b/config-archive/etc/hosts.dist @@ -0,0 +1,37 @@ +# /etc/hosts: Local Host Database +# +# This file describes a number of aliases-to-address mappings for the for +# local hosts that share this file. +# +# The format of lines in this file is: +# +# IP_ADDRESS canonical_hostname [aliases...] +# +#The fields can be separated by any number of spaces or tabs. +# +# In the presence of the domain name service or NIS, this file may not be +# consulted at all; see /etc/host.conf for the resolution order. +# + +# IPv4 and IPv6 localhost aliases +127.0.0.1 localhost +::1 localhost + +# +# Imaginary network. +#10.0.0.2 myname +#10.0.0.3 myfriend +# +# According to RFC 1918, you can use the following IP networks for private +# nets which will never be connected to the Internet: +# +# 10.0.0.0 - 10.255.255.255 +# 172.16.0.0 - 172.31.255.255 +# 192.168.0.0 - 192.168.255.255 +# +# In case you want to be able to connect directly to the Internet (i.e. not +# behind a NAT, ADSL router, etc...), you need real official assigned +# numbers. Do not try to invent your own network numbers but instead get one +# from your network provider (if any) or from your regional registry (ARIN, +# APNIC, LACNIC, RIPE NCC, or AfriNIC.) +# diff --git a/config-archive/etc/logrotate.d/apache2 b/config-archive/etc/logrotate.d/apache2 new file mode 100644 index 0000000..465edfa --- /dev/null +++ b/config-archive/etc/logrotate.d/apache2 @@ -0,0 +1,14 @@ +# Apache2 logrotate snipet for Gentoo Linux +# Contributes by Chuck Short +# +/var/log/apache2/*log { + daily + rotate 14 + missingok + notifempty + sharedscripts + size 4M + postrotate + /etc/init.d/apache2 reload > /dev/null 2>&1 || true + endscript +} diff --git a/config-archive/etc/logrotate.d/apache2.dist.new b/config-archive/etc/logrotate.d/apache2.dist.new new file mode 100644 index 0000000..9dd431c --- /dev/null +++ b/config-archive/etc/logrotate.d/apache2.dist.new @@ -0,0 +1,11 @@ +# Apache2 logrotate snipet for Gentoo Linux +# Contributes by Chuck Short +# +/var/log/apache2/*log { + missingok + notifempty + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null 2>&1 || true + endscript +} diff --git a/genkernel.conf b/genkernel.conf index e61484e..550426d 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -218,6 +218,10 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux" # 'genkernel' #KNAME="genkernel" +# Append a text to the kernel/initrd's name, +# usefull to add a unique key like the actual date +#KAPPENDNAME="-$(date +%Y%m%d-%H%M%S)" + # This option is only valid if kerncache is # defined. If there is a valid kerncache no checks diff --git a/hosts b/hosts index 92c48b3..cef7345 100644 --- a/hosts +++ b/hosts @@ -3,6 +3,12 @@ # This file describes a number of aliases-to-address mappings for the for # local hosts that share this file. # +# The format of lines in this file is: +# +# IP_ADDRESS canonical_hostname [aliases...] +# +#The fields can be separated by any number of spaces or tabs. +# # In the presence of the domain name service or NIS, this file may not be # consulted at all; see /etc/host.conf for the resolution order. #