From: Frank Brehm Date: Tue, 20 Dec 2016 17:42:42 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6873361842fcfae8d22bb17e9759910a9ad17f96;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/apache2/modules.d/00_default_settings.conf b/apache2/modules.d/00_default_settings.conf index 38635aa..5d41941 100644 --- a/apache2/modules.d/00_default_settings.conf +++ b/apache2/modules.d/00_default_settings.conf @@ -69,13 +69,13 @@ HostnameLookups Off # filesystems or if support for these functions is otherwise # broken on your system. EnableMMAP On -EnableSendfile Off +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 MTime Size +FileETag INode MTime Size # ContentDigest: This directive enables the generation of Content-MD5 # headers as defined in RFC1864 respectively RFC2616. @@ -96,7 +96,7 @@ ContentDigest Off # 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 +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, @@ -119,7 +119,7 @@ LogLevel warn # # Do not change this entry unless you know what you are doing. - DirectoryIndex index.html index.html.var + DirectoryIndex index.html index.html.var index.shtml index.htm # The following lines prevent .htaccess and .htpasswd files from being diff --git a/apache2/modules.d/00_languages.conf b/apache2/modules.d/00_languages.conf index c429bf9..48af93d 100644 --- a/apache2/modules.d/00_languages.conf +++ b/apache2/modules.d/00_languages.conf @@ -68,7 +68,7 @@ AddLanguage zh-TW .zh-tw # # 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 +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) diff --git a/apache2/modules.d/00_mod_autoindex.conf b/apache2/modules.d/00_mod_autoindex.conf index 10bf483..c7e630b 100644 --- a/apache2/modules.d/00_mod_autoindex.conf +++ b/apache2/modules.d/00_mod_autoindex.conf @@ -21,7 +21,7 @@ Alias /icons/ "/usr/share/apache2/icons/" # IndexOptions: Controls the appearance of server-generated directory # listings. -IndexOptions FancyIndexing VersionSort +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 @@ -64,9 +64,11 @@ DefaultIcon /icons/unknown.gif # directories. # Format: AddDescription "description" filename -#AddDescription "GZIP compressed document" .gz -#AddDescription "tar archive" .tar -#AddDescription "GZIP compressed tar archive" .tgz +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. diff --git a/apache2/modules.d/00_mod_log_config.conf b/apache2/modules.d/00_mod_log_config.conf index ce0238e..d4bd85c 100644 --- a/apache2/modules.d/00_mod_log_config.conf +++ b/apache2/modules.d/00_mod_log_config.conf @@ -1,6 +1,7 @@ # 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 @@ -11,6 +12,7 @@ LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" VLOG= # 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 @@ -20,7 +22,7 @@ LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O # 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 +CustomLog /var/log/apache2/access.log full # If you would like to have agent and referer logfiles, # uncomment the following directives. diff --git a/apache2/modules.d/00_mod_mime.conf b/apache2/modules.d/00_mod_mime.conf index fb8a9a5..3940107 100644 --- a/apache2/modules.d/00_mod_mime.conf +++ b/apache2/modules.d/00_mod_mime.conf @@ -9,8 +9,8 @@ TypesConfig /etc/mime.types # 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 +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: @@ -26,7 +26,7 @@ AddType application/x-gzip .gz .tgz #AddHandler cgi-script .cgi # For type maps (negotiated resources): -#AddHandler type-map var +AddHandler type-map var # Filters allow you to process content before it is sent to the client. # diff --git a/apache2/vhosts.d/00_default_vhost.conf b/apache2/vhosts.d/00_default_vhost.conf index b9766b5..926d6bd 100644 --- a/apache2/vhosts.d/00_default_vhost.conf +++ b/apache2/vhosts.d/00_default_vhost.conf @@ -25,6 +25,9 @@ #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. @@ -33,7 +36,7 @@ Listen 80 # /etc/conf.d/apache2, the first defined virtual host elsewhere will be # the default. - ServerName localhost + ServerName berta.pixelpark.com Include /etc/apache2/vhosts.d/default_vhost.include diff --git a/apache2/vhosts.d/default_vhost.include b/apache2/vhosts.d/default_vhost.include index af6ece8..716adc2 100644 --- a/apache2/vhosts.d/default_vhost.include +++ b/apache2/vhosts.d/default_vhost.include @@ -1,7 +1,7 @@ # 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 +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 diff --git a/conf.d/apache2 b/conf.d/apache2 index 5826d36..cb433cb 100644 --- a/conf.d/apache2 +++ b/conf.d/apache2 @@ -33,7 +33,9 @@ # 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 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 diff --git a/systemd/system/multi-user.target.wants/apache2.service b/systemd/system/multi-user.target.wants/apache2.service new file mode 120000 index 0000000..c726d60 --- /dev/null +++ b/systemd/system/multi-user.target.wants/apache2.service @@ -0,0 +1 @@ +/usr/lib64/systemd/system/apache2.service \ No newline at end of file