Blah
This commit is contained in:
parent
d02a7cedc8
commit
4d9533ca0a
@ -1,158 +0,0 @@
|
|||||||
# This is a modification of the default Apache 2.2 configuration file
|
|
||||||
# for Gentoo Linux.
|
|
||||||
#
|
|
||||||
# Support:
|
|
||||||
# http://www.gentoo.org/main/en/lists.xml [mailing lists]
|
|
||||||
# http://forums.gentoo.org/ [web forums]
|
|
||||||
# irc://irc.freenode.net#gentoo-apache [irc chat]
|
|
||||||
#
|
|
||||||
# Bug Reports:
|
|
||||||
# http://bugs.gentoo.org [gentoo related bugs]
|
|
||||||
# http://httpd.apache.org/bug_report.html [apache httpd related bugs]
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# This is the main Apache HTTP server configuration file. It contains the
|
|
||||||
# configuration directives that give the server its instructions.
|
|
||||||
# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
|
|
||||||
# In particular, see
|
|
||||||
# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
|
|
||||||
# for a discussion of each configuration directive.
|
|
||||||
#
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
|
||||||
# consult the online docs. You have been warned.
|
|
||||||
#
|
|
||||||
# Configuration and logfile names: If the filenames you specify for many
|
|
||||||
# of the server's control files begin with "/" (or "drive:/" for Win32), the
|
|
||||||
# server will use that explicit path. If the filenames do *not* begin
|
|
||||||
# with "/", the value of ServerRoot is prepended -- so "var/log/apache2/foo_log"
|
|
||||||
# with ServerRoot set to "/usr" will be interpreted by the
|
|
||||||
# server as "/usr/var/log/apache2/foo.log".
|
|
||||||
|
|
||||||
# ServerRoot: The top of the directory tree under which the server's
|
|
||||||
# configuration, error, and log files are kept.
|
|
||||||
#
|
|
||||||
# Do not add a slash at the end of the directory path. If you point
|
|
||||||
# ServerRoot at a non-local disk, be sure to point the LockFile directive
|
|
||||||
# at a local disk. If you wish to share the same ServerRoot for multiple
|
|
||||||
# httpd daemons, you will need to change at least LockFile and PidFile.
|
|
||||||
ServerRoot "/usr/lib64/apache2"
|
|
||||||
|
|
||||||
# Dynamic Shared Object (DSO) Support
|
|
||||||
#
|
|
||||||
# To be able to use the functionality of a module which was built as a DSO you
|
|
||||||
# have to place corresponding `LoadModule' lines at this location so the
|
|
||||||
# directives contained in it are actually available _before_ they are used.
|
|
||||||
# Statically compiled modules (those listed by `httpd -l') do not need
|
|
||||||
# to be loaded here.
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
# LoadModule foo_module modules/mod_foo.so
|
|
||||||
#
|
|
||||||
# GENTOO: Automatically defined based on APACHE2_MODULES USE_EXPAND variable.
|
|
||||||
# Do not change manually, it will be overwritten on upgrade.
|
|
||||||
#
|
|
||||||
# The following modules are considered as the default configuration.
|
|
||||||
# If you wish to disable one of them, you may have to alter other
|
|
||||||
# configuration directives.
|
|
||||||
#
|
|
||||||
# Change these at your own risk!
|
|
||||||
|
|
||||||
LoadModule actions_module modules/mod_actions.so
|
|
||||||
LoadModule alias_module modules/mod_alias.so
|
|
||||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
|
||||||
LoadModule authn_alias_module modules/mod_authn_alias.so
|
|
||||||
LoadModule authn_anon_module modules/mod_authn_anon.so
|
|
||||||
LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
|
||||||
LoadModule authn_default_module modules/mod_authn_default.so
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
|
||||||
LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
|
||||||
LoadModule authz_default_module modules/mod_authz_default.so
|
|
||||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
|
||||||
LoadModule authz_owner_module modules/mod_authz_owner.so
|
|
||||||
LoadModule authz_user_module modules/mod_authz_user.so
|
|
||||||
LoadModule autoindex_module modules/mod_autoindex.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule cache_module modules/mod_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule cgi_module modules/mod_cgi.so
|
|
||||||
LoadModule cgid_module modules/mod_cgid.so
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_module modules/mod_dav.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_fs_module modules/mod_dav_fs.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_lock_module modules/mod_dav_lock.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule deflate_module modules/mod_deflate.so
|
|
||||||
LoadModule dir_module modules/mod_dir.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule disk_cache_module modules/mod_disk_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule env_module modules/mod_env.so
|
|
||||||
LoadModule expires_module modules/mod_expires.so
|
|
||||||
LoadModule ext_filter_module modules/mod_ext_filter.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule file_cache_module modules/mod_file_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule filter_module modules/mod_filter.so
|
|
||||||
LoadModule headers_module modules/mod_headers.so
|
|
||||||
LoadModule include_module modules/mod_include.so
|
|
||||||
<IfDefine INFO>
|
|
||||||
LoadModule info_module modules/mod_info.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule log_config_module modules/mod_log_config.so
|
|
||||||
LoadModule logio_module modules/mod_logio.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule mem_cache_module modules/mod_mem_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule mime_module modules/mod_mime.so
|
|
||||||
LoadModule mime_magic_module modules/mod_mime_magic.so
|
|
||||||
LoadModule negotiation_module modules/mod_negotiation.so
|
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
|
||||||
LoadModule speling_module modules/mod_speling.so
|
|
||||||
<IfDefine SSL>
|
|
||||||
LoadModule ssl_module modules/mod_ssl.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine STATUS>
|
|
||||||
LoadModule status_module modules/mod_status.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule unique_id_module modules/mod_unique_id.so
|
|
||||||
<IfDefine USERDIR>
|
|
||||||
LoadModule userdir_module modules/mod_userdir.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule usertrack_module modules/mod_usertrack.so
|
|
||||||
LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
|
||||||
|
|
||||||
# If you wish httpd to run as a different user or group, you must run
|
|
||||||
# httpd as root initially and it will switch.
|
|
||||||
#
|
|
||||||
# User/Group: The name (or #number) of the user/group to run httpd as.
|
|
||||||
# It is usually good practice to create a dedicated user and group for
|
|
||||||
# running httpd, as with most system services.
|
|
||||||
User apache
|
|
||||||
Group apache
|
|
||||||
|
|
||||||
# Supplemental configuration
|
|
||||||
#
|
|
||||||
# Most of the configuration files in the /etc/apache2/modules.d/ directory can
|
|
||||||
# be turned on using APACHE2_OPTS in /etc/conf.d/apache2 to add extra features
|
|
||||||
# or to modify the default configuration of the server.
|
|
||||||
#
|
|
||||||
# To know which flag to add to APACHE2_OPTS, look at the first line of the
|
|
||||||
# the file, which will usually be an <IfDefine OPTION> where OPTION is the
|
|
||||||
# flag to use.
|
|
||||||
Include /etc/apache2/modules.d/*.conf
|
|
||||||
|
|
||||||
# Virtual-host support
|
|
||||||
#
|
|
||||||
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
|
|
||||||
# include a default vhost (enabled by adding -D DEFAULT_VHOST to
|
|
||||||
# APACHE2_OPTS in /etc/conf.d/apache2).
|
|
||||||
Include /etc/apache2/vhosts.d/*.conf
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,385 +0,0 @@
|
|||||||
# Magic data for mod_mime_magic Apache module (originally for file(1) command)
|
|
||||||
# The module is described in /manual/mod/mod_mime_magic.html
|
|
||||||
#
|
|
||||||
# The format is 4-5 columns:
|
|
||||||
# Column #1: byte number to begin checking from, ">" indicates continuation
|
|
||||||
# Column #2: type of data to match
|
|
||||||
# Column #3: contents of data to match
|
|
||||||
# Column #4: MIME type of result
|
|
||||||
# Column #5: MIME encoding of result (optional)
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# Localstuff: file(1) magic for locally observed files
|
|
||||||
# Add any locally observed files here.
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# end local stuff
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# Java
|
|
||||||
|
|
||||||
0 short 0xcafe
|
|
||||||
>2 short 0xbabe application/java
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# audio: file(1) magic for sound formats
|
|
||||||
#
|
|
||||||
# from Jan Nicolai Langfeldt <janl@ifi.uio.no>,
|
|
||||||
#
|
|
||||||
|
|
||||||
# Sun/NeXT audio data
|
|
||||||
0 string .snd
|
|
||||||
>12 belong 1 audio/basic
|
|
||||||
>12 belong 2 audio/basic
|
|
||||||
>12 belong 3 audio/basic
|
|
||||||
>12 belong 4 audio/basic
|
|
||||||
>12 belong 5 audio/basic
|
|
||||||
>12 belong 6 audio/basic
|
|
||||||
>12 belong 7 audio/basic
|
|
||||||
|
|
||||||
>12 belong 23 audio/x-adpcm
|
|
||||||
|
|
||||||
# DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format
|
|
||||||
# that uses little-endian encoding and has a different magic number
|
|
||||||
# (0x0064732E in little-endian encoding).
|
|
||||||
0 lelong 0x0064732E
|
|
||||||
>12 lelong 1 audio/x-dec-basic
|
|
||||||
>12 lelong 2 audio/x-dec-basic
|
|
||||||
>12 lelong 3 audio/x-dec-basic
|
|
||||||
>12 lelong 4 audio/x-dec-basic
|
|
||||||
>12 lelong 5 audio/x-dec-basic
|
|
||||||
>12 lelong 6 audio/x-dec-basic
|
|
||||||
>12 lelong 7 audio/x-dec-basic
|
|
||||||
# compressed (G.721 ADPCM)
|
|
||||||
>12 lelong 23 audio/x-dec-adpcm
|
|
||||||
|
|
||||||
# Bytes 0-3 of AIFF, AIFF-C, & 8SVX audio files are "FORM"
|
|
||||||
# AIFF audio data
|
|
||||||
8 string AIFF audio/x-aiff
|
|
||||||
# AIFF-C audio data
|
|
||||||
8 string AIFC audio/x-aiff
|
|
||||||
# IFF/8SVX audio data
|
|
||||||
8 string 8SVX audio/x-aiff
|
|
||||||
|
|
||||||
# Creative Labs AUDIO stuff
|
|
||||||
# Standard MIDI data
|
|
||||||
0 string MThd audio/unknown
|
|
||||||
#>9 byte >0 (format %d)
|
|
||||||
#>11 byte >1 using %d channels
|
|
||||||
# Creative Music (CMF) data
|
|
||||||
0 string CTMF audio/unknown
|
|
||||||
# SoundBlaster instrument data
|
|
||||||
0 string SBI audio/unknown
|
|
||||||
# Creative Labs voice data
|
|
||||||
0 string Creative\ Voice\ File audio/unknown
|
|
||||||
## is this next line right? it came this way...
|
|
||||||
#>19 byte 0x1A
|
|
||||||
#>23 byte >0 - version %d
|
|
||||||
#>22 byte >0 \b.%d
|
|
||||||
|
|
||||||
# [GRR 950115: is this also Creative Labs? Guessing that first line
|
|
||||||
# should be string instead of unknown-endian long...]
|
|
||||||
#0 long 0x4e54524b MultiTrack sound data
|
|
||||||
#0 string NTRK MultiTrack sound data
|
|
||||||
#>4 long x - version %ld
|
|
||||||
|
|
||||||
# Microsoft WAVE format (*.wav)
|
|
||||||
# [GRR 950115: probably all of the shorts and longs should be leshort/lelong]
|
|
||||||
# Microsoft RIFF
|
|
||||||
0 string RIFF audio/unknown
|
|
||||||
# - WAVE format
|
|
||||||
>8 string WAVE audio/x-wav
|
|
||||||
# MPEG audio.
|
|
||||||
0 beshort&0xfff0 0xfff0 audio/mpeg
|
|
||||||
# C64 SID Music files, from Linus Walleij <triad@df.lth.se>
|
|
||||||
0 string PSID audio/prs.sid
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# c-lang: file(1) magic for C programs or various scripts
|
|
||||||
#
|
|
||||||
|
|
||||||
# XPM icons (Greg Roelofs, newt@uchicago.edu)
|
|
||||||
# ideally should go into "images", but entries below would tag XPM as C source
|
|
||||||
0 string /*\ XPM image/x-xbm 7bit
|
|
||||||
|
|
||||||
# this first will upset you if you're a PL/1 shop... (are there any left?)
|
|
||||||
# in which case rm it; ascmagic will catch real C programs
|
|
||||||
# C or REXX program text
|
|
||||||
0 string /* text/plain
|
|
||||||
# C++ program text
|
|
||||||
0 string // text/plain
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# compress: file(1) magic for pure-compression formats (no archives)
|
|
||||||
#
|
|
||||||
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, whap, etc.
|
|
||||||
#
|
|
||||||
# Formats for various forms of compressed data
|
|
||||||
# Formats for "compress" proper have been moved into "compress.c",
|
|
||||||
# because it tries to uncompress it to figure out what's inside.
|
|
||||||
|
|
||||||
# standard unix compress
|
|
||||||
0 string \037\235 application/octet-stream x-compress
|
|
||||||
|
|
||||||
# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
|
|
||||||
0 string \037\213 application/octet-stream x-gzip
|
|
||||||
|
|
||||||
# According to gzip.h, this is the correct byte order for packed data.
|
|
||||||
0 string \037\036 application/octet-stream
|
|
||||||
#
|
|
||||||
# This magic number is byte-order-independent.
|
|
||||||
#
|
|
||||||
0 short 017437 application/octet-stream
|
|
||||||
|
|
||||||
# XXX - why *two* entries for "compacted data", one of which is
|
|
||||||
# byte-order independent, and one of which is byte-order dependent?
|
|
||||||
#
|
|
||||||
# compacted data
|
|
||||||
0 short 0x1fff application/octet-stream
|
|
||||||
0 string \377\037 application/octet-stream
|
|
||||||
# huf output
|
|
||||||
0 short 0145405 application/octet-stream
|
|
||||||
|
|
||||||
# Squeeze and Crunch...
|
|
||||||
# These numbers were gleaned from the Unix versions of the programs to
|
|
||||||
# handle these formats. Note that I can only uncrunch, not crunch, and
|
|
||||||
# I didn't have a crunched file handy, so the crunch number is untested.
|
|
||||||
# Keith Waclena <keith@cerberus.uchicago.edu>
|
|
||||||
#0 leshort 0x76FF squeezed data (CP/M, DOS)
|
|
||||||
#0 leshort 0x76FE crunched data (CP/M, DOS)
|
|
||||||
|
|
||||||
# Freeze
|
|
||||||
#0 string \037\237 Frozen file 2.1
|
|
||||||
#0 string \037\236 Frozen file 1.0 (or gzip 0.5)
|
|
||||||
|
|
||||||
# lzh?
|
|
||||||
#0 string \037\240 LZH compressed data
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# frame: file(1) magic for FrameMaker files
|
|
||||||
#
|
|
||||||
# This stuff came on a FrameMaker demo tape, most of which is
|
|
||||||
# copyright, but this file is "published" as witness the following:
|
|
||||||
#
|
|
||||||
0 string \<MakerFile application/x-frame
|
|
||||||
0 string \<MIFFile application/x-frame
|
|
||||||
0 string \<MakerDictionary application/x-frame
|
|
||||||
0 string \<MakerScreenFon application/x-frame
|
|
||||||
0 string \<MML application/x-frame
|
|
||||||
0 string \<Book application/x-frame
|
|
||||||
0 string \<Maker application/x-frame
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# html: file(1) magic for HTML (HyperText Markup Language) docs
|
|
||||||
#
|
|
||||||
# from Daniel Quinlan <quinlan@yggdrasil.com>
|
|
||||||
# and Anna Shergold <anna@inext.co.uk>
|
|
||||||
#
|
|
||||||
0 string \<!DOCTYPE\ HTML text/html
|
|
||||||
0 string \<!doctype\ html text/html
|
|
||||||
0 string \<HEAD text/html
|
|
||||||
0 string \<head text/html
|
|
||||||
0 string \<TITLE text/html
|
|
||||||
0 string \<title text/html
|
|
||||||
0 string \<html text/html
|
|
||||||
0 string \<HTML text/html
|
|
||||||
0 string \<!-- text/html
|
|
||||||
0 string \<h1 text/html
|
|
||||||
0 string \<H1 text/html
|
|
||||||
|
|
||||||
# XML eXtensible Markup Language, from Linus Walleij <triad@df.lth.se>
|
|
||||||
0 string \<?xml text/xml
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# images: file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
|
|
||||||
#
|
|
||||||
# originally from jef@helios.ee.lbl.gov (Jef Poskanzer),
|
|
||||||
# additions by janl@ifi.uio.no as well as others. Jan also suggested
|
|
||||||
# merging several one- and two-line files into here.
|
|
||||||
#
|
|
||||||
# XXX - byte order for GIF and TIFF fields?
|
|
||||||
# [GRR: TIFF allows both byte orders; GIF is probably little-endian]
|
|
||||||
#
|
|
||||||
|
|
||||||
# [GRR: what the hell is this doing in here?]
|
|
||||||
#0 string xbtoa btoa'd file
|
|
||||||
|
|
||||||
# PBMPLUS
|
|
||||||
# PBM file
|
|
||||||
0 string P1 image/x-portable-bitmap 7bit
|
|
||||||
# PGM file
|
|
||||||
0 string P2 image/x-portable-greymap 7bit
|
|
||||||
# PPM file
|
|
||||||
0 string P3 image/x-portable-pixmap 7bit
|
|
||||||
# PBM "rawbits" file
|
|
||||||
0 string P4 image/x-portable-bitmap
|
|
||||||
# PGM "rawbits" file
|
|
||||||
0 string P5 image/x-portable-greymap
|
|
||||||
# PPM "rawbits" file
|
|
||||||
0 string P6 image/x-portable-pixmap
|
|
||||||
|
|
||||||
# NIFF (Navy Interchange File Format, a modification of TIFF)
|
|
||||||
# [GRR: this *must* go before TIFF]
|
|
||||||
0 string IIN1 image/x-niff
|
|
||||||
|
|
||||||
# TIFF and friends
|
|
||||||
# TIFF file, big-endian
|
|
||||||
0 string MM image/tiff
|
|
||||||
# TIFF file, little-endian
|
|
||||||
0 string II image/tiff
|
|
||||||
|
|
||||||
# possible GIF replacements; none yet released!
|
|
||||||
# (Greg Roelofs, newt@uchicago.edu)
|
|
||||||
#
|
|
||||||
# GRR 950115: this was mine ("Zip GIF"):
|
|
||||||
# ZIF image (GIF+deflate alpha)
|
|
||||||
0 string GIF94z image/unknown
|
|
||||||
#
|
|
||||||
# GRR 950115: this is Jeremy Wohl's Free Graphics Format (better):
|
|
||||||
# FGF image (GIF+deflate beta)
|
|
||||||
0 string FGF95a image/unknown
|
|
||||||
#
|
|
||||||
# GRR 950115: this is Thomas Boutell's Portable Bitmap Format proposal
|
|
||||||
# (best; not yet implemented):
|
|
||||||
# PBF image (deflate compression)
|
|
||||||
0 string PBF image/unknown
|
|
||||||
|
|
||||||
# GIF
|
|
||||||
0 string GIF image/gif
|
|
||||||
|
|
||||||
# JPEG images
|
|
||||||
0 beshort 0xffd8 image/jpeg
|
|
||||||
|
|
||||||
# PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu)
|
|
||||||
0 string BM image/bmp
|
|
||||||
#>14 byte 12 (OS/2 1.x format)
|
|
||||||
#>14 byte 64 (OS/2 2.x format)
|
|
||||||
#>14 byte 40 (Windows 3.x format)
|
|
||||||
#0 string IC icon
|
|
||||||
#0 string PI pointer
|
|
||||||
#0 string CI color icon
|
|
||||||
#0 string CP color pointer
|
|
||||||
#0 string BA bitmap array
|
|
||||||
|
|
||||||
0 string \x89PNG image/png
|
|
||||||
0 string FWS application/x-shockwave-flash
|
|
||||||
0 string CWS application/x-shockwave-flash
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# lisp: file(1) magic for lisp programs
|
|
||||||
#
|
|
||||||
# various lisp types, from Daniel Quinlan (quinlan@yggdrasil.com)
|
|
||||||
0 string ;; text/plain 8bit
|
|
||||||
# Emacs 18 - this is always correct, but not very magical.
|
|
||||||
0 string \012( application/x-elc
|
|
||||||
# Emacs 19
|
|
||||||
0 string ;ELC\023\000\000\000 application/x-elc
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# mail.news: file(1) magic for mail and news
|
|
||||||
#
|
|
||||||
# There are tests to ascmagic.c to cope with mail and news.
|
|
||||||
0 string Relay-Version: message/rfc822 7bit
|
|
||||||
0 string #!\ rnews message/rfc822 7bit
|
|
||||||
0 string N#!\ rnews message/rfc822 7bit
|
|
||||||
0 string Forward\ to message/rfc822 7bit
|
|
||||||
0 string Pipe\ to message/rfc822 7bit
|
|
||||||
0 string Return-Path: message/rfc822 7bit
|
|
||||||
0 string Path: message/news 8bit
|
|
||||||
0 string Xref: message/news 8bit
|
|
||||||
0 string From: message/rfc822 7bit
|
|
||||||
0 string Article message/news 8bit
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# msword: file(1) magic for MS Word files
|
|
||||||
#
|
|
||||||
# Contributor claims:
|
|
||||||
# Reversed-engineered MS Word magic numbers
|
|
||||||
#
|
|
||||||
|
|
||||||
0 string \376\067\0\043 application/msword
|
|
||||||
0 string \333\245-\0\0\0 application/msword
|
|
||||||
|
|
||||||
# disable this one because it applies also to other
|
|
||||||
# Office/OLE documents for which msword is not correct. See PR#2608.
|
|
||||||
#0 string \320\317\021\340\241\261 application/msword
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# printer: file(1) magic for printer-formatted files
|
|
||||||
#
|
|
||||||
|
|
||||||
# PostScript
|
|
||||||
0 string %! application/postscript
|
|
||||||
0 string \004%! application/postscript
|
|
||||||
|
|
||||||
# Acrobat
|
|
||||||
# (due to clamen@cs.cmu.edu)
|
|
||||||
0 string %PDF- application/pdf
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# sc: file(1) magic for "sc" spreadsheet
|
|
||||||
#
|
|
||||||
38 string Spreadsheet application/x-sc
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# tex: file(1) magic for TeX files
|
|
||||||
#
|
|
||||||
# XXX - needs byte-endian stuff (big-endian and little-endian DVI?)
|
|
||||||
#
|
|
||||||
# From <conklin@talisman.kaleida.com>
|
|
||||||
|
|
||||||
# Although we may know the offset of certain text fields in TeX DVI
|
|
||||||
# and font files, we can't use them reliably because they are not
|
|
||||||
# zero terminated. [but we do anyway, christos]
|
|
||||||
0 string \367\002 application/x-dvi
|
|
||||||
#0 string \367\203 TeX generic font data
|
|
||||||
#0 string \367\131 TeX packed font data
|
|
||||||
#0 string \367\312 TeX virtual font data
|
|
||||||
#0 string This\ is\ TeX, TeX transcript text
|
|
||||||
#0 string This\ is\ METAFONT, METAFONT transcript text
|
|
||||||
|
|
||||||
# There is no way to detect TeX Font Metric (*.tfm) files without
|
|
||||||
# breaking them apart and reading the data. The following patterns
|
|
||||||
# match most *.tfm files generated by METAFONT or afm2tfm.
|
|
||||||
#2 string \000\021 TeX font metric data
|
|
||||||
#2 string \000\022 TeX font metric data
|
|
||||||
#>34 string >\0 (%s)
|
|
||||||
|
|
||||||
# Texinfo and GNU Info, from Daniel Quinlan (quinlan@yggdrasil.com)
|
|
||||||
#0 string \\input\ texinfo Texinfo source text
|
|
||||||
#0 string This\ is\ Info\ file GNU Info text
|
|
||||||
|
|
||||||
# correct TeX magic for Linux (and maybe more)
|
|
||||||
# from Peter Tobias (tobias@server.et-inf.fho-emden.de)
|
|
||||||
#
|
|
||||||
0 leshort 0x02f7 application/x-dvi
|
|
||||||
|
|
||||||
# RTF - Rich Text Format
|
|
||||||
0 string {\\rtf application/rtf
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# animation: file(1) magic for animation/movie formats
|
|
||||||
#
|
|
||||||
# animation formats, originally from vax@ccwf.cc.utexas.edu (VaX#n8)
|
|
||||||
# MPEG file
|
|
||||||
0 string \000\000\001\263 video/mpeg
|
|
||||||
#
|
|
||||||
# The contributor claims:
|
|
||||||
# I couldn't find a real magic number for these, however, this
|
|
||||||
# -appears- to work. Note that it might catch other files, too,
|
|
||||||
# so BE CAREFUL!
|
|
||||||
#
|
|
||||||
# Note that title and author appear in the two 20-byte chunks
|
|
||||||
# at decimal offsets 2 and 22, respectively, but they are XOR'ed with
|
|
||||||
# 255 (hex FF)! DL format SUCKS BIG ROCKS.
|
|
||||||
#
|
|
||||||
# DL file version 1 , medium format (160x100, 4 images/screen)
|
|
||||||
0 byte 1 video/unknown
|
|
||||||
0 byte 2 video/unknown
|
|
||||||
# Quicktime video, from Linus Walleij <triad@df.lth.se>
|
|
||||||
# from Apple quicktime file format documentation.
|
|
||||||
4 string moov video/quicktime
|
|
||||||
4 string mdat video/quicktime
|
|
||||||
|
|
@ -1,156 +0,0 @@
|
|||||||
# This is a modification of the default Apache 2.4 configuration file
|
|
||||||
# for Gentoo Linux.
|
|
||||||
#
|
|
||||||
# Support:
|
|
||||||
# http://www.gentoo.org/main/en/lists.xml [mailing lists]
|
|
||||||
# http://forums.gentoo.org/ [web forums]
|
|
||||||
# irc://irc.freenode.net#gentoo-apache [irc chat]
|
|
||||||
#
|
|
||||||
# Bug Reports:
|
|
||||||
# http://bugs.gentoo.org [gentoo related bugs]
|
|
||||||
# http://httpd.apache.org/bug_report.html [apache httpd related bugs]
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# This is the main Apache HTTP server configuration file. It contains the
|
|
||||||
# configuration directives that give the server its instructions.
|
|
||||||
# See <URL:http://httpd.apache.org/docs/2.4> for detailed information.
|
|
||||||
# In particular, see
|
|
||||||
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
|
|
||||||
# for a discussion of each configuration directive.
|
|
||||||
#
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
|
||||||
# consult the online docs. You have been warned.
|
|
||||||
#
|
|
||||||
# Configuration and logfile names: If the filenames you specify for many
|
|
||||||
# of the server's control files begin with "/" (or "drive:/" for Win32), the
|
|
||||||
# server will use that explicit path. If the filenames do *not* begin
|
|
||||||
# with "/", the value of ServerRoot is prepended -- so "var/log/apache2/foo_log"
|
|
||||||
# with ServerRoot set to "/usr" will be interpreted by the
|
|
||||||
# server as "/usr/var/log/apache2/foo.log".
|
|
||||||
|
|
||||||
# ServerRoot: The top of the directory tree under which the server's
|
|
||||||
# configuration, error, and log files are kept.
|
|
||||||
#
|
|
||||||
# Do not add a slash at the end of the directory path. If you point
|
|
||||||
# ServerRoot at a non-local disk, be sure to point the LockFile directive
|
|
||||||
# at a local disk. If you wish to share the same ServerRoot for multiple
|
|
||||||
# httpd daemons, you will need to change at least LockFile and PidFile.
|
|
||||||
# Comment: The LockFile directive has been replaced by the Mutex directive
|
|
||||||
ServerRoot "/usr/lib64/apache2"
|
|
||||||
|
|
||||||
# Dynamic Shared Object (DSO) Support
|
|
||||||
#
|
|
||||||
# To be able to use the functionality of a module which was built as a DSO you
|
|
||||||
# have to place corresponding `LoadModule' lines at this location so the
|
|
||||||
# directives contained in it are actually available _before_ they are used.
|
|
||||||
# Statically compiled modules (those listed by `httpd -l') do not need
|
|
||||||
# to be loaded here.
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
# LoadModule foo_module modules/mod_foo.so
|
|
||||||
#
|
|
||||||
# GENTOO: Automatically defined based on APACHE2_MODULES USE_EXPAND variable.
|
|
||||||
# Do not change manually, it will be overwritten on upgrade.
|
|
||||||
#
|
|
||||||
# The following modules are considered as the default configuration.
|
|
||||||
# If you wish to disable one of them, you may have to alter other
|
|
||||||
# configuration directives.
|
|
||||||
#
|
|
||||||
# Change these at your own risk!
|
|
||||||
|
|
||||||
LoadModule actions_module modules/mod_actions.so
|
|
||||||
LoadModule alias_module modules/mod_alias.so
|
|
||||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
|
||||||
LoadModule authn_anon_module modules/mod_authn_anon.so
|
|
||||||
LoadModule authn_core_module modules/mod_authn_core.so
|
|
||||||
LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
|
||||||
LoadModule authz_core_module modules/mod_authz_core.so
|
|
||||||
LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
|
||||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
|
||||||
LoadModule authz_owner_module modules/mod_authz_owner.so
|
|
||||||
LoadModule authz_user_module modules/mod_authz_user.so
|
|
||||||
LoadModule autoindex_module modules/mod_autoindex.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule cache_module modules/mod_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule cgi_module modules/mod_cgi.so
|
|
||||||
LoadModule cgid_module modules/mod_cgid.so
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_module modules/mod_dav.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_fs_module modules/mod_dav_fs.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_lock_module modules/mod_dav_lock.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule deflate_module modules/mod_deflate.so
|
|
||||||
LoadModule dir_module modules/mod_dir.so
|
|
||||||
LoadModule env_module modules/mod_env.so
|
|
||||||
LoadModule expires_module modules/mod_expires.so
|
|
||||||
LoadModule ext_filter_module modules/mod_ext_filter.so
|
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule file_cache_module modules/mod_file_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule filter_module modules/mod_filter.so
|
|
||||||
LoadModule headers_module modules/mod_headers.so
|
|
||||||
LoadModule include_module modules/mod_include.so
|
|
||||||
<IfDefine INFO>
|
|
||||||
LoadModule info_module modules/mod_info.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule log_config_module modules/mod_log_config.so
|
|
||||||
LoadModule logio_module modules/mod_logio.so
|
|
||||||
LoadModule mime_module modules/mod_mime.so
|
|
||||||
LoadModule mime_magic_module modules/mod_mime_magic.so
|
|
||||||
LoadModule negotiation_module modules/mod_negotiation.so
|
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
|
||||||
<IfDefine SSL>
|
|
||||||
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule speling_module modules/mod_speling.so
|
|
||||||
<IfDefine SSL>
|
|
||||||
LoadModule ssl_module modules/mod_ssl.so
|
|
||||||
</IfDefine>
|
|
||||||
<IfDefine STATUS>
|
|
||||||
LoadModule status_module modules/mod_status.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule unique_id_module modules/mod_unique_id.so
|
|
||||||
LoadModule unixd_module modules/mod_unixd.so
|
|
||||||
<IfDefine USERDIR>
|
|
||||||
LoadModule userdir_module modules/mod_userdir.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule usertrack_module modules/mod_usertrack.so
|
|
||||||
LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
|
||||||
|
|
||||||
# If you wish httpd to run as a different user or group, you must run
|
|
||||||
# httpd as root initially and it will switch.
|
|
||||||
#
|
|
||||||
# User/Group: The name (or #number) of the user/group to run httpd as.
|
|
||||||
# It is usually good practice to create a dedicated user and group for
|
|
||||||
# running httpd, as with most system services.
|
|
||||||
User apache
|
|
||||||
Group apache
|
|
||||||
|
|
||||||
# Supplemental configuration
|
|
||||||
#
|
|
||||||
# Most of the configuration files in the /etc/apache2/modules.d/ directory can
|
|
||||||
# be turned on using APACHE2_OPTS in /etc/conf.d/apache2 to add extra features
|
|
||||||
# or to modify the default configuration of the server.
|
|
||||||
#
|
|
||||||
# To know which flag to add to APACHE2_OPTS, look at the first line of the
|
|
||||||
# the file, which will usually be an <IfDefine OPTION> where OPTION is the
|
|
||||||
# flag to use.
|
|
||||||
Include /etc/apache2/modules.d/*.conf
|
|
||||||
|
|
||||||
# Virtual-host support
|
|
||||||
#
|
|
||||||
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
|
|
||||||
# include a default vhost (enabled by adding -D DEFAULT_VHOST to
|
|
||||||
# APACHE2_OPTS in /etc/conf.d/apache2).
|
|
||||||
Include /etc/apache2/vhosts.d/*.conf
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,4 +1,4 @@
|
|||||||
# This is a modification of the default Apache 2.2 configuration file
|
# This is a modification of the default Apache 2.4 configuration file
|
||||||
# for Gentoo Linux.
|
# for Gentoo Linux.
|
||||||
#
|
#
|
||||||
# Support:
|
# Support:
|
||||||
@ -13,9 +13,9 @@
|
|||||||
#
|
#
|
||||||
# This is the main Apache HTTP server configuration file. It contains the
|
# This is the main Apache HTTP server configuration file. It contains the
|
||||||
# configuration directives that give the server its instructions.
|
# configuration directives that give the server its instructions.
|
||||||
# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
|
# See <URL:http://httpd.apache.org/docs/2.4> for detailed information.
|
||||||
# In particular, see
|
# In particular, see
|
||||||
# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
|
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
|
||||||
# for a discussion of each configuration directive.
|
# for a discussion of each configuration directive.
|
||||||
#
|
#
|
||||||
# Do NOT simply read the instructions in here without understanding
|
# Do NOT simply read the instructions in here without understanding
|
||||||
@ -36,6 +36,7 @@
|
|||||||
# ServerRoot at a non-local disk, be sure to point the LockFile directive
|
# ServerRoot at a non-local disk, be sure to point the LockFile directive
|
||||||
# at a local disk. If you wish to share the same ServerRoot for multiple
|
# at a local disk. If you wish to share the same ServerRoot for multiple
|
||||||
# httpd daemons, you will need to change at least LockFile and PidFile.
|
# httpd daemons, you will need to change at least LockFile and PidFile.
|
||||||
|
# Comment: The LockFile directive has been replaced by the Mutex directive
|
||||||
ServerRoot "/usr/lib64/apache2"
|
ServerRoot "/usr/lib64/apache2"
|
||||||
|
|
||||||
# Dynamic Shared Object (DSO) Support
|
# Dynamic Shared Object (DSO) Support
|
||||||
@ -61,13 +62,12 @@ ServerRoot "/usr/lib64/apache2"
|
|||||||
LoadModule actions_module modules/mod_actions.so
|
LoadModule actions_module modules/mod_actions.so
|
||||||
LoadModule alias_module modules/mod_alias.so
|
LoadModule alias_module modules/mod_alias.so
|
||||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
LoadModule auth_basic_module modules/mod_auth_basic.so
|
||||||
LoadModule authn_alias_module modules/mod_authn_alias.so
|
|
||||||
LoadModule authn_anon_module modules/mod_authn_anon.so
|
LoadModule authn_anon_module modules/mod_authn_anon.so
|
||||||
|
LoadModule authn_core_module modules/mod_authn_core.so
|
||||||
LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
||||||
LoadModule authn_default_module modules/mod_authn_default.so
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
LoadModule authn_file_module modules/mod_authn_file.so
|
||||||
|
LoadModule authz_core_module modules/mod_authz_core.so
|
||||||
LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
||||||
LoadModule authz_default_module modules/mod_authz_default.so
|
|
||||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
LoadModule authz_host_module modules/mod_authz_host.so
|
||||||
LoadModule authz_owner_module modules/mod_authz_owner.so
|
LoadModule authz_owner_module modules/mod_authz_owner.so
|
||||||
@ -89,9 +89,6 @@ LoadModule dav_lock_module modules/mod_dav_lock.so
|
|||||||
</IfDefine>
|
</IfDefine>
|
||||||
LoadModule deflate_module modules/mod_deflate.so
|
LoadModule deflate_module modules/mod_deflate.so
|
||||||
LoadModule dir_module modules/mod_dir.so
|
LoadModule dir_module modules/mod_dir.so
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule disk_cache_module modules/mod_disk_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule env_module modules/mod_env.so
|
LoadModule env_module modules/mod_env.so
|
||||||
LoadModule expires_module modules/mod_expires.so
|
LoadModule expires_module modules/mod_expires.so
|
||||||
LoadModule ext_filter_module modules/mod_ext_filter.so
|
LoadModule ext_filter_module modules/mod_ext_filter.so
|
||||||
@ -106,14 +103,14 @@ LoadModule info_module modules/mod_info.so
|
|||||||
</IfDefine>
|
</IfDefine>
|
||||||
LoadModule log_config_module modules/mod_log_config.so
|
LoadModule log_config_module modules/mod_log_config.so
|
||||||
LoadModule logio_module modules/mod_logio.so
|
LoadModule logio_module modules/mod_logio.so
|
||||||
<IfDefine CACHE>
|
|
||||||
LoadModule mem_cache_module modules/mod_mem_cache.so
|
|
||||||
</IfDefine>
|
|
||||||
LoadModule mime_module modules/mod_mime.so
|
LoadModule mime_module modules/mod_mime.so
|
||||||
LoadModule mime_magic_module modules/mod_mime_magic.so
|
LoadModule mime_magic_module modules/mod_mime_magic.so
|
||||||
LoadModule negotiation_module modules/mod_negotiation.so
|
LoadModule negotiation_module modules/mod_negotiation.so
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
LoadModule rewrite_module modules/mod_rewrite.so
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
LoadModule setenvif_module modules/mod_setenvif.so
|
||||||
|
<IfDefine SSL>
|
||||||
|
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
|
||||||
|
</IfDefine>
|
||||||
LoadModule speling_module modules/mod_speling.so
|
LoadModule speling_module modules/mod_speling.so
|
||||||
<IfDefine SSL>
|
<IfDefine SSL>
|
||||||
LoadModule ssl_module modules/mod_ssl.so
|
LoadModule ssl_module modules/mod_ssl.so
|
||||||
@ -122,6 +119,7 @@ LoadModule ssl_module modules/mod_ssl.so
|
|||||||
LoadModule status_module modules/mod_status.so
|
LoadModule status_module modules/mod_status.so
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
LoadModule unique_id_module modules/mod_unique_id.so
|
LoadModule unique_id_module modules/mod_unique_id.so
|
||||||
|
LoadModule unixd_module modules/mod_unixd.so
|
||||||
<IfDefine USERDIR>
|
<IfDefine USERDIR>
|
||||||
LoadModule userdir_module modules/mod_userdir.so
|
LoadModule userdir_module modules/mod_userdir.so
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
@ -137,7 +135,6 @@ LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
|||||||
User apache
|
User apache
|
||||||
Group apache
|
Group apache
|
||||||
|
|
||||||
ServerName localhost
|
|
||||||
# Supplemental configuration
|
# Supplemental configuration
|
||||||
#
|
#
|
||||||
# Most of the configuration files in the /etc/apache2/modules.d/ directory can
|
# Most of the configuration files in the /etc/apache2/modules.d/ directory can
|
||||||
@ -149,9 +146,6 @@ ServerName localhost
|
|||||||
# flag to use.
|
# flag to use.
|
||||||
Include /etc/apache2/modules.d/*.conf
|
Include /etc/apache2/modules.d/*.conf
|
||||||
|
|
||||||
Include /etc/apache2/custom/*.conf
|
|
||||||
|
|
||||||
|
|
||||||
# Virtual-host support
|
# Virtual-host support
|
||||||
#
|
#
|
||||||
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
|
# Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
|
||||||
@ -159,5 +153,4 @@ Include /etc/apache2/custom/*.conf
|
|||||||
# APACHE2_OPTS in /etc/conf.d/apache2).
|
# APACHE2_OPTS in /etc/conf.d/apache2).
|
||||||
Include /etc/apache2/vhosts.d/*.conf
|
Include /etc/apache2/vhosts.d/*.conf
|
||||||
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
# vim: ts=4 filetype=apache
|
||||||
|
@ -262,6 +262,9 @@
|
|||||||
#0 string CP color pointer
|
#0 string CP color pointer
|
||||||
#0 string BA bitmap array
|
#0 string BA bitmap array
|
||||||
|
|
||||||
|
0 string \x89PNG image/png
|
||||||
|
0 string FWS application/x-shockwave-flash
|
||||||
|
0 string CWS application/x-shockwave-flash
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# lisp: file(1) magic for lisp programs
|
# lisp: file(1) magic for lisp programs
|
||||||
|
@ -1,131 +0,0 @@
|
|||||||
# 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 <VirtualHost>
|
|
||||||
# container, error messages relating to that virtual host will be
|
|
||||||
# logged here. If you *do* define an error logfile for a <VirtualHost>
|
|
||||||
# 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.
|
|
||||||
<Directory />
|
|
||||||
Options FollowSymLinks
|
|
||||||
AllowOverride None
|
|
||||||
Require all denied
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
<IfModule dir_module>
|
|
||||||
DirectoryIndex index.html index.html.var
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# The following lines prevent .htaccess and .htpasswd files from being
|
|
||||||
# viewed by Web clients.
|
|
||||||
<FilesMatch "^\.ht">
|
|
||||||
Require all denied
|
|
||||||
</FilesMatch>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,57 +0,0 @@
|
|||||||
# The configuration below implements multi-language error documents through
|
|
||||||
# content-negotiation.
|
|
||||||
|
|
||||||
# Customizable error responses come in three flavors:
|
|
||||||
# 1) plain text 2) local redirects 3) external redirects
|
|
||||||
# Some examples:
|
|
||||||
#ErrorDocument 500 "The server made a boo boo."
|
|
||||||
#ErrorDocument 404 /missing.html
|
|
||||||
#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
|
|
||||||
#ErrorDocument 402 http://www.example.com/subscription_info.html
|
|
||||||
|
|
||||||
# Required modules: mod_alias, mod_include, mod_negotiation
|
|
||||||
# We use Alias to redirect any /error/HTTP_<error>.html.var response to
|
|
||||||
# our collection of by-error message multi-language collections. We use
|
|
||||||
# includes to substitute the appropriate text.
|
|
||||||
# You can modify the messages' appearance without changing any of the
|
|
||||||
# default HTTP_<error>.html.var files by adding the line:
|
|
||||||
# Alias /error/include/ "/your/include/path/"
|
|
||||||
# which allows you to create your own set of files by starting with the
|
|
||||||
# /var/www/localhost/error/include/ files and copying them to /your/include/path/,
|
|
||||||
# even on a per-VirtualHost basis. The default include files will display
|
|
||||||
# your Apache version number and your ServerAdmin email address regardless
|
|
||||||
# of the setting of ServerSignature.
|
|
||||||
|
|
||||||
<IfDefine ERRORDOCS>
|
|
||||||
Alias /error/ "/usr/share/apache2/error/"
|
|
||||||
|
|
||||||
<Directory "/usr/share/apache2/error">
|
|
||||||
AllowOverride None
|
|
||||||
Options IncludesNoExec
|
|
||||||
AddOutputFilter Includes html
|
|
||||||
AddHandler type-map var
|
|
||||||
Require all granted
|
|
||||||
LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
|
|
||||||
ForceLanguagePriority Prefer Fallback
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
|
|
||||||
ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
|
|
||||||
ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
|
|
||||||
ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
|
|
||||||
ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
|
|
||||||
ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
|
|
||||||
ErrorDocument 410 /error/HTTP_GONE.html.var
|
|
||||||
ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
|
|
||||||
ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
|
|
||||||
ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
|
|
||||||
ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
|
|
||||||
ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
|
|
||||||
ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
|
|
||||||
ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
|
|
||||||
ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
|
|
||||||
ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
|
|
||||||
ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,86 +0,0 @@
|
|||||||
<IfModule autoindex_module>
|
|
||||||
<IfDefine !NO_AUTOINDEX_CONF>
|
|
||||||
|
|
||||||
<IfModule alias_module>
|
|
||||||
# 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/"
|
|
||||||
|
|
||||||
<Directory "/usr/share/apache2/icons">
|
|
||||||
Options Indexes MultiViews
|
|
||||||
AllowOverride None
|
|
||||||
Order allow,deny
|
|
||||||
Allow from all
|
|
||||||
</Directory>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# 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
|
|
||||||
</IfDefine>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,10 +0,0 @@
|
|||||||
<IfDefine INFO>
|
|
||||||
# Allow remote server configuration reports, with the URL of
|
|
||||||
# http://servername/server-info
|
|
||||||
<Location /server-info>
|
|
||||||
SetHandler server-info
|
|
||||||
Require local
|
|
||||||
</Location>
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,46 +0,0 @@
|
|||||||
<IfModule mime_module>
|
|
||||||
# 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
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfModule mime_magic_module>
|
|
||||||
# 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
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,15 +0,0 @@
|
|||||||
<IfDefine STATUS>
|
|
||||||
# Allow server status reports generated by mod_status,
|
|
||||||
# with the URL of http://servername/server-status
|
|
||||||
<Location /server-status>
|
|
||||||
SetHandler server-status
|
|
||||||
Require local
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# ExtendedStatus controls whether Apache will generate "full" status
|
|
||||||
# information (ExtendedStatus On) or just basic information (ExtendedStatus
|
|
||||||
# Off) when the "server-status" handler is called.
|
|
||||||
ExtendedStatus On
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,32 +0,0 @@
|
|||||||
# Settings for user home directories
|
|
||||||
<IfDefine USERDIR>
|
|
||||||
# UserDir: The name of the directory that is appended onto a user's home
|
|
||||||
# directory if a ~user request is received. Note that you must also set
|
|
||||||
# the default access control for these directories, as in the example below.
|
|
||||||
UserDir public_html
|
|
||||||
|
|
||||||
# Control access to UserDir directories. The following is an example
|
|
||||||
# for a site where these directories are restricted to read-only.
|
|
||||||
<Directory /home/*/public_html>
|
|
||||||
AllowOverride FileInfo AuthConfig Limit Indexes
|
|
||||||
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
|
|
||||||
<Limit GET POST OPTIONS>
|
|
||||||
Require all granted
|
|
||||||
</Limit>
|
|
||||||
<LimitExcept GET POST OPTIONS>
|
|
||||||
Require all denied
|
|
||||||
</LimitExcept>
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
# Suexec isn't really required to run cgi-scripts, but it's a really good
|
|
||||||
# idea if you have multiple users serving websites...
|
|
||||||
<IfDefine SUEXEC>
|
|
||||||
<Directory /home/*/public_html/cgi-bin>
|
|
||||||
Options ExecCGI
|
|
||||||
SetHandler cgi-script
|
|
||||||
</Directory>
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,99 +0,0 @@
|
|||||||
# Server-Pool Management (MPM specific)
|
|
||||||
|
|
||||||
# PidFile: The file in which the server should record its process
|
|
||||||
# identification number when it starts.
|
|
||||||
#
|
|
||||||
# DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING
|
|
||||||
PidFile /run/apache2.pid
|
|
||||||
|
|
||||||
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
|
|
||||||
# Mutex file:/run/apache_mpm_mutex
|
|
||||||
|
|
||||||
# Only one of the below sections will be relevant on your
|
|
||||||
# installed httpd. Use "/usr/sbin/apache2 -l" to find out the
|
|
||||||
# active mpm.
|
|
||||||
|
|
||||||
# common MPM configuration
|
|
||||||
# These configuration directives apply to all MPMs
|
|
||||||
#
|
|
||||||
# StartServers: Number of child server processes created at startup
|
|
||||||
# MaxRequestWorkers: Maximum number of child processes to serve requests
|
|
||||||
# MaxConnectionsPerChild: Limit on the number of connections that an individual
|
|
||||||
# child server will handle during its life
|
|
||||||
|
|
||||||
|
|
||||||
# prefork MPM
|
|
||||||
# This is the default MPM if USE=-threads
|
|
||||||
#
|
|
||||||
# MinSpareServers: Minimum number of idle child server processes
|
|
||||||
# MaxSpareServers: Maximum number of idle child server processes
|
|
||||||
<IfModule mpm_prefork_module>
|
|
||||||
StartServers 5
|
|
||||||
MinSpareServers 5
|
|
||||||
MaxSpareServers 10
|
|
||||||
MaxRequestWorkers 150
|
|
||||||
MaxConnectionsPerChild 10000
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# worker MPM
|
|
||||||
# This is the default MPM if USE=threads
|
|
||||||
#
|
|
||||||
# MinSpareThreads: Minimum number of idle threads available to handle request spikes
|
|
||||||
# MaxSpareThreads: Maximum number of idle threads
|
|
||||||
# ThreadsPerChild: Number of threads created by each child process
|
|
||||||
<IfModule mpm_worker_module>
|
|
||||||
StartServers 2
|
|
||||||
MinSpareThreads 25
|
|
||||||
MaxSpareThreads 75
|
|
||||||
ThreadsPerChild 25
|
|
||||||
MaxRequestWorkers 150
|
|
||||||
MaxConnectionsPerChild 10000
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# event MPM
|
|
||||||
#
|
|
||||||
# MinSpareThreads: Minimum number of idle threads available to handle request spikes
|
|
||||||
# MaxSpareThreads: Maximum number of idle threads
|
|
||||||
# ThreadsPerChild: Number of threads created by each child process
|
|
||||||
<IfModule mpm_event_module>
|
|
||||||
StartServers 2
|
|
||||||
MinSpareThreads 25
|
|
||||||
MaxSpareThreads 75
|
|
||||||
ThreadsPerChild 25
|
|
||||||
MaxRequestWorkers 150
|
|
||||||
MaxConnectionsPerChild 10000
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# peruser MPM
|
|
||||||
#
|
|
||||||
# MinSpareProcessors: Minimum number of idle child server processes
|
|
||||||
# MinProcessors: Minimum number of processors per virtual host
|
|
||||||
# MaxProcessors: Maximum number of processors per virtual host
|
|
||||||
# ExpireTimeout: Maximum idle time before a child is killed, 0 to disable
|
|
||||||
# Multiplexer: Specify a Multiplexer child configuration.
|
|
||||||
# Processor: Specify a user and group for a specific child process
|
|
||||||
<IfModule mpm_peruser_module>
|
|
||||||
MinSpareProcessors 2
|
|
||||||
MinProcessors 2
|
|
||||||
MaxProcessors 10
|
|
||||||
MaxRequestWorkers 150
|
|
||||||
MaxConnectionsPerChild 1000
|
|
||||||
ExpireTimeout 1800
|
|
||||||
|
|
||||||
Multiplexer nobody nobody
|
|
||||||
Processor apache apache
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# itk MPM
|
|
||||||
#
|
|
||||||
# MinSpareServers: Minimum number of idle child server processes
|
|
||||||
# MaxSpareServers: Maximum number of idle child server processes
|
|
||||||
<IfModule mpm_itk_module>
|
|
||||||
StartServers 5
|
|
||||||
MinSpareServers 5
|
|
||||||
MaxSpareServers 10
|
|
||||||
MaxRequestWorkers 150
|
|
||||||
MaxConnectionsPerChild 10000
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,67 +0,0 @@
|
|||||||
# Note: The following must must be present to support
|
|
||||||
# starting without SSL on platforms with no /dev/random equivalent
|
|
||||||
# but a statically compiled-in mod_ssl.
|
|
||||||
<IfModule ssl_module>
|
|
||||||
SSLRandomSeed startup builtin
|
|
||||||
SSLRandomSeed connect builtin
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfDefine SSL>
|
|
||||||
# This is the Apache server configuration file providing SSL support.
|
|
||||||
# It contains the configuration directives to instruct the server how to
|
|
||||||
# serve pages over an https connection. For detailing information about these
|
|
||||||
# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
|
|
||||||
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
|
||||||
# consult the online docs. You have been warned.
|
|
||||||
|
|
||||||
## Pseudo Random Number Generator (PRNG):
|
|
||||||
# Configure one or more sources to seed the PRNG of the SSL library.
|
|
||||||
# The seed data should be of good random quality.
|
|
||||||
# WARNING! On some platforms /dev/random blocks if not enough entropy
|
|
||||||
# is available. This means you then cannot use the /dev/random device
|
|
||||||
# because it would lead to very long connection times (as long as
|
|
||||||
# it requires to make more entropy available). But usually those
|
|
||||||
# platforms additionally provide a /dev/urandom device which doesn't
|
|
||||||
# block. So, if available, use this one instead. Read the mod_ssl User
|
|
||||||
# Manual for more details.
|
|
||||||
#SSLRandomSeed startup file:/dev/random 512
|
|
||||||
#SSLRandomSeed startup file:/dev/urandom 512
|
|
||||||
#SSLRandomSeed connect file:/dev/random 512
|
|
||||||
#SSLRandomSeed connect file:/dev/urandom 512
|
|
||||||
|
|
||||||
## SSL Global Context:
|
|
||||||
# All SSL configuration in this context applies both to the main server and
|
|
||||||
# all SSL-enabled virtual hosts.
|
|
||||||
|
|
||||||
# Some MIME-types for downloading Certificates and CRLs
|
|
||||||
<IfModule mime_module>
|
|
||||||
AddType application/x-x509-ca-cert .crt
|
|
||||||
AddType application/x-pkcs7-crl .crl
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
## Pass Phrase Dialog:
|
|
||||||
# Configure the pass phrase gathering process. The filtering dialog program
|
|
||||||
# (`builtin' is a internal terminal dialog) has to provide the pass phrase on
|
|
||||||
# stdout.
|
|
||||||
SSLPassPhraseDialog builtin
|
|
||||||
|
|
||||||
## Inter-Process Session Cache:
|
|
||||||
# Configure the SSL Session Cache: First the mechanism to use and second the
|
|
||||||
# expiring timeout (in seconds).
|
|
||||||
#SSLSessionCache dbm:/var/run/ssl_scache
|
|
||||||
SSLSessionCache shmcb:/var/run/ssl_scache(512000)
|
|
||||||
SSLSessionCacheTimeout 300
|
|
||||||
|
|
||||||
## Semaphore:
|
|
||||||
# Configure the path to the mutual exclusion semaphore the SSL engine uses
|
|
||||||
# internally for inter-process synchronization.
|
|
||||||
SSLMutex file:/var/run/ssl_mutex
|
|
||||||
|
|
||||||
## SSL Compression:
|
|
||||||
# Known to be vulnerable thus disabled by default (bug #507324).
|
|
||||||
SSLCompression off
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,18 +0,0 @@
|
|||||||
# Examples below are taken from the online documentation
|
|
||||||
# Refer to:
|
|
||||||
# http://localhost/manual/mod/mod_ldap.html
|
|
||||||
# http://localhost/manual/mod/mod_auth_ldap.html
|
|
||||||
<IfDefine LDAP>
|
|
||||||
LDAPSharedCacheSize 200000
|
|
||||||
LDAPCacheEntries 1024
|
|
||||||
LDAPCacheTTL 600
|
|
||||||
LDAPOpCacheEntries 1024
|
|
||||||
LDAPOpCacheTTL 600
|
|
||||||
|
|
||||||
<Location /ldap-status>
|
|
||||||
SetHandler ldap-status
|
|
||||||
Require local
|
|
||||||
</Location>
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,18 +0,0 @@
|
|||||||
<IfDefine PHP5>
|
|
||||||
# Load the module first
|
|
||||||
<IfModule !mod_php5.c>
|
|
||||||
LoadModule php5_module modules/libphp5.so
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# Set it to handle the files
|
|
||||||
# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
|
|
||||||
# NOTE: Please read the related news item!
|
|
||||||
<FilesMatch "\.(php|php5|phtml)$">
|
|
||||||
SetHandler application/x-httpd-php
|
|
||||||
</FilesMatch>
|
|
||||||
<FilesMatch "\.phps$">
|
|
||||||
SetHandler application/x-httpd-php-source
|
|
||||||
</FilesMatch>
|
|
||||||
|
|
||||||
DirectoryIndex index.php index.phtml
|
|
||||||
</IfDefine>
|
|
@ -1,85 +0,0 @@
|
|||||||
<IfModule autoindex_module>
|
|
||||||
<IfDefine !NO_AUTOINDEX_CONF>
|
|
||||||
|
|
||||||
<IfModule alias_module>
|
|
||||||
# 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/"
|
|
||||||
|
|
||||||
<Directory "/usr/share/apache2/icons">
|
|
||||||
Options Indexes MultiViews
|
|
||||||
AllowOverride None
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# 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
|
|
||||||
</IfDefine>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -1,67 +0,0 @@
|
|||||||
# Note: The following must must be present to support
|
|
||||||
# starting without SSL on platforms with no /dev/random equivalent
|
|
||||||
# but a statically compiled-in mod_ssl.
|
|
||||||
<IfModule ssl_module>
|
|
||||||
SSLRandomSeed startup builtin
|
|
||||||
SSLRandomSeed connect builtin
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
<IfDefine SSL>
|
|
||||||
# This is the Apache server configuration file providing SSL support.
|
|
||||||
# It contains the configuration directives to instruct the server how to
|
|
||||||
# serve pages over an https connection. For detailing information about these
|
|
||||||
# directives see <URL:http://httpd.apache.org/docs/2.4/mod/mod_ssl.html>
|
|
||||||
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
|
||||||
# consult the online docs. You have been warned.
|
|
||||||
|
|
||||||
## Pseudo Random Number Generator (PRNG):
|
|
||||||
# Configure one or more sources to seed the PRNG of the SSL library.
|
|
||||||
# The seed data should be of good random quality.
|
|
||||||
# WARNING! On some platforms /dev/random blocks if not enough entropy
|
|
||||||
# is available. This means you then cannot use the /dev/random device
|
|
||||||
# because it would lead to very long connection times (as long as
|
|
||||||
# it requires to make more entropy available). But usually those
|
|
||||||
# platforms additionally provide a /dev/urandom device which doesn't
|
|
||||||
# block. So, if available, use this one instead. Read the mod_ssl User
|
|
||||||
# Manual for more details.
|
|
||||||
#SSLRandomSeed startup file:/dev/random 512
|
|
||||||
#SSLRandomSeed startup file:/dev/urandom 512
|
|
||||||
#SSLRandomSeed connect file:/dev/random 512
|
|
||||||
#SSLRandomSeed connect file:/dev/urandom 512
|
|
||||||
|
|
||||||
## SSL Global Context:
|
|
||||||
# All SSL configuration in this context applies both to the main server and
|
|
||||||
# all SSL-enabled virtual hosts.
|
|
||||||
|
|
||||||
# Some MIME-types for downloading Certificates and CRLs
|
|
||||||
<IfModule mime_module>
|
|
||||||
AddType application/x-x509-ca-cert .crt
|
|
||||||
AddType application/x-pkcs7-crl .crl
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
## Pass Phrase Dialog:
|
|
||||||
# Configure the pass phrase gathering process. The filtering dialog program
|
|
||||||
# (`builtin' is a internal terminal dialog) has to provide the pass phrase on
|
|
||||||
# stdout.
|
|
||||||
SSLPassPhraseDialog builtin
|
|
||||||
|
|
||||||
## Inter-Process Session Cache:
|
|
||||||
# Configure the SSL Session Cache: First the mechanism to use and second the
|
|
||||||
# expiring timeout (in seconds).
|
|
||||||
#SSLSessionCache dbm:/run/ssl_scache
|
|
||||||
SSLSessionCache shmcb:/run/ssl_scache(512000)
|
|
||||||
SSLSessionCacheTimeout 300
|
|
||||||
|
|
||||||
## Semaphore:
|
|
||||||
# Configure the path to the mutual exclusion semaphore the SSL engine uses
|
|
||||||
# internally for inter-process synchronization.
|
|
||||||
Mutex file:/run/apache_ssl_mutex ssl-cache
|
|
||||||
|
|
||||||
## SSL Compression:
|
|
||||||
# Known to be vulnerable thus disabled by default (bug #507324).
|
|
||||||
SSLCompression off
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -69,13 +69,13 @@ HostnameLookups Off
|
|||||||
# filesystems or if support for these functions is otherwise
|
# filesystems or if support for these functions is otherwise
|
||||||
# broken on your system.
|
# broken on your system.
|
||||||
EnableMMAP On
|
EnableMMAP On
|
||||||
EnableSendfile On
|
EnableSendfile Off
|
||||||
|
|
||||||
# FileEtag: Configures the file attributes that are used to create
|
# FileETag: Configures the file attributes that are used to create
|
||||||
# the ETag (entity tag) response header field when the document is
|
# the ETag (entity tag) response header field when the document is
|
||||||
# based on a static file. (The ETag value is used in cache management
|
# based on a static file. (The ETag value is used in cache management
|
||||||
# to save network bandwidth.)
|
# to save network bandwidth.)
|
||||||
FileEtag INode MTime Size
|
FileETag MTime Size
|
||||||
|
|
||||||
# ContentDigest: This directive enables the generation of Content-MD5
|
# ContentDigest: This directive enables the generation of Content-MD5
|
||||||
# headers as defined in RFC1864 respectively RFC2616.
|
# headers as defined in RFC1864 respectively RFC2616.
|
||||||
@ -107,8 +107,7 @@ LogLevel warn
|
|||||||
<Directory />
|
<Directory />
|
||||||
Options FollowSymLinks
|
Options FollowSymLinks
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Order deny,allow
|
Require all denied
|
||||||
Deny from all
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
# DirectoryIndex: sets the file that Apache will serve if a directory
|
# DirectoryIndex: sets the file that Apache will serve if a directory
|
||||||
@ -126,8 +125,7 @@ LogLevel warn
|
|||||||
# The following lines prevent .htaccess and .htpasswd files from being
|
# The following lines prevent .htaccess and .htpasswd files from being
|
||||||
# viewed by Web clients.
|
# viewed by Web clients.
|
||||||
<FilesMatch "^\.ht">
|
<FilesMatch "^\.ht">
|
||||||
Order allow,deny
|
Require all denied
|
||||||
Deny from all
|
|
||||||
</FilesMatch>
|
</FilesMatch>
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
# vim: ts=4 filetype=apache
|
||||||
|
@ -30,8 +30,7 @@ Alias /error/ "/usr/share/apache2/error/"
|
|||||||
Options IncludesNoExec
|
Options IncludesNoExec
|
||||||
AddOutputFilter Includes html
|
AddOutputFilter Includes html
|
||||||
AddHandler type-map var
|
AddHandler type-map var
|
||||||
Order allow,deny
|
Require all granted
|
||||||
Allow from all
|
|
||||||
LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
|
LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
|
||||||
ForceLanguagePriority Prefer Fallback
|
ForceLanguagePriority Prefer Fallback
|
||||||
</Directory>
|
</Directory>
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<IfModule autoindex_module>
|
<IfModule autoindex_module>
|
||||||
|
<IfDefine !NO_AUTOINDEX_CONF>
|
||||||
|
|
||||||
<IfModule alias_module>
|
<IfModule alias_module>
|
||||||
# We include the /icons/ alias for FancyIndexed directory listings. If
|
# We include the /icons/ alias for FancyIndexed directory listings. If
|
||||||
# you do not use FancyIndexing, you may comment this out.
|
# you do not use FancyIndexing, you may comment this out.
|
||||||
@ -7,8 +9,7 @@ Alias /icons/ "/usr/share/apache2/icons/"
|
|||||||
<Directory "/usr/share/apache2/icons">
|
<Directory "/usr/share/apache2/icons">
|
||||||
Options Indexes MultiViews
|
Options Indexes MultiViews
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Order allow,deny
|
Require all granted
|
||||||
Allow from all
|
|
||||||
</Directory>
|
</Directory>
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
@ -78,6 +79,7 @@ HeaderName HEADER.html
|
|||||||
# IndexIgnore is a set of filenames which directory indexing should ignore
|
# IndexIgnore is a set of filenames which directory indexing should ignore
|
||||||
# and not include in the listing. Shell-style wildcarding is permitted.
|
# and not include in the listing. Shell-style wildcarding is permitted.
|
||||||
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
|
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
|
||||||
|
</IfDefine>
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
# vim: ts=4 filetype=apache
|
||||||
|
@ -3,9 +3,7 @@
|
|||||||
# http://servername/server-info
|
# http://servername/server-info
|
||||||
<Location /server-info>
|
<Location /server-info>
|
||||||
SetHandler server-info
|
SetHandler server-info
|
||||||
Order deny,allow
|
Require local
|
||||||
Deny from all
|
|
||||||
Allow from 127.0.0.1
|
|
||||||
</Location>
|
</Location>
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
|
|
||||||
|
@ -1,12 +1,3 @@
|
|||||||
# DefaultType: the default MIME type the server will use for a document
|
|
||||||
# if it cannot otherwise determine one, such as from filename extensions.
|
|
||||||
# If your server contains mostly text or HTML documents, "text/plain" is
|
|
||||||
# a good value. If most of your content is binary, such as applications
|
|
||||||
# or images, you may want to use "application/octet-stream" instead to
|
|
||||||
# keep browsers from trying to display binary files as though they are
|
|
||||||
# text.
|
|
||||||
DefaultType text/plain
|
|
||||||
|
|
||||||
<IfModule mime_module>
|
<IfModule mime_module>
|
||||||
# TypesConfig points to the file containing the list of mappings from
|
# TypesConfig points to the file containing the list of mappings from
|
||||||
# filename extension to MIME-type.
|
# filename extension to MIME-type.
|
||||||
|
@ -3,9 +3,7 @@
|
|||||||
# with the URL of http://servername/server-status
|
# with the URL of http://servername/server-status
|
||||||
<Location /server-status>
|
<Location /server-status>
|
||||||
SetHandler server-status
|
SetHandler server-status
|
||||||
Order deny,allow
|
Require local
|
||||||
Deny from all
|
|
||||||
Allow from 127.0.0.1
|
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
# ExtendedStatus controls whether Apache will generate "full" status
|
# ExtendedStatus controls whether Apache will generate "full" status
|
||||||
|
@ -11,12 +11,10 @@ UserDir public_html
|
|||||||
AllowOverride FileInfo AuthConfig Limit Indexes
|
AllowOverride FileInfo AuthConfig Limit Indexes
|
||||||
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
|
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
|
||||||
<Limit GET POST OPTIONS>
|
<Limit GET POST OPTIONS>
|
||||||
Order allow,deny
|
Require all granted
|
||||||
Allow from all
|
|
||||||
</Limit>
|
</Limit>
|
||||||
<LimitExcept GET POST OPTIONS>
|
<LimitExcept GET POST OPTIONS>
|
||||||
Order deny,allow
|
Require all denied
|
||||||
Deny from all
|
|
||||||
</LimitExcept>
|
</LimitExcept>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
# identification number when it starts.
|
# identification number when it starts.
|
||||||
#
|
#
|
||||||
# DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING
|
# DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING
|
||||||
PidFile /var/run/apache2.pid
|
PidFile /run/apache2.pid
|
||||||
|
|
||||||
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
|
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
|
||||||
#LockFile /var/run/apache2.lock
|
# Mutex file:/run/apache_mpm_mutex
|
||||||
|
|
||||||
# Only one of the below sections will be relevant on your
|
# Only one of the below sections will be relevant on your
|
||||||
# installed httpd. Use "/usr/sbin/apache2 -l" to find out the
|
# installed httpd. Use "/usr/sbin/apache2 -l" to find out the
|
||||||
@ -17,9 +17,9 @@ PidFile /var/run/apache2.pid
|
|||||||
# These configuration directives apply to all MPMs
|
# These configuration directives apply to all MPMs
|
||||||
#
|
#
|
||||||
# StartServers: Number of child server processes created at startup
|
# StartServers: Number of child server processes created at startup
|
||||||
# MaxClients: Maximum number of child processes to serve requests
|
# MaxRequestWorkers: Maximum number of child processes to serve requests
|
||||||
# MaxRequestsPerChild: Limit on the number of requests that an individual child
|
# MaxConnectionsPerChild: Limit on the number of connections that an individual
|
||||||
# server will handle during its life
|
# child server will handle during its life
|
||||||
|
|
||||||
|
|
||||||
# prefork MPM
|
# prefork MPM
|
||||||
@ -31,8 +31,8 @@ PidFile /var/run/apache2.pid
|
|||||||
StartServers 5
|
StartServers 5
|
||||||
MinSpareServers 5
|
MinSpareServers 5
|
||||||
MaxSpareServers 10
|
MaxSpareServers 10
|
||||||
MaxClients 150
|
MaxRequestWorkers 150
|
||||||
MaxRequestsPerChild 10000
|
MaxConnectionsPerChild 10000
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# worker MPM
|
# worker MPM
|
||||||
@ -46,8 +46,8 @@ PidFile /var/run/apache2.pid
|
|||||||
MinSpareThreads 25
|
MinSpareThreads 25
|
||||||
MaxSpareThreads 75
|
MaxSpareThreads 75
|
||||||
ThreadsPerChild 25
|
ThreadsPerChild 25
|
||||||
MaxClients 150
|
MaxRequestWorkers 150
|
||||||
MaxRequestsPerChild 10000
|
MaxConnectionsPerChild 10000
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# event MPM
|
# event MPM
|
||||||
@ -60,8 +60,8 @@ PidFile /var/run/apache2.pid
|
|||||||
MinSpareThreads 25
|
MinSpareThreads 25
|
||||||
MaxSpareThreads 75
|
MaxSpareThreads 75
|
||||||
ThreadsPerChild 25
|
ThreadsPerChild 25
|
||||||
MaxClients 150
|
MaxRequestWorkers 150
|
||||||
MaxRequestsPerChild 10000
|
MaxConnectionsPerChild 10000
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# peruser MPM
|
# peruser MPM
|
||||||
@ -76,8 +76,8 @@ PidFile /var/run/apache2.pid
|
|||||||
MinSpareProcessors 2
|
MinSpareProcessors 2
|
||||||
MinProcessors 2
|
MinProcessors 2
|
||||||
MaxProcessors 10
|
MaxProcessors 10
|
||||||
MaxClients 150
|
MaxRequestWorkers 150
|
||||||
MaxRequestsPerChild 1000
|
MaxConnectionsPerChild 1000
|
||||||
ExpireTimeout 1800
|
ExpireTimeout 1800
|
||||||
|
|
||||||
Multiplexer nobody nobody
|
Multiplexer nobody nobody
|
||||||
@ -92,8 +92,8 @@ PidFile /var/run/apache2.pid
|
|||||||
StartServers 5
|
StartServers 5
|
||||||
MinSpareServers 5
|
MinSpareServers 5
|
||||||
MaxSpareServers 10
|
MaxSpareServers 10
|
||||||
MaxClients 150
|
MaxRequestWorkers 150
|
||||||
MaxRequestsPerChild 10000
|
MaxConnectionsPerChild 10000
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
# vim: ts=4 filetype=apache
|
||||||
|
@ -10,7 +10,7 @@ SSLRandomSeed connect builtin
|
|||||||
# This is the Apache server configuration file providing SSL support.
|
# This is the Apache server configuration file providing SSL support.
|
||||||
# It contains the configuration directives to instruct the server how to
|
# It contains the configuration directives to instruct the server how to
|
||||||
# serve pages over an https connection. For detailing information about these
|
# serve pages over an https connection. For detailing information about these
|
||||||
# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
|
# directives see <URL:http://httpd.apache.org/docs/2.4/mod/mod_ssl.html>
|
||||||
|
|
||||||
# Do NOT simply read the instructions in here without understanding
|
# Do NOT simply read the instructions in here without understanding
|
||||||
# what they do. They're here only as hints or reminders. If you are unsure
|
# what they do. They're here only as hints or reminders. If you are unsure
|
||||||
@ -50,14 +50,18 @@ SSLPassPhraseDialog builtin
|
|||||||
## Inter-Process Session Cache:
|
## Inter-Process Session Cache:
|
||||||
# Configure the SSL Session Cache: First the mechanism to use and second the
|
# Configure the SSL Session Cache: First the mechanism to use and second the
|
||||||
# expiring timeout (in seconds).
|
# expiring timeout (in seconds).
|
||||||
#SSLSessionCache dbm:/var/run/ssl_scache
|
#SSLSessionCache dbm:/run/ssl_scache
|
||||||
SSLSessionCache shmcb:/var/run/ssl_scache(512000)
|
SSLSessionCache shmcb:/run/ssl_scache(512000)
|
||||||
SSLSessionCacheTimeout 300
|
SSLSessionCacheTimeout 300
|
||||||
|
|
||||||
## Semaphore:
|
## Semaphore:
|
||||||
# Configure the path to the mutual exclusion semaphore the SSL engine uses
|
# Configure the path to the mutual exclusion semaphore the SSL engine uses
|
||||||
# internally for inter-process synchronization.
|
# internally for inter-process synchronization.
|
||||||
SSLMutex file:/var/run/ssl_mutex
|
Mutex file:/run/apache_ssl_mutex ssl-cache
|
||||||
|
|
||||||
|
## SSL Compression:
|
||||||
|
# Known to be vulnerable thus disabled by default (bug #507324).
|
||||||
|
SSLCompression off
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
# vim: ts=4 filetype=apache
|
||||||
|
@ -11,9 +11,7 @@ LDAPOpCacheTTL 600
|
|||||||
|
|
||||||
<Location /ldap-status>
|
<Location /ldap-status>
|
||||||
SetHandler ldap-status
|
SetHandler ldap-status
|
||||||
Order deny,allow
|
Require local
|
||||||
Deny from all
|
|
||||||
Allow from 127.0.0.1
|
|
||||||
</Location>
|
</Location>
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
|
|
||||||
|
@ -5,10 +5,14 @@
|
|||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
# Set it to handle the files
|
# Set it to handle the files
|
||||||
<IfModule mod_mime.c>
|
# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
|
||||||
AddHandler application/x-httpd-php .php .php5 .phtml
|
# NOTE: Please read the related news item!
|
||||||
AddHandler application/x-httpd-php-source .phps
|
<FilesMatch "\.(php|php5|phtml)$">
|
||||||
</IfModule>
|
SetHandler application/x-httpd-php
|
||||||
|
</FilesMatch>
|
||||||
|
<FilesMatch "\.phps$">
|
||||||
|
SetHandler application/x-httpd-php-source
|
||||||
|
</FilesMatch>
|
||||||
|
|
||||||
DirectoryIndex index.php index.phtml
|
DirectoryIndex index.php index.phtml
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
|
@ -1,191 +0,0 @@
|
|||||||
<IfDefine SSL>
|
|
||||||
<IfDefine SSL_DEFAULT_VHOST>
|
|
||||||
<IfModule ssl_module>
|
|
||||||
# see bug #178966 why this is in here
|
|
||||||
|
|
||||||
# When we also provide SSL we have to listen to the HTTPS port
|
|
||||||
# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
|
|
||||||
# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
|
|
||||||
Listen 443
|
|
||||||
|
|
||||||
<VirtualHost _default_:443>
|
|
||||||
ServerName localhost
|
|
||||||
Include /etc/apache2/vhosts.d/default_vhost.include
|
|
||||||
ErrorLog /var/log/apache2/ssl_error_log
|
|
||||||
|
|
||||||
<IfModule log_config_module>
|
|
||||||
TransferLog /var/log/apache2/ssl_access_log
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
## SSL Engine Switch:
|
|
||||||
# Enable/Disable SSL for this virtual host.
|
|
||||||
SSLEngine on
|
|
||||||
|
|
||||||
## SSLProtocol:
|
|
||||||
# Don't use SSLv2 anymore as it's considered to be broken security-wise.
|
|
||||||
# Also disable SSLv3 as most modern browsers are capable of TLS.
|
|
||||||
SSLProtocol ALL -SSLv2 -SSLv3
|
|
||||||
|
|
||||||
## SSL Cipher Suite:
|
|
||||||
# List the ciphers that the client is permitted to negotiate.
|
|
||||||
# See the mod_ssl documentation for a complete list.
|
|
||||||
# This list of ciphers is recommended by mozilla and was stripped off
|
|
||||||
# its RC4 ciphers. (bug #506924)
|
|
||||||
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
|
|
||||||
|
|
||||||
## SSLHonorCipherOrder:
|
|
||||||
# Prefer the server's cipher preference order as the client may have a
|
|
||||||
# weak default order.
|
|
||||||
SSLHonorCipherOrder On
|
|
||||||
|
|
||||||
## Server Certificate:
|
|
||||||
# Point SSLCertificateFile at a PEM encoded certificate. If the certificate
|
|
||||||
# is encrypted, then you will be prompted for a pass phrase. Note that a
|
|
||||||
# kill -HUP will prompt again. Keep in mind that if you have both an RSA
|
|
||||||
# and a DSA certificate you can configure both in parallel (to also allow
|
|
||||||
# the use of DSA ciphers, etc.)
|
|
||||||
SSLCertificateFile /etc/ssl/apache2/server.crt
|
|
||||||
|
|
||||||
## Server Private Key:
|
|
||||||
# If the key is not combined with the certificate, use this directive to
|
|
||||||
# point at the key file. Keep in mind that if you've both a RSA and a DSA
|
|
||||||
# private key you can configure both in parallel (to also allow the use of
|
|
||||||
# DSA ciphers, etc.)
|
|
||||||
SSLCertificateKeyFile /etc/ssl/apache2/server.key
|
|
||||||
|
|
||||||
## Server Certificate Chain:
|
|
||||||
# Point SSLCertificateChainFile at a file containing the concatenation of
|
|
||||||
# PEM encoded CA certificates which form the certificate chain for the
|
|
||||||
# server certificate. Alternatively the referenced file can be the same as
|
|
||||||
# SSLCertificateFile when the CA certificates are directly appended to the
|
|
||||||
# server certificate for convinience.
|
|
||||||
#SSLCertificateChainFile /etc/ssl/apache2/ca.crt
|
|
||||||
|
|
||||||
## Certificate Authority (CA):
|
|
||||||
# Set the CA certificate verification path where to find CA certificates
|
|
||||||
# for client authentication or alternatively one huge file containing all
|
|
||||||
# of them (file must be PEM encoded).
|
|
||||||
# Note: Inside SSLCACertificatePath you need hash symlinks to point to the
|
|
||||||
# certificate files. Use the provided Makefile to update the hash symlinks
|
|
||||||
# after changes.
|
|
||||||
#SSLCACertificatePath /etc/ssl/apache2/ssl.crt
|
|
||||||
#SSLCACertificateFile /etc/ssl/apache2/ca-bundle.crt
|
|
||||||
|
|
||||||
## Certificate Revocation Lists (CRL):
|
|
||||||
# Set the CA revocation path where to find CA CRLs for client authentication
|
|
||||||
# or alternatively one huge file containing all of them (file must be PEM
|
|
||||||
# encoded).
|
|
||||||
# Note: Inside SSLCARevocationPath you need hash symlinks to point to the
|
|
||||||
# certificate files. Use the provided Makefile to update the hash symlinks
|
|
||||||
# after changes.
|
|
||||||
#SSLCARevocationPath /etc/ssl/apache2/ssl.crl
|
|
||||||
#SSLCARevocationFile /etc/ssl/apache2/ca-bundle.crl
|
|
||||||
|
|
||||||
## Client Authentication (Type):
|
|
||||||
# Client certificate verification type and depth. Types are none, optional,
|
|
||||||
# require and optional_no_ca. Depth is a number which specifies how deeply
|
|
||||||
# to verify the certificate issuer chain before deciding the certificate is
|
|
||||||
# not valid.
|
|
||||||
#SSLVerifyClient require
|
|
||||||
#SSLVerifyDepth 10
|
|
||||||
|
|
||||||
## Access Control:
|
|
||||||
# With SSLRequire you can do per-directory access control based on arbitrary
|
|
||||||
# complex boolean expressions containing server variable checks and other
|
|
||||||
# lookup directives. The syntax is a mixture between C and Perl. See the
|
|
||||||
# mod_ssl documentation for more details.
|
|
||||||
#<Location />
|
|
||||||
# #SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
|
|
||||||
# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
|
|
||||||
# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
|
|
||||||
# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
|
|
||||||
# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
|
|
||||||
# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
|
|
||||||
#</Location>
|
|
||||||
|
|
||||||
## SSL Engine Options:
|
|
||||||
# Set various options for the SSL engine.
|
|
||||||
|
|
||||||
## FakeBasicAuth:
|
|
||||||
# Translate the client X.509 into a Basic Authorisation. This means that the
|
|
||||||
# standard Auth/DBMAuth methods can be used for access control. The user
|
|
||||||
# name is the `one line' version of the client's X.509 certificate.
|
|
||||||
# Note that no password is obtained from the user. Every entry in the user
|
|
||||||
# file needs this password: `xxj31ZMTZzkVA'.
|
|
||||||
|
|
||||||
## ExportCertData:
|
|
||||||
# This exports two additional environment variables: SSL_CLIENT_CERT and
|
|
||||||
# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the server
|
|
||||||
# (always existing) and the client (only existing when client
|
|
||||||
# authentication is used). This can be used to import the certificates into
|
|
||||||
# CGI scripts.
|
|
||||||
|
|
||||||
## StdEnvVars:
|
|
||||||
# This exports the standard SSL/TLS related `SSL_*' environment variables.
|
|
||||||
# Per default this exportation is switched off for performance reasons,
|
|
||||||
# because the extraction step is an expensive operation and is usually
|
|
||||||
# useless for serving static content. So one usually enables the exportation
|
|
||||||
# for CGI and SSI requests only.
|
|
||||||
|
|
||||||
## StrictRequire:
|
|
||||||
# This denies access when "SSLRequireSSL" or "SSLRequire" applied even under
|
|
||||||
# a "Satisfy any" situation, i.e. when it applies access is denied and no
|
|
||||||
# other module can change it.
|
|
||||||
|
|
||||||
## OptRenegotiate:
|
|
||||||
# This enables optimized SSL connection renegotiation handling when SSL
|
|
||||||
# directives are used in per-directory context.
|
|
||||||
#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
|
|
||||||
<FilesMatch "\.(cgi|shtml|phtml|php)$">
|
|
||||||
SSLOptions +StdEnvVars
|
|
||||||
</FilesMatch>
|
|
||||||
|
|
||||||
<Directory "/var/www/localhost/cgi-bin">
|
|
||||||
SSLOptions +StdEnvVars
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
## SSL Protocol Adjustments:
|
|
||||||
# The safe and default but still SSL/TLS standard compliant shutdown
|
|
||||||
# approach is that mod_ssl sends the close notify alert but doesn't wait
|
|
||||||
# for the close notify alert from client. When you need a different
|
|
||||||
# shutdown approach you can use one of the following variables:
|
|
||||||
|
|
||||||
## ssl-unclean-shutdown:
|
|
||||||
# This forces an unclean shutdown when the connection is closed, i.e. no
|
|
||||||
# SSL close notify alert is send or allowed to received. This violates the
|
|
||||||
# SSL/TLS standard but is needed for some brain-dead browsers. Use this when
|
|
||||||
# you receive I/O errors because of the standard approach where mod_ssl
|
|
||||||
# sends the close notify alert.
|
|
||||||
|
|
||||||
## ssl-accurate-shutdown:
|
|
||||||
# This forces an accurate shutdown when the connection is closed, i.e. a
|
|
||||||
# SSL close notify alert is send and mod_ssl waits for the close notify
|
|
||||||
# alert of the client. This is 100% SSL/TLS standard compliant, but in
|
|
||||||
# practice often causes hanging connections with brain-dead browsers. Use
|
|
||||||
# this only for browsers where you know that their SSL implementation works
|
|
||||||
# correctly.
|
|
||||||
# Notice: Most problems of broken clients are also related to the HTTP
|
|
||||||
# keep-alive facility, so you usually additionally want to disable
|
|
||||||
# keep-alive for those clients, too. Use variable "nokeepalive" for this.
|
|
||||||
# Similarly, one has to force some clients to use HTTP/1.0 to workaround
|
|
||||||
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
|
|
||||||
# "force-response-1.0" for this.
|
|
||||||
<IfModule setenvif_module>
|
|
||||||
BrowserMatch ".*MSIE.*" \
|
|
||||||
nokeepalive ssl-unclean-shutdown \
|
|
||||||
downgrade-1.0 force-response-1.0
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
## Per-Server Logging:
|
|
||||||
# The home of a custom SSL log file. Use this when you want a compact
|
|
||||||
# non-error SSL logfile on a virtual host basis.
|
|
||||||
<IfModule log_config_module>
|
|
||||||
CustomLog /var/log/apache2/ssl_request_log \
|
|
||||||
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
|
|
||||||
</IfModule>
|
|
||||||
</VirtualHost>
|
|
||||||
</IfModule>
|
|
||||||
</IfDefine>
|
|
||||||
</IfDefine>
|
|
||||||
|
|
||||||
# vim: ts=4 filetype=apache
|
|
@ -21,10 +21,22 @@ Listen 443
|
|||||||
# Enable/Disable SSL for this virtual host.
|
# Enable/Disable SSL for this virtual host.
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
|
|
||||||
|
## SSLProtocol:
|
||||||
|
# Don't use SSLv2 anymore as it's considered to be broken security-wise.
|
||||||
|
# Also disable SSLv3 as most modern browsers are capable of TLS.
|
||||||
|
SSLProtocol ALL -SSLv2 -SSLv3
|
||||||
|
|
||||||
## SSL Cipher Suite:
|
## SSL Cipher Suite:
|
||||||
# List the ciphers that the client is permitted to negotiate.
|
# List the ciphers that the client is permitted to negotiate.
|
||||||
# See the mod_ssl documentation for a complete list.
|
# See the mod_ssl documentation for a complete list.
|
||||||
SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
|
# This list of ciphers is recommended by mozilla and was stripped off
|
||||||
|
# its RC4 ciphers. (bug #506924)
|
||||||
|
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
|
||||||
|
|
||||||
|
## SSLHonorCipherOrder:
|
||||||
|
# Prefer the server's cipher preference order as the client may have a
|
||||||
|
# weak default order.
|
||||||
|
SSLHonorCipherOrder On
|
||||||
|
|
||||||
## Server Certificate:
|
## Server Certificate:
|
||||||
# Point SSLCertificateFile at a PEM encoded certificate. If the certificate
|
# Point SSLCertificateFile at a PEM encoded certificate. If the certificate
|
||||||
|
@ -1,82 +0,0 @@
|
|||||||
# /etc/bash/bashrc
|
|
||||||
#
|
|
||||||
# This file is sourced by all *interactive* bash shells on startup,
|
|
||||||
# including some apparently interactive shells such as scp and rcp
|
|
||||||
# that can't tolerate any output. So make sure this doesn't display
|
|
||||||
# anything or bad things will happen !
|
|
||||||
|
|
||||||
|
|
||||||
# Test for an interactive shell. There is no need to set anything
|
|
||||||
# past this point for scp and rcp, and it's important to refrain from
|
|
||||||
# outputting anything in those cases.
|
|
||||||
if [[ $- != *i* ]] ; then
|
|
||||||
# Shell is non-interactive. Be done now!
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Bash won't get SIGWINCH if another process is in the foreground.
|
|
||||||
# Enable checkwinsize so that bash will check the terminal size when
|
|
||||||
# it regains control. #65623
|
|
||||||
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
|
|
||||||
shopt -s checkwinsize
|
|
||||||
|
|
||||||
# Enable history appending instead of overwriting. #139609
|
|
||||||
shopt -s histappend
|
|
||||||
|
|
||||||
# Change the window title of X terminals
|
|
||||||
case ${TERM} in
|
|
||||||
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
|
|
||||||
PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
|
|
||||||
;;
|
|
||||||
screen*)
|
|
||||||
PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
use_color=false
|
|
||||||
|
|
||||||
# Set colorful PS1 only on colorful terminals.
|
|
||||||
# dircolors --print-database uses its own built-in database
|
|
||||||
# instead of using /etc/DIR_COLORS. Try to use the external file
|
|
||||||
# first to take advantage of user additions. Use internal bash
|
|
||||||
# globbing instead of external grep binary.
|
|
||||||
safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
|
|
||||||
match_lhs=""
|
|
||||||
[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
|
|
||||||
[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
|
|
||||||
[[ -z ${match_lhs} ]] \
|
|
||||||
&& type -P dircolors >/dev/null \
|
|
||||||
&& match_lhs=$(dircolors --print-database)
|
|
||||||
[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
|
|
||||||
|
|
||||||
if ${use_color} ; then
|
|
||||||
# Enable colors for ls, etc. Prefer ~/.dir_colors #64489
|
|
||||||
if type -P dircolors >/dev/null ; then
|
|
||||||
if [[ -f ~/.dir_colors ]] ; then
|
|
||||||
eval $(dircolors -b ~/.dir_colors)
|
|
||||||
elif [[ -f /etc/DIR_COLORS ]] ; then
|
|
||||||
eval $(dircolors -b /etc/DIR_COLORS)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
|
||||||
PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
|
|
||||||
else
|
|
||||||
PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
|
|
||||||
fi
|
|
||||||
|
|
||||||
alias ls='ls --color=auto'
|
|
||||||
alias grep='grep --colour=auto'
|
|
||||||
alias egrep='egrep --colour=auto'
|
|
||||||
alias fgrep='fgrep --colour=auto'
|
|
||||||
else
|
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
|
||||||
# show root@ when we don't have colors
|
|
||||||
PS1='\u@\h \W \$ '
|
|
||||||
else
|
|
||||||
PS1='\u@\h \w \$ '
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to keep environment pollution down, EPA loves us.
|
|
||||||
unset use_color safe_term match_lhs
|
|
@ -1,102 +0,0 @@
|
|||||||
# /etc/bash/bashrc
|
|
||||||
#
|
|
||||||
# This file is sourced by all *interactive* bash shells on startup,
|
|
||||||
# including some apparently interactive shells such as scp and rcp
|
|
||||||
# that can't tolerate any output. So make sure this doesn't display
|
|
||||||
# anything or bad things will happen !
|
|
||||||
|
|
||||||
|
|
||||||
# Test for an interactive shell. There is no need to set anything
|
|
||||||
# past this point for scp and rcp, and it's important to refrain from
|
|
||||||
# outputting anything in those cases.
|
|
||||||
if [[ $- != *i* ]] ; then
|
|
||||||
# Shell is non-interactive. Be done now!
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Bash won't get SIGWINCH if another process is in the foreground.
|
|
||||||
# Enable checkwinsize so that bash will check the terminal size when
|
|
||||||
# it regains control. #65623
|
|
||||||
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
|
|
||||||
shopt -s checkwinsize
|
|
||||||
|
|
||||||
# Disable completion when the input buffer is empty. i.e. Hitting tab
|
|
||||||
# and waiting a long time for bash to expand all of $PATH.
|
|
||||||
shopt -s no_empty_cmd_completion
|
|
||||||
|
|
||||||
# Enable history appending instead of overwriting when exiting. #139609
|
|
||||||
shopt -s histappend
|
|
||||||
|
|
||||||
# Save each command to the history file as it's executed. #517342
|
|
||||||
# This does mean sessions get interleaved when reading later on, but this
|
|
||||||
# way the history is always up to date. History is not synced across live
|
|
||||||
# sessions though; that is what `history -n` does.
|
|
||||||
# Disabled by default due to concerns related to system recovery when $HOME
|
|
||||||
# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
|
|
||||||
# the history will halt the shell prompt until it's finished.
|
|
||||||
#PROMPT_COMMAND='history -a'
|
|
||||||
|
|
||||||
# Change the window title of X terminals
|
|
||||||
case ${TERM} in
|
|
||||||
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
|
|
||||||
PS1='\[\033]0;\u@\h:\w\007\]'
|
|
||||||
;;
|
|
||||||
screen*)
|
|
||||||
PS1='\[\033k\u@\h:\w\033\\\]'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
unset PS1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
use_color=false
|
|
||||||
|
|
||||||
# Set colorful PS1 only on colorful terminals.
|
|
||||||
# dircolors --print-database uses its own built-in database
|
|
||||||
# instead of using /etc/DIR_COLORS. Try to use the external file
|
|
||||||
# first to take advantage of user additions. Use internal bash
|
|
||||||
# globbing instead of external grep binary.
|
|
||||||
safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
|
|
||||||
match_lhs=""
|
|
||||||
[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
|
|
||||||
[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
|
|
||||||
[[ -z ${match_lhs} ]] \
|
|
||||||
&& type -P dircolors >/dev/null \
|
|
||||||
&& match_lhs=$(dircolors --print-database)
|
|
||||||
[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
|
|
||||||
|
|
||||||
if ${use_color} ; then
|
|
||||||
# Enable colors for ls, etc. Prefer ~/.dir_colors #64489
|
|
||||||
if type -P dircolors >/dev/null ; then
|
|
||||||
if [[ -f ~/.dir_colors ]] ; then
|
|
||||||
eval $(dircolors -b ~/.dir_colors)
|
|
||||||
elif [[ -f /etc/DIR_COLORS ]] ; then
|
|
||||||
eval $(dircolors -b /etc/DIR_COLORS)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
|
||||||
PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
|
|
||||||
else
|
|
||||||
PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
|
|
||||||
fi
|
|
||||||
|
|
||||||
alias ls='ls --color=auto'
|
|
||||||
alias grep='grep --colour=auto'
|
|
||||||
alias egrep='egrep --colour=auto'
|
|
||||||
alias fgrep='fgrep --colour=auto'
|
|
||||||
else
|
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
|
||||||
# show root@ when we don't have colors
|
|
||||||
PS1+='\u@\h \W \$ '
|
|
||||||
else
|
|
||||||
PS1+='\u@\h \w \$ '
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
for sh in /etc/bash/bashrc.d/* ; do
|
|
||||||
[[ -r ${sh} ]] && source "${sh}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Try to keep environment pollution down, EPA loves us.
|
|
||||||
unset use_color safe_term match_lhs sh
|
|
38
bash/bashrc
38
bash/bashrc
@ -20,16 +20,32 @@ fi
|
|||||||
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
|
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
|
||||||
shopt -s checkwinsize
|
shopt -s checkwinsize
|
||||||
|
|
||||||
# Enable history appending instead of overwriting. #139609
|
# Disable completion when the input buffer is empty. i.e. Hitting tab
|
||||||
|
# and waiting a long time for bash to expand all of $PATH.
|
||||||
|
shopt -s no_empty_cmd_completion
|
||||||
|
|
||||||
|
# Enable history appending instead of overwriting when exiting. #139609
|
||||||
shopt -s histappend
|
shopt -s histappend
|
||||||
|
|
||||||
|
# Save each command to the history file as it's executed. #517342
|
||||||
|
# This does mean sessions get interleaved when reading later on, but this
|
||||||
|
# way the history is always up to date. History is not synced across live
|
||||||
|
# sessions though; that is what `history -n` does.
|
||||||
|
# Disabled by default due to concerns related to system recovery when $HOME
|
||||||
|
# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
|
||||||
|
# the history will halt the shell prompt until it's finished.
|
||||||
|
#PROMPT_COMMAND='history -a'
|
||||||
|
|
||||||
# Change the window title of X terminals
|
# Change the window title of X terminals
|
||||||
case ${TERM} in
|
case ${TERM} in
|
||||||
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix)
|
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
|
||||||
PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
|
PS1='\[\033]0;\u@\h:\w\007\]'
|
||||||
;;
|
;;
|
||||||
screen*)
|
screen*)
|
||||||
PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
|
PS1='\[\033k\u@\h:\w\033\\\]'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
unset PS1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -60,9 +76,9 @@ if ${use_color} ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
if [[ ${EUID} == 0 ]] ; then
|
||||||
PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
|
PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
|
||||||
else
|
else
|
||||||
PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
|
PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
|
||||||
fi
|
fi
|
||||||
|
|
||||||
alias ls='ls --color=auto'
|
alias ls='ls --color=auto'
|
||||||
@ -72,11 +88,15 @@ if ${use_color} ; then
|
|||||||
else
|
else
|
||||||
if [[ ${EUID} == 0 ]] ; then
|
if [[ ${EUID} == 0 ]] ; then
|
||||||
# show root@ when we don't have colors
|
# show root@ when we don't have colors
|
||||||
PS1='\u@\h \W \$ '
|
PS1+='\u@\h \W \$ '
|
||||||
else
|
else
|
||||||
PS1='\u@\h \w \$ '
|
PS1+='\u@\h \w \$ '
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for sh in /etc/bash/bashrc.d/* ; do
|
||||||
|
[[ -r ${sh} ]] && source "${sh}"
|
||||||
|
done
|
||||||
|
|
||||||
# Try to keep environment pollution down, EPA loves us.
|
# Try to keep environment pollution down, EPA loves us.
|
||||||
unset use_color safe_term match_lhs
|
unset use_color safe_term match_lhs sh
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Automatically generated by app-misc/ca-certificates-20140927.3.17.2
|
# Automatically generated by app-misc/ca-certificates-20141019.3.17.4
|
||||||
# Sat Feb 7 19:51:46 UTC 2015
|
# Mon Apr 6 20:58:59 UTC 2015
|
||||||
# Do not edit.
|
# Do not edit.
|
||||||
cacert.org/cacert.org_root.crt
|
cacert.org/cacert.org_root.crt
|
||||||
mozilla/A-Trust-nQual-03.crt
|
mozilla/A-Trust-nQual-03.crt
|
||||||
@ -15,8 +15,6 @@ mozilla/AffirmTrust_Commercial.crt
|
|||||||
mozilla/AffirmTrust_Networking.crt
|
mozilla/AffirmTrust_Networking.crt
|
||||||
mozilla/AffirmTrust_Premium.crt
|
mozilla/AffirmTrust_Premium.crt
|
||||||
mozilla/AffirmTrust_Premium_ECC.crt
|
mozilla/AffirmTrust_Premium_ECC.crt
|
||||||
mozilla/America_Online_Root_Certification_Authority_1.crt
|
|
||||||
mozilla/America_Online_Root_Certification_Authority_2.crt
|
|
||||||
mozilla/ApplicationCA_-_Japanese_Government.crt
|
mozilla/ApplicationCA_-_Japanese_Government.crt
|
||||||
mozilla/Atos_TrustedRoot_2011.crt
|
mozilla/Atos_TrustedRoot_2011.crt
|
||||||
mozilla/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.crt
|
mozilla/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.crt
|
||||||
@ -31,6 +29,7 @@ mozilla/CA_Disig_Root_R2.crt
|
|||||||
mozilla/CNNIC_ROOT.crt
|
mozilla/CNNIC_ROOT.crt
|
||||||
mozilla/COMODO_Certification_Authority.crt
|
mozilla/COMODO_Certification_Authority.crt
|
||||||
mozilla/COMODO_ECC_Certification_Authority.crt
|
mozilla/COMODO_ECC_Certification_Authority.crt
|
||||||
|
mozilla/COMODO_RSA_Certification_Authority.crt
|
||||||
mozilla/Camerfirma_Chambers_of_Commerce_Root.crt
|
mozilla/Camerfirma_Chambers_of_Commerce_Root.crt
|
||||||
mozilla/Camerfirma_Global_Chambersign_Root.crt
|
mozilla/Camerfirma_Global_Chambersign_Root.crt
|
||||||
mozilla/Certigna.crt
|
mozilla/Certigna.crt
|
||||||
@ -71,7 +70,6 @@ mozilla/Entrust_Root_Certification_Authority.crt
|
|||||||
mozilla/Equifax_Secure_CA.crt
|
mozilla/Equifax_Secure_CA.crt
|
||||||
mozilla/Equifax_Secure_Global_eBusiness_CA.crt
|
mozilla/Equifax_Secure_Global_eBusiness_CA.crt
|
||||||
mozilla/Equifax_Secure_eBusiness_CA_1.crt
|
mozilla/Equifax_Secure_eBusiness_CA_1.crt
|
||||||
mozilla/GTE_CyberTrust_Global_Root.crt
|
|
||||||
mozilla/GeoTrust_Global_CA.crt
|
mozilla/GeoTrust_Global_CA.crt
|
||||||
mozilla/GeoTrust_Global_CA_2.crt
|
mozilla/GeoTrust_Global_CA_2.crt
|
||||||
mozilla/GeoTrust_Primary_Certification_Authority.crt
|
mozilla/GeoTrust_Primary_Certification_Authority.crt
|
||||||
@ -79,6 +77,8 @@ mozilla/GeoTrust_Primary_Certification_Authority_-_G2.crt
|
|||||||
mozilla/GeoTrust_Primary_Certification_Authority_-_G3.crt
|
mozilla/GeoTrust_Primary_Certification_Authority_-_G3.crt
|
||||||
mozilla/GeoTrust_Universal_CA.crt
|
mozilla/GeoTrust_Universal_CA.crt
|
||||||
mozilla/GeoTrust_Universal_CA_2.crt
|
mozilla/GeoTrust_Universal_CA_2.crt
|
||||||
|
mozilla/GlobalSign_ECC_Root_CA_-_R4.crt
|
||||||
|
mozilla/GlobalSign_ECC_Root_CA_-_R5.crt
|
||||||
mozilla/GlobalSign_Root_CA.crt
|
mozilla/GlobalSign_Root_CA.crt
|
||||||
mozilla/GlobalSign_Root_CA_-_R2.crt
|
mozilla/GlobalSign_Root_CA_-_R2.crt
|
||||||
mozilla/GlobalSign_Root_CA_-_R3.crt
|
mozilla/GlobalSign_Root_CA_-_R3.crt
|
||||||
@ -144,10 +144,10 @@ mozilla/TWCA_Global_Root_CA.crt
|
|||||||
mozilla/TWCA_Root_Certification_Authority.crt
|
mozilla/TWCA_Root_Certification_Authority.crt
|
||||||
mozilla/Taiwan_GRCA.crt
|
mozilla/Taiwan_GRCA.crt
|
||||||
mozilla/TeliaSonera_Root_CA_v1.crt
|
mozilla/TeliaSonera_Root_CA_v1.crt
|
||||||
mozilla/Thawte_Premium_Server_CA.crt
|
|
||||||
mozilla/Thawte_Server_CA.crt
|
|
||||||
mozilla/Trustis_FPS_Root_CA.crt
|
mozilla/Trustis_FPS_Root_CA.crt
|
||||||
mozilla/TÜBİTAK_UEKAE_Kök_Sertifika_Hizmet_Sağlayıcısı_-_Sürüm_3.crt
|
mozilla/TÜBİTAK_UEKAE_Kök_Sertifika_Hizmet_Sağlayıcısı_-_Sürüm_3.crt
|
||||||
|
mozilla/USERTrust_ECC_Certification_Authority.crt
|
||||||
|
mozilla/USERTrust_RSA_Certification_Authority.crt
|
||||||
mozilla/UTN_DATACorp_SGC_Root_CA.crt
|
mozilla/UTN_DATACorp_SGC_Root_CA.crt
|
||||||
mozilla/UTN_USERFirst_Email_Root_CA.crt
|
mozilla/UTN_USERFirst_Email_Root_CA.crt
|
||||||
mozilla/UTN_USERFirst_Hardware_Root_CA.crt
|
mozilla/UTN_USERFirst_Hardware_Root_CA.crt
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
# RESTORE_ON_START:
|
|
||||||
# Do you want to restore your mixer settings? If not, your cards will be
|
|
||||||
# muted.
|
|
||||||
# no - Do not restore state
|
|
||||||
# yes - Restore state
|
|
||||||
|
|
||||||
RESTORE_ON_START="yes"
|
|
||||||
|
|
||||||
# SAVE_ON_STOP:
|
|
||||||
# Do you want to save changes made to your mixer volumes when alsasound
|
|
||||||
# stops?
|
|
||||||
# no - Do not save state
|
|
||||||
# yes - Save state
|
|
||||||
|
|
||||||
SAVE_ON_STOP="yes"
|
|
@ -1,16 +0,0 @@
|
|||||||
# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server
|
|
||||||
|
|
||||||
# user
|
|
||||||
USER="minetest"
|
|
||||||
|
|
||||||
# group
|
|
||||||
GROUP="games"
|
|
||||||
|
|
||||||
# pidfile
|
|
||||||
PIDFILE="/var/run/minetest.pid"
|
|
||||||
|
|
||||||
# executable
|
|
||||||
MINETESTBIN="/usr/games/bin/minetestserver"
|
|
||||||
|
|
||||||
# additional arguments for the server
|
|
||||||
ARGS="--logfile /var/lib/minetest/minetest-server.log"
|
|
@ -1,26 +0,0 @@
|
|||||||
# Variables to configure vpn tunnels where "vpnname" is the name of your vpn tunnel:
|
|
||||||
#
|
|
||||||
# server_vpnname
|
|
||||||
# password_vpnname
|
|
||||||
# vpnopts_vpnname
|
|
||||||
#
|
|
||||||
# The tunnel will need to be started with a symbolic link to openconnect:
|
|
||||||
#
|
|
||||||
# ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpnname
|
|
||||||
#
|
|
||||||
# If you'd like to execute a script on preup, postup, predown and postdown of the vpn tunnel, you
|
|
||||||
# need to create executable scripts in a directory with the same name as
|
|
||||||
# the vpn tunnel (vpn0 can be replaced with the vpn name):
|
|
||||||
#
|
|
||||||
# mkdir /etc/openconnect/vpn0
|
|
||||||
# cd /etc/openconnect/vpn0"
|
|
||||||
# echo '#!/bin/sh' > preup.sh"
|
|
||||||
# cp preup.sh predown.sh"
|
|
||||||
# cp preup.sh postup.sh"
|
|
||||||
# cp preup.sh postdown.sh"
|
|
||||||
# chmod 755 /etc/openconnect/vpn0/*"
|
|
||||||
|
|
||||||
server_vpn0="vpn.server.tld"
|
|
||||||
password_vpn0="YOUR_PASSWORD"
|
|
||||||
# Any OPENCONNECT options my go here (see openconnect --help)
|
|
||||||
vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME --script=/etc/openconnect/openconnect.sh"
|
|
@ -1,21 +0,0 @@
|
|||||||
# /etc/conf.d/sshd: config file for /etc/init.d/sshd
|
|
||||||
|
|
||||||
# Where is your sshd_config file stored?
|
|
||||||
|
|
||||||
SSHD_CONFDIR="/etc/ssh"
|
|
||||||
|
|
||||||
|
|
||||||
# Any random options you want to pass to sshd.
|
|
||||||
# See the sshd(8) manpage for more info.
|
|
||||||
|
|
||||||
SSHD_OPTS=""
|
|
||||||
|
|
||||||
|
|
||||||
# Pid file to use (needs to be absolute path).
|
|
||||||
|
|
||||||
#SSHD_PIDFILE="/var/run/sshd.pid"
|
|
||||||
|
|
||||||
|
|
||||||
# Path to the sshd binary (needs to be absolute path).
|
|
||||||
|
|
||||||
#SSHD_BINARY="/usr/sbin/sshd"
|
|
@ -1,2 +0,0 @@
|
|||||||
TOX_GROUP=tox
|
|
||||||
TOX_USER=tox
|
|
@ -1,16 +0,0 @@
|
|||||||
# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server
|
|
||||||
|
|
||||||
# user
|
|
||||||
USER="minetest"
|
|
||||||
|
|
||||||
# group
|
|
||||||
GROUP="root"
|
|
||||||
|
|
||||||
# pidfile
|
|
||||||
PIDFILE="/var/run/minetest.pid"
|
|
||||||
|
|
||||||
# executable
|
|
||||||
MINETESTBIN="/usr/bin/minetestserver"
|
|
||||||
|
|
||||||
# additional arguments for the server
|
|
||||||
ARGS="--logfile /var/lib/minetest/minetest-server.log"
|
|
@ -1,16 +0,0 @@
|
|||||||
# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server
|
|
||||||
|
|
||||||
# user
|
|
||||||
USER="minetest"
|
|
||||||
|
|
||||||
# group
|
|
||||||
GROUP="minetest"
|
|
||||||
|
|
||||||
# pidfile
|
|
||||||
PIDFILE="/var/run/minetest.pid"
|
|
||||||
|
|
||||||
# executable
|
|
||||||
MINETESTBIN="/usr/bin/minetestserver"
|
|
||||||
|
|
||||||
# additional arguments for the server
|
|
||||||
ARGS="--logfile /var/lib/minetest/minetest-server.log"
|
|
@ -4,13 +4,13 @@
|
|||||||
USER="minetest"
|
USER="minetest"
|
||||||
|
|
||||||
# group
|
# group
|
||||||
GROUP="games"
|
GROUP="minetest"
|
||||||
|
|
||||||
# pidfile
|
# pidfile
|
||||||
PIDFILE="/var/run/minetest.pid"
|
PIDFILE="/var/run/minetest.pid"
|
||||||
|
|
||||||
# executable
|
# executable
|
||||||
MINETESTBIN="/usr/games/bin/minetestserver"
|
MINETESTBIN="/usr/bin/minetestserver"
|
||||||
|
|
||||||
# additional arguments for the server
|
# additional arguments for the server
|
||||||
ARGS="--logfile /var/lib/minetest/minetest-server.log --gameid minetest"
|
ARGS="--logfile /var/lib/minetest/minetest-server.log"
|
||||||
|
@ -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
|
|
@ -1,82 +0,0 @@
|
|||||||
# Which protocols will we use to discover printers on the network?
|
|
||||||
# Can use DNSSD and/or CUPS, or 'none' for neither.
|
|
||||||
BrowseRemoteProtocols DNSSD,CUPS
|
|
||||||
|
|
||||||
# Which protocols will we use to broadcast shared local printers to the network?
|
|
||||||
# Can use DNSSD and/or CUPS, or 'none' for neither.
|
|
||||||
# Only CUPS is actually supported, as DNSSD is done by CUPS itself (we ignore
|
|
||||||
# DNSSD in this directive).
|
|
||||||
# BrowseLocalProtocols none
|
|
||||||
|
|
||||||
# Settings of this directive apply to both BrowseRemoteProtocols and
|
|
||||||
# BrowseLocalProtocols.
|
|
||||||
# Can use DNSSD and/or CUPS, or 'none' for neither.
|
|
||||||
# BrowseProtocols none
|
|
||||||
|
|
||||||
# Only browse remote printers from selected servers
|
|
||||||
# BrowseAllow All
|
|
||||||
# BrowseAllow cups.example.com
|
|
||||||
# BrowseAllow 192.168.1.12
|
|
||||||
# BrowseAllow 192.168.1.0/24
|
|
||||||
# BrowseAllow 192.168.1.0/255.255.255.0
|
|
||||||
|
|
||||||
# Use BrowsePoll to poll a particular CUPS server
|
|
||||||
# BrowsePoll cups.example.com
|
|
||||||
# BrowsePoll cups.example.com:631
|
|
||||||
# BrowsePoll cups.example.com:631/version=1.1
|
|
||||||
|
|
||||||
# Use DomainSocket to access the local CUPS daemon via another than the
|
|
||||||
# default domain socket
|
|
||||||
# DomainSocket /var/lib/run/cups/cups.sock
|
|
||||||
|
|
||||||
# Set CreateIPPPrinterQueues to "Yes" to let cups-browsed discover IPP
|
|
||||||
# network printers (native printers, not CUPS queues) with known page
|
|
||||||
# description languages (PWG Raster, PDF, PostScript, PCL XL, PCL
|
|
||||||
# 5c/e) in the local network and auto-create PPD-less print queues for
|
|
||||||
# them (using a System V interface script to control the filter
|
|
||||||
# chain). Clients have to IPP-poll the capabilities of the printer and
|
|
||||||
# send option settings as standard IPP attributes. We do not poll the
|
|
||||||
# capabilities by ourselves to not wake up the printer from
|
|
||||||
# power-saving mode when creating the queues. Jobs have to be sent in
|
|
||||||
# PDF format. Other formats are not accepted. This functionality is
|
|
||||||
# primarily for mobile devices running CUPS to not need a printer
|
|
||||||
# setup tool nor a collection of printer drivers and PPDs.
|
|
||||||
|
|
||||||
# CreateIPPPrinterQueues Yes
|
|
||||||
|
|
||||||
# If cups-browsed is automatically creating print queues for native
|
|
||||||
# IPP network printers ("CreateIPPPrinterQueues Yes"), the type of
|
|
||||||
# queue to be created can be selected by the "IPPPrinterQueueType"
|
|
||||||
# directive. The "PPD" setting makes always queues with PPD file
|
|
||||||
# being created and no queue if the printer does not supply sufficient
|
|
||||||
# information for creating a PPD. With "NoPPD" the queue is always
|
|
||||||
# created with a System V interface script as filter, also when
|
|
||||||
# creatig a PPD would be possible. "Auto" (the default) lets a PPD
|
|
||||||
# being created if the printer supplies sufficient information and a
|
|
||||||
# System V interface script otherwise.
|
|
||||||
|
|
||||||
# IPPPrinterQueueType Auto
|
|
||||||
# IPPPrinterQueueType PPD
|
|
||||||
# IPPPrinterQueueType NoPPD
|
|
||||||
|
|
||||||
# The AutoShutdown directive specifies whether cups-browsed should
|
|
||||||
# automatically terminate when it has no local raw queues set up
|
|
||||||
# pointing to any discovered remote printers (auto shutdown
|
|
||||||
# mode). Setting it to "On" activates the auto-shutdown mode, setting
|
|
||||||
# it to "Off" deactiivates it (the default). The special mode "avahi"
|
|
||||||
# turns auto shutdown off while avahi-daemon is running and on when
|
|
||||||
# avahi-daemon stops. This allows running cups-browsed on-demand when
|
|
||||||
# avahi-daemon is run on-demand.
|
|
||||||
|
|
||||||
# AutoShutdown Off
|
|
||||||
# AutoShutdown On
|
|
||||||
# AutoShutdown avahi
|
|
||||||
|
|
||||||
# The AutoShutdownTimeout directive specifies after how many seconds
|
|
||||||
# without local raw queues set up pointing to any discovered remote
|
|
||||||
# printers cups-browsed should actually shut down in auto shutdown
|
|
||||||
# mode. Default is 30 seconds, 0 means immediate shutdown.
|
|
||||||
|
|
||||||
# AutoShutdownTimeout 30
|
|
||||||
|
|
||||||
# Unknown directives are ignored, also unknown values.
|
|
@ -1,134 +0,0 @@
|
|||||||
#
|
|
||||||
# "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $"
|
|
||||||
#
|
|
||||||
# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a
|
|
||||||
# complete description of this file.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Log general information in error_log - change "warn" to "debug"
|
|
||||||
# for troubleshooting...
|
|
||||||
LogLevel warn
|
|
||||||
|
|
||||||
# Only listen for connections from the local machine.
|
|
||||||
Listen localhost:631
|
|
||||||
Listen /run/cups/cups.sock
|
|
||||||
|
|
||||||
# Show shared printers on the local network.
|
|
||||||
Browsing On
|
|
||||||
BrowseLocalProtocols
|
|
||||||
|
|
||||||
# Default authentication type, when authentication is required...
|
|
||||||
DefaultAuthType Basic
|
|
||||||
|
|
||||||
# Web interface setting...
|
|
||||||
WebInterface Yes
|
|
||||||
|
|
||||||
# Restrict access to the server...
|
|
||||||
<Location />
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Restrict access to the admin pages...
|
|
||||||
<Location /admin>
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Restrict access to configuration files...
|
|
||||||
<Location /admin/conf>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Set the default printer/job policies...
|
|
||||||
<Policy default>
|
|
||||||
# Job/subscription privacy...
|
|
||||||
JobPrivateAccess default
|
|
||||||
JobPrivateValues default
|
|
||||||
SubscriptionPrivateAccess default
|
|
||||||
SubscriptionPrivateValues default
|
|
||||||
|
|
||||||
# Job-related operations must be done by the owner or an administrator...
|
|
||||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All administration operations require an administrator to authenticate...
|
|
||||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All printer operations require a printer operator to authenticate...
|
|
||||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# Only the owner or an administrator can cancel or authenticate a job...
|
|
||||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit All>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
</Policy>
|
|
||||||
|
|
||||||
# Set the authenticated printer/job policies...
|
|
||||||
<Policy authenticated>
|
|
||||||
# Job/subscription privacy...
|
|
||||||
JobPrivateAccess default
|
|
||||||
JobPrivateValues default
|
|
||||||
SubscriptionPrivateAccess default
|
|
||||||
SubscriptionPrivateValues default
|
|
||||||
|
|
||||||
# Job-related operations must be done by the owner or an administrator...
|
|
||||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
|
||||||
AuthType Default
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
|
||||||
AuthType Default
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All administration operations require an administrator to authenticate...
|
|
||||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All printer operations require a printer operator to authenticate...
|
|
||||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# Only the owner or an administrator can cancel or authenticate a job...
|
|
||||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
|
||||||
AuthType Default
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit All>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
</Policy>
|
|
||||||
|
|
||||||
#
|
|
||||||
# End of "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $".
|
|
||||||
#
|
|
@ -1,129 +0,0 @@
|
|||||||
#
|
|
||||||
# Configuration file for the CUPS scheduler. See "man cupsd.conf" for a
|
|
||||||
# complete description of this file.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Log general information in error_log - change "warn" to "debug"
|
|
||||||
# for troubleshooting...
|
|
||||||
LogLevel warn
|
|
||||||
PageLogFormat
|
|
||||||
|
|
||||||
# Only listen for connections from the local machine.
|
|
||||||
Listen localhost:631
|
|
||||||
Listen /run/cups/cups.sock
|
|
||||||
|
|
||||||
# Show shared printers on the local network.
|
|
||||||
Browsing On
|
|
||||||
BrowseLocalProtocols
|
|
||||||
|
|
||||||
# Default authentication type, when authentication is required...
|
|
||||||
DefaultAuthType Basic
|
|
||||||
|
|
||||||
# Web interface setting...
|
|
||||||
WebInterface Yes
|
|
||||||
|
|
||||||
# Restrict access to the server...
|
|
||||||
<Location />
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Restrict access to the admin pages...
|
|
||||||
<Location /admin>
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Restrict access to configuration files...
|
|
||||||
<Location /admin/conf>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order allow,deny
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
# Set the default printer/job policies...
|
|
||||||
<Policy default>
|
|
||||||
# Job/subscription privacy...
|
|
||||||
JobPrivateAccess default
|
|
||||||
JobPrivateValues default
|
|
||||||
SubscriptionPrivateAccess default
|
|
||||||
SubscriptionPrivateValues default
|
|
||||||
|
|
||||||
# Job-related operations must be done by the owner or an administrator...
|
|
||||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All administration operations require an administrator to authenticate...
|
|
||||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All printer operations require a printer operator to authenticate...
|
|
||||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# Only the owner or an administrator can cancel or authenticate a job...
|
|
||||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit All>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
</Policy>
|
|
||||||
|
|
||||||
# Set the authenticated printer/job policies...
|
|
||||||
<Policy authenticated>
|
|
||||||
# Job/subscription privacy...
|
|
||||||
JobPrivateAccess default
|
|
||||||
JobPrivateValues default
|
|
||||||
SubscriptionPrivateAccess default
|
|
||||||
SubscriptionPrivateValues default
|
|
||||||
|
|
||||||
# Job-related operations must be done by the owner or an administrator...
|
|
||||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
|
||||||
AuthType Default
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
|
||||||
AuthType Default
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All administration operations require an administrator to authenticate...
|
|
||||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# All printer operations require a printer operator to authenticate...
|
|
||||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
|
||||||
AuthType Default
|
|
||||||
Require user @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
# Only the owner or an administrator can cancel or authenticate a job...
|
|
||||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
|
||||||
AuthType Default
|
|
||||||
Require user @OWNER @SYSTEM
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Limit All>
|
|
||||||
Order deny,allow
|
|
||||||
</Limit>
|
|
||||||
</Policy>
|
|
@ -44,6 +44,21 @@ BrowseRemoteProtocols DNSSD,CUPS
|
|||||||
|
|
||||||
# CreateIPPPrinterQueues Yes
|
# CreateIPPPrinterQueues Yes
|
||||||
|
|
||||||
|
# If cups-browsed is automatically creating print queues for native
|
||||||
|
# IPP network printers ("CreateIPPPrinterQueues Yes"), the type of
|
||||||
|
# queue to be created can be selected by the "IPPPrinterQueueType"
|
||||||
|
# directive. The "PPD" setting makes always queues with PPD file
|
||||||
|
# being created and no queue if the printer does not supply sufficient
|
||||||
|
# information for creating a PPD. With "NoPPD" the queue is always
|
||||||
|
# created with a System V interface script as filter, also when
|
||||||
|
# creatig a PPD would be possible. "Auto" (the default) lets a PPD
|
||||||
|
# being created if the printer supplies sufficient information and a
|
||||||
|
# System V interface script otherwise.
|
||||||
|
|
||||||
|
# IPPPrinterQueueType Auto
|
||||||
|
# IPPPrinterQueueType PPD
|
||||||
|
# IPPPrinterQueueType NoPPD
|
||||||
|
|
||||||
# The AutoShutdown directive specifies whether cups-browsed should
|
# The AutoShutdown directive specifies whether cups-browsed should
|
||||||
# automatically terminate when it has no local raw queues set up
|
# automatically terminate when it has no local raw queues set up
|
||||||
# pointing to any discovered remote printers (auto shutdown
|
# pointing to any discovered remote printers (auto shutdown
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.1 2013/12/19 14:57:24 floppym Exp $
|
|
||||||
#
|
|
||||||
# To populate all changes in this file you need to regenerate your
|
|
||||||
# grub configuration file afterwards:
|
|
||||||
# 'grub2-mkconfig -o /boot/grub/grub.cfg'
|
|
||||||
#
|
|
||||||
# See the grub info page for documentation on possible variables and
|
|
||||||
# their associated values.
|
|
||||||
|
|
||||||
GRUB_DISTRIBUTOR="Gentoo"
|
|
||||||
|
|
||||||
# Default menu entry
|
|
||||||
#GRUB_DEFAULT=0
|
|
||||||
|
|
||||||
# Boot the default entry this many seconds after the menu is displayed
|
|
||||||
#GRUB_TIMEOUT=5
|
|
||||||
#GRUB_TIMEOUT_STYLE=menu
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line
|
|
||||||
#GRUB_CMDLINE_LINUX=""
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line for non-recovery entries
|
|
||||||
#GRUB_CMDLINE_LINUX_DEFAULT=""
|
|
||||||
|
|
||||||
# Uncomment to disable graphical terminal (grub-pc only)
|
|
||||||
#GRUB_TERMINAL=console
|
|
||||||
|
|
||||||
# The resolution used on graphical terminal.
|
|
||||||
# Note that you can use only modes which your graphic card supports via VBE.
|
|
||||||
# You can see them in real GRUB with the command `vbeinfo'.
|
|
||||||
#GRUB_GFXMODE=640x480
|
|
||||||
|
|
||||||
# Path to theme spec txt file.
|
|
||||||
# The starfield is by default provided with use truetype.
|
|
||||||
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
|
||||||
#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
|
|
||||||
|
|
||||||
# Background image used on graphical terminal.
|
|
||||||
# Can be in various bitmap formats.
|
|
||||||
#GRUB_BACKGROUND="/boot/grub/mybackground.png"
|
|
||||||
|
|
||||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
|
||||||
#GRUB_DISABLE_LINUX_UUID=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of recovery mode menu entries
|
|
||||||
#GRUB_DISABLE_RECOVERY=true
|
|
@ -1,56 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.3 2014/09/10 14:38:39 floppym Exp $
|
|
||||||
#
|
|
||||||
# To populate all changes in this file you need to regenerate your
|
|
||||||
# grub configuration file afterwards:
|
|
||||||
# 'grub2-mkconfig -o /boot/grub/grub.cfg'
|
|
||||||
#
|
|
||||||
# See the grub info page for documentation on possible variables and
|
|
||||||
# their associated values.
|
|
||||||
|
|
||||||
GRUB_DISTRIBUTOR="Gentoo"
|
|
||||||
|
|
||||||
# Default menu entry
|
|
||||||
#GRUB_DEFAULT=0
|
|
||||||
|
|
||||||
# Boot the default entry this many seconds after the menu is displayed
|
|
||||||
#GRUB_TIMEOUT=5
|
|
||||||
#GRUB_TIMEOUT_STYLE=menu
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line
|
|
||||||
#GRUB_CMDLINE_LINUX=""
|
|
||||||
#
|
|
||||||
# Examples:
|
|
||||||
#
|
|
||||||
# Boot with network interface renaming disabled
|
|
||||||
# GRUB_CMDLINE_LINUX="net.ifnames=0"
|
|
||||||
#
|
|
||||||
# Boot with systemd instead of sysvinit (openrc)
|
|
||||||
# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line for non-recovery entries
|
|
||||||
#GRUB_CMDLINE_LINUX_DEFAULT=""
|
|
||||||
|
|
||||||
# Uncomment to disable graphical terminal (grub-pc only)
|
|
||||||
#GRUB_TERMINAL=console
|
|
||||||
|
|
||||||
# The resolution used on graphical terminal.
|
|
||||||
# Note that you can use only modes which your graphic card supports via VBE.
|
|
||||||
# You can see them in real GRUB with the command `vbeinfo'.
|
|
||||||
#GRUB_GFXMODE=640x480
|
|
||||||
|
|
||||||
# Path to theme spec txt file.
|
|
||||||
# The starfield is by default provided with use truetype.
|
|
||||||
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
|
||||||
#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
|
|
||||||
|
|
||||||
# Background image used on graphical terminal.
|
|
||||||
# Can be in various bitmap formats.
|
|
||||||
#GRUB_BACKGROUND="/boot/grub/mybackground.png"
|
|
||||||
|
|
||||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
|
||||||
#GRUB_DISABLE_LINUX_UUID=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of recovery mode menu entries
|
|
||||||
#GRUB_DISABLE_RECOVERY=true
|
|
@ -1,63 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
|
|
||||||
#
|
|
||||||
# To populate all changes in this file you need to regenerate your
|
|
||||||
# grub configuration file afterwards:
|
|
||||||
# 'grub2-mkconfig -o /boot/grub/grub.cfg'
|
|
||||||
#
|
|
||||||
# See the grub info page for documentation on possible variables and
|
|
||||||
# their associated values.
|
|
||||||
|
|
||||||
GRUB_DISTRIBUTOR="Gentoo"
|
|
||||||
|
|
||||||
# Default menu entry
|
|
||||||
#GRUB_DEFAULT=0
|
|
||||||
|
|
||||||
# Boot the default entry this many seconds after the menu is displayed
|
|
||||||
#GRUB_TIMEOUT=5
|
|
||||||
#GRUB_TIMEOUT_STYLE=menu
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line
|
|
||||||
#GRUB_CMDLINE_LINUX=""
|
|
||||||
#
|
|
||||||
# Examples:
|
|
||||||
#
|
|
||||||
# Boot with network interface renaming disabled
|
|
||||||
# GRUB_CMDLINE_LINUX="net.ifnames=0"
|
|
||||||
#
|
|
||||||
# Boot with systemd instead of sysvinit (openrc)
|
|
||||||
# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line for non-recovery entries
|
|
||||||
#GRUB_CMDLINE_LINUX_DEFAULT=""
|
|
||||||
|
|
||||||
# Uncomment to disable graphical terminal (grub-pc only)
|
|
||||||
#GRUB_TERMINAL=console
|
|
||||||
|
|
||||||
# The resolution used on graphical terminal.
|
|
||||||
# Note that you can use only modes which your graphic card supports via VBE.
|
|
||||||
# You can see them in real GRUB with the command `vbeinfo'.
|
|
||||||
#GRUB_GFXMODE=640x480
|
|
||||||
|
|
||||||
# Set to 'text' to force the Linux kernel to boot in normal text
|
|
||||||
# mode, 'keep' to preserve the graphics mode set using
|
|
||||||
# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
|
|
||||||
# graphics mode, or a sequence of these separated by commas or
|
|
||||||
# semicolons to try several modes in sequence.
|
|
||||||
#GRUB_GFXPAYLOAD_LINUX=
|
|
||||||
|
|
||||||
# Path to theme spec txt file.
|
|
||||||
# The starfield is by default provided with use truetype.
|
|
||||||
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
|
||||||
#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
|
|
||||||
|
|
||||||
# Background image used on graphical terminal.
|
|
||||||
# Can be in various bitmap formats.
|
|
||||||
#GRUB_BACKGROUND="/boot/grub/mybackground.png"
|
|
||||||
|
|
||||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
|
||||||
#GRUB_DISABLE_LINUX_UUID=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of recovery mode menu entries
|
|
||||||
#GRUB_DISABLE_RECOVERY=true
|
|
@ -1,74 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
|
|
||||||
#
|
|
||||||
# To populate all changes in this file you need to regenerate your
|
|
||||||
# grub configuration file afterwards:
|
|
||||||
# 'grub2-mkconfig -o /boot/grub/grub.cfg'
|
|
||||||
#
|
|
||||||
# See the grub info page for documentation on possible variables and
|
|
||||||
# their associated values.
|
|
||||||
|
|
||||||
GRUB_DISTRIBUTOR="Gentoo"
|
|
||||||
|
|
||||||
# Default menu entry
|
|
||||||
#GRUB_DEFAULT=0
|
|
||||||
|
|
||||||
# Boot the default entry this many seconds after the menu is displayed
|
|
||||||
#GRUB_TIMEOUT=5
|
|
||||||
#GRUB_TIMEOUT_STYLE=menu
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line
|
|
||||||
#GRUB_CMDLINE_LINUX=""
|
|
||||||
#
|
|
||||||
# Examples:
|
|
||||||
#
|
|
||||||
# Boot with network interface renaming disabled
|
|
||||||
# GRUB_CMDLINE_LINUX="net.ifnames=0"
|
|
||||||
#
|
|
||||||
# Boot with systemd instead of sysvinit (openrc)
|
|
||||||
# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
|
|
||||||
|
|
||||||
# Append parameters to the linux kernel command line for non-recovery entries
|
|
||||||
#GRUB_CMDLINE_LINUX_DEFAULT=""
|
|
||||||
|
|
||||||
# Uncomment to disable graphical terminal (grub-pc only)
|
|
||||||
#GRUB_TERMINAL=console
|
|
||||||
|
|
||||||
# The resolution used on graphical terminal.
|
|
||||||
# Note that you can use only modes which your graphic card supports via VBE.
|
|
||||||
# You can see them in real GRUB with the command `vbeinfo'.
|
|
||||||
#GRUB_GFXMODE=640x480
|
|
||||||
|
|
||||||
# Set to 'text' to force the Linux kernel to boot in normal text
|
|
||||||
# mode, 'keep' to preserve the graphics mode set using
|
|
||||||
# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
|
|
||||||
# graphics mode, or a sequence of these separated by commas or
|
|
||||||
# semicolons to try several modes in sequence.
|
|
||||||
#GRUB_GFXPAYLOAD_LINUX=
|
|
||||||
|
|
||||||
# Path to theme spec txt file.
|
|
||||||
# The starfield is by default provided with use truetype.
|
|
||||||
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
|
||||||
#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
|
|
||||||
|
|
||||||
# Background image used on graphical terminal.
|
|
||||||
# Can be in various bitmap formats.
|
|
||||||
#GRUB_BACKGROUND="/boot/grub/mybackground.png"
|
|
||||||
|
|
||||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
|
||||||
#GRUB_DISABLE_LINUX_UUID=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of recovery mode menu entries
|
|
||||||
#GRUB_DISABLE_RECOVERY=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of the submenu and put all choices on
|
|
||||||
# the top-level menu.
|
|
||||||
# Besides the visual affect of no sub menu, this makes navigation of the
|
|
||||||
# menu easier for a user who can't see the screen.
|
|
||||||
#GRUB_DISABLE_SUBMENU=y
|
|
||||||
|
|
||||||
# Uncomment to play a tone when the main menu is displayed.
|
|
||||||
# This is useful, for example, to allow users who can't see the screen
|
|
||||||
# to know when they can make a choice on the menu.
|
|
||||||
#GRUB_INIT_TUNE="60 800 1"
|
|
@ -1,6 +0,0 @@
|
|||||||
# --- /etc/distcc/hosts -----------------------
|
|
||||||
# See the "Hosts Specification" section of
|
|
||||||
# "man distcc" for the format of this file.
|
|
||||||
#
|
|
||||||
# By default, just test that it works in loopback mode.
|
|
||||||
127.0.0.1
|
|
@ -1,30 +0,0 @@
|
|||||||
# /etc/eixrc/00-eixrc
|
|
||||||
#
|
|
||||||
# All non-hidden files in /etc/eixrc
|
|
||||||
# (or a subdirectory thereof) are read in alphabetical order.
|
|
||||||
#
|
|
||||||
# In these files system-wide defaults for variables related to eix can
|
|
||||||
# be stored, i.e. the variables set in files override the built-in defaults.
|
|
||||||
# Both can be overridden by ~/.eixrc and by environment variables.
|
|
||||||
#
|
|
||||||
# It is strongly recommended to set here only those variables which you
|
|
||||||
# want to *differ* from the built-in defaults (or for which you have a
|
|
||||||
# particular reason why the default should never change with an eix update).
|
|
||||||
#
|
|
||||||
# *Otherwise you might miss changes in the defaults in newer eix versions*
|
|
||||||
# which may result in confusing behavior of the eix binaries.
|
|
||||||
#
|
|
||||||
# If you want to get a file containing the setting of all related variables
|
|
||||||
# in the current/defaults state, redirect the output of options --dump
|
|
||||||
# or --dump-defaults, respectively.
|
|
||||||
#
|
|
||||||
# However once more: To avoid unexpected problems
|
|
||||||
#
|
|
||||||
# *IT IS NOT RECOMMENDED TO SET _ALL_ VARIABLES* in /etc/eixrc/*
|
|
||||||
#
|
|
||||||
# Only set those for which you have a reason to do so!
|
|
||||||
#
|
|
||||||
# For the available variables and their defaults, see the output of the
|
|
||||||
# options --dump or --dump-defaults.
|
|
||||||
# For more detailed explanations see the manpage of eix.
|
|
||||||
|
|
@ -1,253 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
. "/usr/share/grub/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
CLASS="--class gnu-linux --class gnu --class os"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
||||||
OS=GNU/Linux
|
|
||||||
else
|
|
||||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
||||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
||||||
# the initrds that Linux uses don't like that.
|
|
||||||
case ${GRUB_DEVICE} in
|
|
||||||
/dev/loop/*|/dev/loop[0-9])
|
|
||||||
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
||||||
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
|
||||||
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
|
|
||||||
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
||||||
else
|
|
||||||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
||||||
fi
|
|
||||||
|
|
||||||
case x"$GRUB_FS" in
|
|
||||||
xbtrfs)
|
|
||||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
||||||
rootsubvol="${rootsubvol#/}"
|
|
||||||
if [ "x${rootsubvol}" != x ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi;;
|
|
||||||
xzfs)
|
|
||||||
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
||||||
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
||||||
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
linux_entry ()
|
|
||||||
{
|
|
||||||
os="$1"
|
|
||||||
version="$2"
|
|
||||||
type="$3"
|
|
||||||
args="$4"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ x$type != xsimple ] ; then
|
|
||||||
case $type in
|
|
||||||
recovery)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
|
|
||||||
*)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
|
|
||||||
esac
|
|
||||||
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
if [ x$type != xrecovery ] ; then
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use ELILO's generic "efifb" when it's known to be available.
|
|
||||||
# FIXME: We need an interface to select vesafb in case efifb can't be used.
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
|
||||||
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
|
||||||
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
|
|
||||||
|
|
||||||
if [ x$dirname = x/ ]; then
|
|
||||||
if [ -z "${prepare_root_cache}" ]; then
|
|
||||||
prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
||||||
EOF
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
||||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
initrd ${rel_dirname}/${initrd}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
machine=`uname -m`
|
|
||||||
case "x$machine" in
|
|
||||||
xi?86 | xx86_64)
|
|
||||||
list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
|
||||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
|
||||||
done` ;;
|
|
||||||
*)
|
|
||||||
list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
|
||||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
|
||||||
done` ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$machine" in
|
|
||||||
i?86) GENKERNEL_ARCH="x86" ;;
|
|
||||||
mips|mips64) GENKERNEL_ARCH="mips" ;;
|
|
||||||
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
|
|
||||||
arm*) GENKERNEL_ARCH="arm" ;;
|
|
||||||
*) GENKERNEL_ARCH="$machine" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
prepare_boot_cache=
|
|
||||||
prepare_root_cache=
|
|
||||||
boot_device_id=
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
|
|
||||||
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
|
|
||||||
submenu_indentation=""
|
|
||||||
|
|
||||||
is_top_level=true
|
|
||||||
while [ "x$list" != "x" ] ; do
|
|
||||||
linux=`version_find_latest $list`
|
|
||||||
gettext_printf "Found linux image: %s\n" "$linux" >&2
|
|
||||||
basename=`basename $linux`
|
|
||||||
dirname=`dirname $linux`
|
|
||||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
||||||
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
||||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
||||||
|
|
||||||
initrd=
|
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
|
||||||
"initrd-${version}" "initramfs-${version}.img" \
|
|
||||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
||||||
"initramfs-genkernel-${version}" \
|
|
||||||
"initramfs-genkernel-${alt_version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd="$i"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
config=
|
|
||||||
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
||||||
if test -e "${i}" ; then
|
|
||||||
config="${i}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
initramfs=
|
|
||||||
if test -n "${config}" ; then
|
|
||||||
initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
|
|
||||||
elif test -z "${initramfs}" ; then
|
|
||||||
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
|
|
||||||
# no initrd or builtin initramfs, it can't work here.
|
|
||||||
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
linux_entry "${OS}" "${version}" simple \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
|
|
||||||
submenu_indentation="$grub_tab"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: %s is replaced with an OS name
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version}" advanced \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
||||||
linux_entry "${OS}" "${version}" recovery \
|
|
||||||
"single ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
|
||||||
# add a closing '}' for the submenu command.
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$title_correction_code"
|
|
@ -1,272 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
. "/usr/share/grub/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
CLASS="--class gnu-linux --class gnu --class os --class xen"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
||||||
OS=GNU/Linux
|
|
||||||
else
|
|
||||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
||||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
||||||
# the initrds that Linux uses don't like that.
|
|
||||||
case ${GRUB_DEVICE} in
|
|
||||||
/dev/loop/*|/dev/loop[0-9])
|
|
||||||
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
||||||
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
|
||||||
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
|
|
||||||
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
||||||
else
|
|
||||||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
|
|
||||||
if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}"
|
|
||||||
fi
|
|
||||||
if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
|
|
||||||
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case x"$GRUB_FS" in
|
|
||||||
xbtrfs)
|
|
||||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
||||||
rootsubvol="${rootsubvol#/}"
|
|
||||||
if [ "x${rootsubvol}" != x ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi;;
|
|
||||||
xzfs)
|
|
||||||
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
||||||
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
||||||
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
linux_entry ()
|
|
||||||
{
|
|
||||||
os="$1"
|
|
||||||
version="$2"
|
|
||||||
xen_version="$3"
|
|
||||||
type="$4"
|
|
||||||
args="$5"
|
|
||||||
xen_args="$6"
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ x$type != xsimple ] ; then
|
|
||||||
if [ x$type = xrecovery ] ; then
|
|
||||||
title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")"
|
|
||||||
else
|
|
||||||
title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
|
|
||||||
fi
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
title="$(gettext_printf "%s, with Xen hypervisor" "${os}")"
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
if [ x$type != xrecovery ] ; then
|
|
||||||
save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
|
|
||||||
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$xmessage" | grub_quote)'
|
|
||||||
if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
|
|
||||||
xen_rm_opts=
|
|
||||||
else
|
|
||||||
xen_rm_opts="no-real-mode edd=off"
|
|
||||||
fi
|
|
||||||
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
|
|
||||||
echo '$(echo "$lmessage" | grub_quote)'
|
|
||||||
module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
|
|
||||||
EOF
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
||||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
module --nounzip ${rel_dirname}/${initrd}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
|
||||||
if grub_file_is_not_garbage "$i"; then
|
|
||||||
basename=$(basename $i)
|
|
||||||
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
|
||||||
dirname=$(dirname $i)
|
|
||||||
config=
|
|
||||||
for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
||||||
if test -e "${j}" ; then
|
|
||||||
config="${j}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
|
|
||||||
fi
|
|
||||||
done`
|
|
||||||
if [ "x${linux_list}" = "x" ] ; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
file_is_not_sym () {
|
|
||||||
case "$1" in
|
|
||||||
*/xen-syms-*)
|
|
||||||
return 1;;
|
|
||||||
*)
|
|
||||||
return 0;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
xen_list=`for i in /boot/xen*; do
|
|
||||||
if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi
|
|
||||||
done`
|
|
||||||
prepare_boot_cache=
|
|
||||||
boot_device_id=
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
machine=`uname -m`
|
|
||||||
|
|
||||||
case "$machine" in
|
|
||||||
i?86) GENKERNEL_ARCH="x86" ;;
|
|
||||||
mips|mips64) GENKERNEL_ARCH="mips" ;;
|
|
||||||
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
|
|
||||||
arm*) GENKERNEL_ARCH="arm" ;;
|
|
||||||
*) GENKERNEL_ARCH="$machine" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
|
|
||||||
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
|
|
||||||
submenu_indentation=""
|
|
||||||
|
|
||||||
is_top_level=true
|
|
||||||
|
|
||||||
while [ "x${xen_list}" != "x" ] ; do
|
|
||||||
list="${linux_list}"
|
|
||||||
current_xen=`version_find_latest $xen_list`
|
|
||||||
xen_basename=`basename ${current_xen}`
|
|
||||||
xen_dirname=`dirname ${current_xen}`
|
|
||||||
rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
|
|
||||||
xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"`
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ "x$is_top_level" != xtrue ]; then
|
|
||||||
echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
|
||||||
fi
|
|
||||||
while [ "x$list" != "x" ] ; do
|
|
||||||
linux=`version_find_latest $list`
|
|
||||||
gettext_printf "Found linux image: %s\n" "$linux" >&2
|
|
||||||
basename=`basename $linux`
|
|
||||||
dirname=`dirname $linux`
|
|
||||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
||||||
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
||||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
||||||
|
|
||||||
initrd=
|
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
|
||||||
"initrd-${version}" "initramfs-${version}.img" \
|
|
||||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
||||||
"initramfs-genkernel-${version}" \
|
|
||||||
"initramfs-genkernel-${alt_version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd="$i"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
|
|
||||||
else
|
|
||||||
# "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
|
|
||||||
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" simple \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
|
||||||
|
|
||||||
submenu_indentation="$grub_tab$grub_tab"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: %s is replaced with an OS name
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
||||||
echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" advanced \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
|
||||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" recovery \
|
|
||||||
"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo ' }'
|
|
||||||
fi
|
|
||||||
xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
|
||||||
# add a closing '}' for the submenu command.
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$title_correction_code"
|
|
@ -1,326 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
. "/usr/share/grub/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev/null`" ] ; then
|
|
||||||
# missing os-prober and/or linux-boot-prober
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
|
|
||||||
if [ -z "${OSPROBED}" ] ; then
|
|
||||||
# empty os-prober output, nothing doing
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
osx_entry() {
|
|
||||||
if [ x$2 = x32 ]; then
|
|
||||||
# TRANSLATORS: it refers to kernel architecture (32-bit)
|
|
||||||
bitstr="$(gettext "(32-bit)")"
|
|
||||||
else
|
|
||||||
# TRANSLATORS: it refers to kernel architecture (64-bit)
|
|
||||||
bitstr="$(gettext "(64-bit)")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: it refers on the OS residing on device %s
|
|
||||||
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
|
||||||
cat << EOF
|
|
||||||
load_video
|
|
||||||
set do_resume=0
|
|
||||||
if [ /var/vm/sleepimage -nt10 / ]; then
|
|
||||||
if xnu_resume /var/vm/sleepimage; then
|
|
||||||
set do_resume=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ \$do_resume = 0 ]; then
|
|
||||||
xnu_uuid ${OSXUUID} uuid
|
|
||||||
if [ -f /Extra/DSDT.aml ]; then
|
|
||||||
acpi -e /Extra/DSDT.aml
|
|
||||||
fi
|
|
||||||
if [ /kernelcache -nt /System/Library/Extensions ]; then
|
|
||||||
$1 /kernelcache boot-uuid=\${uuid} rd=*uuid
|
|
||||||
else
|
|
||||||
$1 /mach_kernel boot-uuid=\${uuid} rd=*uuid
|
|
||||||
if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
|
|
||||||
xnu_mkext /System/Library/Extensions.mkext
|
|
||||||
else
|
|
||||||
xnu_kextdir /System/Library/Extensions
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ -f /Extra/Extensions.mkext ]; then
|
|
||||||
xnu_mkext /Extra/Extensions.mkext
|
|
||||||
fi
|
|
||||||
if [ -d /Extra/Extensions ]; then
|
|
||||||
xnu_kextdir /Extra/Extensions
|
|
||||||
fi
|
|
||||||
if [ -f /Extra/devprop.bin ]; then
|
|
||||||
xnu_devprop_load /Extra/devprop.bin
|
|
||||||
fi
|
|
||||||
if [ -f /Extra/splash.jpg ]; then
|
|
||||||
insmod jpeg
|
|
||||||
xnu_splash /Extra/splash.jpg
|
|
||||||
fi
|
|
||||||
if [ -f /Extra/splash.png ]; then
|
|
||||||
insmod png
|
|
||||||
xnu_splash /Extra/splash.png
|
|
||||||
fi
|
|
||||||
if [ -f /Extra/splash.tga ]; then
|
|
||||||
insmod tga
|
|
||||||
xnu_splash /Extra/splash.tga
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
used_osprober_linux_ids=
|
|
||||||
|
|
||||||
for OS in ${OSPROBED} ; do
|
|
||||||
DEVICE="`echo ${OS} | cut -d ':' -f 1`"
|
|
||||||
LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`"
|
|
||||||
LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`"
|
|
||||||
BOOT="`echo ${OS} | cut -d ':' -f 4`"
|
|
||||||
UUID="`${grub_probe} --target=fs_uuid --device ${DEVICE%@*}`"
|
|
||||||
EXPUUID="$UUID"
|
|
||||||
|
|
||||||
if [ x"${DEVICE#*@}" != x ] ; then
|
|
||||||
EXPUUID="${EXPUUID}@${DEVICE#*@}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" -a "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
|
|
||||||
echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
BTRFS="`echo ${OS} | cut -d ':' -f 5`"
|
|
||||||
if [ "x$BTRFS" = "xbtrfs" ]; then
|
|
||||||
BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`"
|
|
||||||
BTRFSsubvol="`echo ${OS} | cut -d ':' -f 7`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${LONGNAME}" ] ; then
|
|
||||||
LONGNAME="${LABEL}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
|
|
||||||
|
|
||||||
case ${BOOT} in
|
|
||||||
chain)
|
|
||||||
|
|
||||||
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
|
||||||
|
|
||||||
if [ x"`${grub_probe} --device ${DEVICE} --target=partmap`" = xmsdos ]; then
|
|
||||||
cat << EOF
|
|
||||||
parttool \${root} hidden-
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
case ${LONGNAME} in
|
|
||||||
Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
cat << EOF
|
|
||||||
drivemap -s (hd0) \${root}
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
cat <<EOF
|
|
||||||
chainloader +1
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
efi)
|
|
||||||
|
|
||||||
EFIPATH=${DEVICE#*@}
|
|
||||||
DEVICE=${DEVICE%@*}
|
|
||||||
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | sed -e "s/^/\t/"
|
|
||||||
prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
|
|
||||||
|
|
||||||
cat <<EOF
|
|
||||||
chainloader ${EFIPATH}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
linux)
|
|
||||||
if [ "x$BTRFS" = "xbtrfs" ]; then
|
|
||||||
LINUXPROBED="`linux-boot-prober btrfs ${BTRFSuuid} ${BTRFSsubvol} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
|
|
||||||
else
|
|
||||||
LINUXPROBED="`linux-boot-prober ${DEVICE} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
|
|
||||||
fi
|
|
||||||
prepare_boot_cache=
|
|
||||||
boot_device_id=
|
|
||||||
is_top_level=true
|
|
||||||
title_correction_code=
|
|
||||||
OS="${LONGNAME}"
|
|
||||||
|
|
||||||
for LINUX in ${LINUXPROBED} ; do
|
|
||||||
LROOT="`echo ${LINUX} | cut -d ':' -f 1`"
|
|
||||||
LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
|
|
||||||
LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
|
|
||||||
LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
|
|
||||||
LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
|
|
||||||
LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
|
|
||||||
|
|
||||||
if [ -z "${LLABEL}" ] ; then
|
|
||||||
LLABEL="${LONGNAME}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${LROOT}" != "${LBOOT}" ]; then
|
|
||||||
LKERNEL="${LKERNEL#/boot}"
|
|
||||||
LINITRD="${LINITRD#/boot}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
||||||
recovery_params="$(echo "${LPARAMS}" | grep single)" || true
|
|
||||||
counter=1
|
|
||||||
while echo "$used_osprober_linux_ids" | grep 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id' > /dev/null; do
|
|
||||||
counter=$((counter+1));
|
|
||||||
done
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${DEVICE}")"
|
|
||||||
fi
|
|
||||||
used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'"
|
|
||||||
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "$OS $onstr" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
printf '%s\n' "${prepare_boot_cache}"
|
|
||||||
cat << EOF
|
|
||||||
linux ${LKERNEL} ${LPARAMS}
|
|
||||||
EOF
|
|
||||||
if [ -n "${LINITRD}" ] ; then
|
|
||||||
cat << EOF
|
|
||||||
initrd ${LINITRD}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
cat << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
title="${LLABEL} $onstr"
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
|
|
||||||
cat << EOF
|
|
||||||
linux ${LKERNEL} ${LPARAMS}
|
|
||||||
EOF
|
|
||||||
if [ -n "${LINITRD}" ] ; then
|
|
||||||
cat << EOF
|
|
||||||
initrd ${LINITRD}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
cat << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS} $onstr" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
echo "$title_correction_code"
|
|
||||||
;;
|
|
||||||
macosx)
|
|
||||||
OSXUUID="${UUID}"
|
|
||||||
osx_entry xnu_kernel 32
|
|
||||||
osx_entry xnu_kernel64 64
|
|
||||||
;;
|
|
||||||
hurd)
|
|
||||||
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
|
||||||
cat << EOF
|
|
||||||
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
|
|
||||||
EOF
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
|
||||||
grub_device="`${grub_probe} --device ${DEVICE} --target=drive`"
|
|
||||||
mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
|
|
||||||
grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
|
|
||||||
case "${grub_fs}" in
|
|
||||||
*fs) hurd_fs="${grub_fs}" ;;
|
|
||||||
*) hurd_fs="${grub_fs}fs" ;;
|
|
||||||
esac
|
|
||||||
cat << EOF
|
|
||||||
multiboot /boot/gnumach.gz root=device:${mach_device}
|
|
||||||
module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
|
|
||||||
--multiboot-command-line='\${kernel-command-line}' \\
|
|
||||||
--host-priv-port='\${host-port}' \\
|
|
||||||
--device-master-port='\${device-port}' \\
|
|
||||||
--exec-server-task='\${exec-task}' -T typed '\${root}' \\
|
|
||||||
'\$(task-create)' '\$(task-resume)'
|
|
||||||
module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
minix)
|
|
||||||
cat << EOF
|
|
||||||
menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" {
|
|
||||||
EOF
|
|
||||||
save_default_entry | sed -e "s/^/\t/"
|
|
||||||
prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
|
|
||||||
cat << EOF
|
|
||||||
multiboot /boot/image_latest
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# TRANSLATORS: %s is replaced by OS name.
|
|
||||||
gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
@ -1,257 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
. "/usr/share/grub/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
CLASS="--class gnu-linux --class gnu --class os"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
||||||
OS=GNU/Linux
|
|
||||||
else
|
|
||||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
||||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
||||||
# the initrds that Linux uses don't like that.
|
|
||||||
case ${GRUB_DEVICE} in
|
|
||||||
/dev/loop/*|/dev/loop[0-9])
|
|
||||||
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
||||||
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
|
||||||
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
|
|
||||||
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
||||||
else
|
|
||||||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
||||||
fi
|
|
||||||
|
|
||||||
case x"$GRUB_FS" in
|
|
||||||
xbtrfs)
|
|
||||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
||||||
rootsubvol="${rootsubvol#/}"
|
|
||||||
if [ "x${rootsubvol}" != x ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi;;
|
|
||||||
xzfs)
|
|
||||||
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
||||||
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
||||||
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
linux_entry ()
|
|
||||||
{
|
|
||||||
os="$1"
|
|
||||||
version="$2"
|
|
||||||
type="$3"
|
|
||||||
args="$4"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ x$type != xsimple ] ; then
|
|
||||||
case $type in
|
|
||||||
recovery)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
|
|
||||||
*)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
|
|
||||||
esac
|
|
||||||
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
if [ x$type != xrecovery ] ; then
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use ELILO's generic "efifb" when it's known to be available.
|
|
||||||
# FIXME: We need an interface to select vesafb in case efifb can't be used.
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
|
||||||
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
|
||||||
echo ' if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
|
|
||||||
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
|
||||||
echo ' fi' | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
|
|
||||||
|
|
||||||
if [ x$dirname = x/ ]; then
|
|
||||||
if [ -z "${prepare_root_cache}" ]; then
|
|
||||||
prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
||||||
EOF
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
||||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
initrd ${rel_dirname}/${initrd}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
machine=`uname -m`
|
|
||||||
case "x$machine" in
|
|
||||||
xi?86 | xx86_64)
|
|
||||||
list=
|
|
||||||
for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
|
||||||
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
|
||||||
done ;;
|
|
||||||
*)
|
|
||||||
list=
|
|
||||||
for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
|
||||||
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
|
||||||
done ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$machine" in
|
|
||||||
i?86) GENKERNEL_ARCH="x86" ;;
|
|
||||||
mips|mips64) GENKERNEL_ARCH="mips" ;;
|
|
||||||
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
|
|
||||||
arm*) GENKERNEL_ARCH="arm" ;;
|
|
||||||
*) GENKERNEL_ARCH="$machine" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
prepare_boot_cache=
|
|
||||||
prepare_root_cache=
|
|
||||||
boot_device_id=
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
|
|
||||||
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
|
|
||||||
submenu_indentation=""
|
|
||||||
|
|
||||||
is_top_level=true
|
|
||||||
while [ "x$list" != "x" ] ; do
|
|
||||||
linux=`version_find_latest $list`
|
|
||||||
gettext_printf "Found linux image: %s\n" "$linux" >&2
|
|
||||||
basename=`basename $linux`
|
|
||||||
dirname=`dirname $linux`
|
|
||||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
||||||
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
||||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
||||||
|
|
||||||
initrd=
|
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
|
||||||
"initrd-${version}" "initramfs-${version}.img" \
|
|
||||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
||||||
"initramfs-genkernel-${version}" \
|
|
||||||
"initramfs-genkernel-${alt_version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd="$i"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
config=
|
|
||||||
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
||||||
if test -e "${i}" ; then
|
|
||||||
config="${i}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
initramfs=
|
|
||||||
if test -n "${config}" ; then
|
|
||||||
initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
|
|
||||||
elif test -z "${initramfs}" ; then
|
|
||||||
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
|
|
||||||
# no initrd or builtin initramfs, it can't work here.
|
|
||||||
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
linux_entry "${OS}" "${version}" simple \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
|
|
||||||
submenu_indentation="$grub_tab"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: %s is replaced with an OS name
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version}" advanced \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
||||||
linux_entry "${OS}" "${version}" recovery \
|
|
||||||
"single ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
|
||||||
# add a closing '}' for the submenu command.
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$title_correction_code"
|
|
@ -1,274 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
. "/usr/share/grub/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
CLASS="--class gnu-linux --class gnu --class os --class xen"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
||||||
OS=GNU/Linux
|
|
||||||
else
|
|
||||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
||||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
||||||
# the initrds that Linux uses don't like that.
|
|
||||||
case ${GRUB_DEVICE} in
|
|
||||||
/dev/loop/*|/dev/loop[0-9])
|
|
||||||
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
||||||
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
|
||||||
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
|
|
||||||
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
||||||
else
|
|
||||||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
|
|
||||||
if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}"
|
|
||||||
fi
|
|
||||||
if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
|
|
||||||
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case x"$GRUB_FS" in
|
|
||||||
xbtrfs)
|
|
||||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
||||||
rootsubvol="${rootsubvol#/}"
|
|
||||||
if [ "x${rootsubvol}" != x ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi;;
|
|
||||||
xzfs)
|
|
||||||
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
||||||
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
||||||
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
linux_entry ()
|
|
||||||
{
|
|
||||||
os="$1"
|
|
||||||
version="$2"
|
|
||||||
xen_version="$3"
|
|
||||||
type="$4"
|
|
||||||
args="$5"
|
|
||||||
xen_args="$6"
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ x$type != xsimple ] ; then
|
|
||||||
if [ x$type = xrecovery ] ; then
|
|
||||||
title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")"
|
|
||||||
else
|
|
||||||
title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
|
|
||||||
fi
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
title="$(gettext_printf "%s, with Xen hypervisor" "${os}")"
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
if [ x$type != xrecovery ] ; then
|
|
||||||
save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
|
|
||||||
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$xmessage" | grub_quote)'
|
|
||||||
if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
|
|
||||||
xen_rm_opts=
|
|
||||||
else
|
|
||||||
xen_rm_opts="no-real-mode edd=off"
|
|
||||||
fi
|
|
||||||
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
|
|
||||||
echo '$(echo "$lmessage" | grub_quote)'
|
|
||||||
module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
|
|
||||||
EOF
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
||||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
module --nounzip ${rel_dirname}/${initrd}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
linux_list=
|
|
||||||
for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
|
||||||
if grub_file_is_not_garbage "$i"; then
|
|
||||||
basename=$(basename $i)
|
|
||||||
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
|
||||||
dirname=$(dirname $i)
|
|
||||||
config=
|
|
||||||
for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
||||||
if test -e "${j}" ; then
|
|
||||||
config="${j}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ "x${linux_list}" = "x" ] ; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
file_is_not_sym () {
|
|
||||||
case "$1" in
|
|
||||||
*/xen-syms-*)
|
|
||||||
return 1;;
|
|
||||||
*)
|
|
||||||
return 0;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
xen_list=
|
|
||||||
for i in /boot/xen*; do
|
|
||||||
if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi
|
|
||||||
done
|
|
||||||
prepare_boot_cache=
|
|
||||||
boot_device_id=
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
machine=`uname -m`
|
|
||||||
|
|
||||||
case "$machine" in
|
|
||||||
i?86) GENKERNEL_ARCH="x86" ;;
|
|
||||||
mips|mips64) GENKERNEL_ARCH="mips" ;;
|
|
||||||
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
|
|
||||||
arm*) GENKERNEL_ARCH="arm" ;;
|
|
||||||
*) GENKERNEL_ARCH="$machine" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
|
|
||||||
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
|
|
||||||
submenu_indentation=""
|
|
||||||
|
|
||||||
is_top_level=true
|
|
||||||
|
|
||||||
while [ "x${xen_list}" != "x" ] ; do
|
|
||||||
list="${linux_list}"
|
|
||||||
current_xen=`version_find_latest $xen_list`
|
|
||||||
xen_basename=`basename ${current_xen}`
|
|
||||||
xen_dirname=`dirname ${current_xen}`
|
|
||||||
rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
|
|
||||||
xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"`
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ "x$is_top_level" != xtrue ]; then
|
|
||||||
echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
|
||||||
fi
|
|
||||||
while [ "x$list" != "x" ] ; do
|
|
||||||
linux=`version_find_latest $list`
|
|
||||||
gettext_printf "Found linux image: %s\n" "$linux" >&2
|
|
||||||
basename=`basename $linux`
|
|
||||||
dirname=`dirname $linux`
|
|
||||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
||||||
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
||||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
||||||
|
|
||||||
initrd=
|
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
|
||||||
"initrd-${version}" "initramfs-${version}.img" \
|
|
||||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
||||||
"initramfs-genkernel-${version}" \
|
|
||||||
"initramfs-genkernel-${alt_version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd="$i"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
|
|
||||||
else
|
|
||||||
# "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
|
|
||||||
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" simple \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
|
||||||
|
|
||||||
submenu_indentation="$grub_tab$grub_tab"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: %s is replaced with an OS name
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
||||||
echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" advanced \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
|
||||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
||||||
linux_entry "${OS}" "${version}" "${xen_version}" recovery \
|
|
||||||
"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo ' }'
|
|
||||||
fi
|
|
||||||
xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
|
||||||
# add a closing '}' for the submenu command.
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$title_correction_code"
|
|
@ -104,7 +104,9 @@ linux_entry ()
|
|||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
echo " load_video" | sed "s/^/$submenu_indentation/"
|
||||||
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
||||||
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
||||||
|
echo ' if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
|
||||||
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
||||||
|
echo ' fi' | sed "s/^/$submenu_indentation/"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
||||||
@ -147,13 +149,15 @@ EOF
|
|||||||
machine=`uname -m`
|
machine=`uname -m`
|
||||||
case "x$machine" in
|
case "x$machine" in
|
||||||
xi?86 | xx86_64)
|
xi?86 | xx86_64)
|
||||||
list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
list=
|
||||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||||
done` ;;
|
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
||||||
|
done ;;
|
||||||
*)
|
*)
|
||||||
list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
list=
|
||||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||||
done` ;;
|
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
|
||||||
|
done ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$machine" in
|
case "$machine" in
|
||||||
@ -241,7 +245,7 @@ while [ "x$list" != "x" ] ; do
|
|||||||
"single ${GRUB_CMDLINE_LINUX}"
|
"single ${GRUB_CMDLINE_LINUX}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
|
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
||||||
done
|
done
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
# If at least one kernel was found, then we need to
|
||||||
|
@ -137,7 +137,8 @@ EOF
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
linux_list=
|
||||||
|
for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
||||||
if grub_file_is_not_garbage "$i"; then
|
if grub_file_is_not_garbage "$i"; then
|
||||||
basename=$(basename $i)
|
basename=$(basename $i)
|
||||||
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
||||||
@ -149,9 +150,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
|||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
|
if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi
|
||||||
fi
|
fi
|
||||||
done`
|
done
|
||||||
if [ "x${linux_list}" = "x" ] ; then
|
if [ "x${linux_list}" = "x" ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@ -165,9 +166,10 @@ file_is_not_sym () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
xen_list=`for i in /boot/xen*; do
|
xen_list=
|
||||||
if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi
|
for i in /boot/xen*; do
|
||||||
done`
|
if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi
|
||||||
|
done
|
||||||
prepare_boot_cache=
|
prepare_boot_cache=
|
||||||
boot_device_id=
|
boot_device_id=
|
||||||
|
|
||||||
@ -255,12 +257,12 @@ while [ "x${xen_list}" != "x" ] ; do
|
|||||||
"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
|
"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
|
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
||||||
done
|
done
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
if [ x"$is_top_level" != xtrue ]; then
|
||||||
echo ' }'
|
echo ' }'
|
||||||
fi
|
fi
|
||||||
xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '`
|
xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
|
||||||
done
|
done
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
# If at least one kernel was found, then we need to
|
||||||
|
@ -319,7 +319,6 @@ EOF
|
|||||||
EOF
|
EOF
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo -n " "
|
|
||||||
# TRANSLATORS: %s is replaced by OS name.
|
# TRANSLATORS: %s is replaced by OS name.
|
||||||
gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
|
gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
|
||||||
;;
|
;;
|
||||||
|
@ -1,109 +0,0 @@
|
|||||||
# Hiawatha main configuration file
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# GENERAL SETTINGS
|
|
||||||
#
|
|
||||||
ServerId = hiawatha
|
|
||||||
ConnectionsTotal = 250
|
|
||||||
ConnectionsPerIP = 25
|
|
||||||
SystemLogfile = /var/log/hiawatha/system.log
|
|
||||||
GarbageLogfile = /var/log/hiawatha/garbage.log
|
|
||||||
|
|
||||||
|
|
||||||
# BINDING SETTINGS
|
|
||||||
# A binding is where a client can connect to.
|
|
||||||
#
|
|
||||||
Binding {
|
|
||||||
Port = 80
|
|
||||||
# Interface = 127.0.0.1
|
|
||||||
# MaxKeepAlive = 30
|
|
||||||
# TimeForRequest = 3,20
|
|
||||||
}
|
|
||||||
#
|
|
||||||
#Binding {
|
|
||||||
# Port = 443
|
|
||||||
# Interface = ::1
|
|
||||||
# MaxKeepAlive = 30
|
|
||||||
# TimeForRequest = 3,20
|
|
||||||
# SSLcertFile = hiawatha.pem
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
# BANNING SETTINGS
|
|
||||||
# Deny service to clients who misbehave.
|
|
||||||
#
|
|
||||||
#BanOnGarbage = 300
|
|
||||||
#BanOnMaxPerIP = 60
|
|
||||||
#BanOnMaxReqSize = 300
|
|
||||||
#KickOnBan = yes
|
|
||||||
#RebanDuringBan = yes
|
|
||||||
|
|
||||||
|
|
||||||
# COMMON GATEWAY INTERFACE (CGI) SETTINGS
|
|
||||||
# These settings can be used to run CGI applications.
|
|
||||||
#
|
|
||||||
#CGIhandler = /usr/bin/perl:pl
|
|
||||||
#CGIhandler = /usr/bin/php-cgi:php
|
|
||||||
#CGIhandler = /usr/bin/python:py
|
|
||||||
#CGIhandler = /usr/bin/ruby:rb
|
|
||||||
#CGIhandler = /usr/bin/ssi-cgi:shtml
|
|
||||||
#CGIextension = cgi
|
|
||||||
#
|
|
||||||
#FastCGIserver {
|
|
||||||
# FastCGIid = PHP5
|
|
||||||
# ConnectTo = 127.0.0.1:2005
|
|
||||||
# Extension = php
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
# URL TOOLKIT
|
|
||||||
# This URL toolkit rule was made for the Banshee PHP framework, which
|
|
||||||
# can be downloaded from http://www.hiawatha-webserver.org/banshee
|
|
||||||
#
|
|
||||||
#UrlToolkit {
|
|
||||||
# ToolkitID = banshee
|
|
||||||
# RequestURI isfile Return
|
|
||||||
# Match ^/(css|files|images|js|slimstat)($|/) Return
|
|
||||||
# Match ^/(favicon.ico|robots.txt|sitemap.xml)$ Return
|
|
||||||
# Match .*\?(.*) Rewrite /index.php?$1
|
|
||||||
# Match .* Rewrite /index.php
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
# DEFAULT WEBSITE
|
|
||||||
# It is wise to use your IP address as the hostname of the default website
|
|
||||||
# and give it a blank webpage. By doing so, automated webscanners won't find
|
|
||||||
# your possible vulnerable website.
|
|
||||||
#
|
|
||||||
Hostname = 127.0.0.1
|
|
||||||
WebsiteRoot = /var/www/hiawatha
|
|
||||||
StartFile = index.html
|
|
||||||
AccessLogfile = /var/log/hiawatha/access.log
|
|
||||||
ErrorLogfile = /var/log/hiawatha/error.log
|
|
||||||
#ErrorHandler = 404:/error.cgi
|
|
||||||
|
|
||||||
|
|
||||||
# VIRTUAL HOSTS
|
|
||||||
# Use a VirtualHost section to declare the websites you want to host.
|
|
||||||
#
|
|
||||||
#VirtualHost {
|
|
||||||
# Hostname = www.my-domain.com
|
|
||||||
# WebsiteRoot = /var/www/my-domain/public
|
|
||||||
# StartFile = index.php
|
|
||||||
# AccessLogfile = /var/www/my-domain/log/access.log
|
|
||||||
# ErrorLogfile = /var/www/my-domain/log/error.log
|
|
||||||
# TimeForCGI = 5
|
|
||||||
# UseFastCGI = PHP5
|
|
||||||
# UseToolkit = banshee
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
# DIRECTORY SETTINGS
|
|
||||||
# You can specify some settings per directory.
|
|
||||||
#
|
|
||||||
#Directory {
|
|
||||||
# Path = /home/baduser
|
|
||||||
# ExecuteCGI = no
|
|
||||||
# UploadSpeed = 10,2
|
|
||||||
#}
|
|
@ -16,7 +16,7 @@ GarbageLogfile = /var/log/hiawatha/garbage.log
|
|||||||
#
|
#
|
||||||
Binding {
|
Binding {
|
||||||
Port = 80
|
Port = 80
|
||||||
Interface = 127.0.0.1
|
# Interface = 127.0.0.1
|
||||||
# MaxKeepAlive = 30
|
# MaxKeepAlive = 30
|
||||||
# TimeForRequest = 3,20
|
# TimeForRequest = 3,20
|
||||||
}
|
}
|
||||||
@ -87,17 +87,16 @@ ErrorLogfile = /var/log/hiawatha/error.log
|
|||||||
# VIRTUAL HOSTS
|
# VIRTUAL HOSTS
|
||||||
# Use a VirtualHost section to declare the websites you want to host.
|
# Use a VirtualHost section to declare the websites you want to host.
|
||||||
#
|
#
|
||||||
VirtualHost {
|
#VirtualHost {
|
||||||
Hostname = localhost
|
# Hostname = www.my-domain.com
|
||||||
WebsiteRoot = /var/www/hiawatha
|
# WebsiteRoot = /var/www/my-domain/public
|
||||||
StartFile = index.html
|
# StartFile = index.php
|
||||||
AccessLogfile = /var/log/hiawatha/access.log
|
# AccessLogfile = /var/www/my-domain/log/access.log
|
||||||
ErrorLogfile = /var/log/hiawatha/access.log
|
# ErrorLogfile = /var/www/my-domain/log/error.log
|
||||||
Alias = /random:/var/www/hiawatha
|
|
||||||
# TimeForCGI = 5
|
# TimeForCGI = 5
|
||||||
# UseFastCGI = PHP5
|
# UseFastCGI = PHP5
|
||||||
# UseToolkit = banshee
|
# UseToolkit = banshee
|
||||||
}
|
#}
|
||||||
|
|
||||||
|
|
||||||
# DIRECTORY SETTINGS
|
# DIRECTORY SETTINGS
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
#
|
|
||||||
# disk/post-start
|
|
||||||
#
|
|
||||||
|
|
||||||
for dev in $(ata.bash); do
|
|
||||||
echo cfq >$dev/queue/scheduler
|
|
||||||
echo 0 >$dev/queue/iosched/slice_idle
|
|
||||||
echo 64 >$dev/queue/iosched/quantum
|
|
||||||
# more opitmizations with ncq
|
|
||||||
echo 1024 >$dev/queue/nr_requests
|
|
||||||
echo 2 >$dev/device/queue_depth
|
|
||||||
done
|
|
||||||
unset dev
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -2,11 +2,7 @@
|
|||||||
# disk/post-start
|
# disk/post-start
|
||||||
#
|
#
|
||||||
|
|
||||||
function _ata {
|
for dev in $(ata.bash); do
|
||||||
source "$ata_bash"
|
|
||||||
}
|
|
||||||
|
|
||||||
for dev in $(_ata); do
|
|
||||||
echo cfq >$dev/queue/scheduler
|
echo cfq >$dev/queue/scheduler
|
||||||
echo 0 >$dev/queue/iosched/slice_idle
|
echo 0 >$dev/queue/iosched/slice_idle
|
||||||
echo 64 >$dev/queue/iosched/quantum
|
echo 64 >$dev/queue/iosched/quantum
|
||||||
@ -14,8 +10,7 @@ for dev in $(_ata); do
|
|||||||
echo 1024 >$dev/queue/nr_requests
|
echo 1024 >$dev/queue/nr_requests
|
||||||
echo 2 >$dev/device/queue_depth
|
echo 2 >$dev/device/queue_depth
|
||||||
done
|
done
|
||||||
|
unset dev
|
||||||
unset _ata dev
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# disk/scripts/adp.start
|
|
||||||
#
|
|
||||||
|
|
||||||
usb.bash
|
|
||||||
|
|
||||||
ata="$(ata.bash)"
|
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B230 -M254 $ata
|
|
||||||
unset ata
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# disk/scripts/bat.start
|
|
||||||
#
|
|
||||||
|
|
||||||
usb.bash
|
|
||||||
|
|
||||||
ata="$(ata.bash)"
|
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B210 -M230 $ata
|
|
||||||
unset ata
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# disk/scripts/dyn.start
|
|
||||||
#
|
|
||||||
|
|
||||||
usb.bash
|
|
||||||
|
|
||||||
ata="$(ata.bash)"
|
|
||||||
[[ "$ata" ]] && hdparm -q -S180 -B254 -M254 $ata
|
|
||||||
unset ata
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# disk/scripts/quiet.start
|
|
||||||
#
|
|
||||||
|
|
||||||
usb.bash
|
|
||||||
|
|
||||||
ata="$(ata.bash)"
|
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B200 -M200 $ata
|
|
||||||
unset ata
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -2,19 +2,11 @@
|
|||||||
# disk/scripts/adp.start
|
# disk/scripts/adp.start
|
||||||
#
|
#
|
||||||
|
|
||||||
function _usb {
|
usb.bash
|
||||||
source "$usb_bash"
|
|
||||||
}
|
|
||||||
_usb
|
|
||||||
|
|
||||||
function _ata {
|
|
||||||
source "$ata_bash"
|
|
||||||
}
|
|
||||||
ata=$(_ata)
|
|
||||||
|
|
||||||
|
ata="$(ata.bash)"
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B230 -M254 $ata
|
[[ "$ata" ]] && hdparm -q -S120 -B230 -M254 $ata
|
||||||
|
unset ata
|
||||||
unset _ata _usb ata
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -2,19 +2,11 @@
|
|||||||
# disk/scripts/bat.start
|
# disk/scripts/bat.start
|
||||||
#
|
#
|
||||||
|
|
||||||
function _usb {
|
usb.bash
|
||||||
source "$usb_bash"
|
|
||||||
}
|
|
||||||
_usb
|
|
||||||
|
|
||||||
function _ata {
|
|
||||||
source "$ata_bash"
|
|
||||||
}
|
|
||||||
ata=$(_ata)
|
|
||||||
|
|
||||||
|
ata="$(ata.bash)"
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B210 -M230 $ata
|
[[ "$ata" ]] && hdparm -q -S120 -B210 -M230 $ata
|
||||||
|
unset ata
|
||||||
unset _ata _usb ata
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -2,19 +2,11 @@
|
|||||||
# disk/scripts/dyn.start
|
# disk/scripts/dyn.start
|
||||||
#
|
#
|
||||||
|
|
||||||
function _usb {
|
usb.bash
|
||||||
source "$usb_bash"
|
|
||||||
}
|
|
||||||
_usb
|
|
||||||
|
|
||||||
function _ata {
|
|
||||||
source "$ata_bash"
|
|
||||||
}
|
|
||||||
ata=$(_ata)
|
|
||||||
|
|
||||||
|
ata="$(ata.bash)"
|
||||||
[[ "$ata" ]] && hdparm -q -S180 -B254 -M254 $ata
|
[[ "$ata" ]] && hdparm -q -S180 -B254 -M254 $ata
|
||||||
|
unset ata
|
||||||
unset _ata _usb ata
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -2,19 +2,11 @@
|
|||||||
# disk/scripts/quiet.start
|
# disk/scripts/quiet.start
|
||||||
#
|
#
|
||||||
|
|
||||||
function _usb {
|
usb.bash
|
||||||
source "$usb_bash"
|
|
||||||
}
|
|
||||||
_usb
|
|
||||||
|
|
||||||
function _ata {
|
|
||||||
source "$ata_bash"
|
|
||||||
}
|
|
||||||
ata=$(_ata)
|
|
||||||
|
|
||||||
|
ata="$(ata.bash)"
|
||||||
[[ "$ata" ]] && hdparm -q -S120 -B200 -M200 $ata
|
[[ "$ata" ]] && hdparm -q -S120 -B200 -M200 $ata
|
||||||
|
unset ata
|
||||||
unset _ata _usb ata
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -1 +0,0 @@
|
|||||||
adp
|
|
@ -1,5 +0,0 @@
|
|||||||
adp
|
|
||||||
bat
|
|
||||||
dyn
|
|
||||||
med
|
|
||||||
quiet
|
|
@ -1,17 +0,0 @@
|
|||||||
#
|
|
||||||
# power/ptest
|
|
||||||
#
|
|
||||||
|
|
||||||
local state="$(echo /sys/class/power_supply/A*)"
|
|
||||||
|
|
||||||
if test -n "$state" -a -r "$state"; then
|
|
||||||
state=$(< "$state")
|
|
||||||
case "$state" in
|
|
||||||
(1) echo "adp";;
|
|
||||||
(0) echo "bat";;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1 +1 @@
|
|||||||
AC
|
adp
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
AC
|
adp
|
||||||
Medium
|
bat
|
||||||
Battery
|
dyn
|
||||||
Dynamic
|
med
|
||||||
|
quiet
|
||||||
|
29
hprofile/profiles/power/ptest
Executable file → Normal file
29
hprofile/profiles/power/ptest
Executable file → Normal file
@ -1,22 +1,17 @@
|
|||||||
#!/bin/bash
|
#
|
||||||
|
# power/ptest
|
||||||
|
#
|
||||||
|
|
||||||
# This script should echo only the name of the profile that should be used
|
local state="$(echo /sys/class/power_supply/A*)"
|
||||||
# It should assume it is called before any other scripts. In particular, it
|
|
||||||
# cannot rely on environment variables set in /etc/profile or elsewhere. The
|
|
||||||
# script may assume it will be run as root.
|
|
||||||
|
|
||||||
profile="AC"
|
if test -n "$state" -a -r "$state"; then
|
||||||
|
state=$(< "$state")
|
||||||
if test -f /proc/acpi/ac_adapter/AC0/state ; then
|
case "$state" in
|
||||||
status="$(cat /proc/acpi/ac_adapter/AC0/state)"
|
(1) echo "adp";;
|
||||||
case "${status}" in
|
(0) echo "bat";;
|
||||||
*on-line)
|
|
||||||
profile="AC"
|
|
||||||
;;
|
|
||||||
*off-line)
|
|
||||||
profile="Battery"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "${profile}"
|
#
|
||||||
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
#
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/post-start
|
|
||||||
#
|
|
||||||
|
|
||||||
[[ -x /etc/init.d/consolefont ]] &&
|
|
||||||
/etc/init.d/consolefont restart
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -2,6 +2,7 @@
|
|||||||
# vga/post-start
|
# vga/post-start
|
||||||
#
|
#
|
||||||
|
|
||||||
|
[[ -x /etc/init.d/consolefont ]] &&
|
||||||
/etc/init.d/consolefont restart
|
/etc/init.d/consolefont restart
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/fglrx.start
|
|
||||||
#
|
|
||||||
|
|
||||||
modprobe uvesafb > /dev/null 2>&1
|
|
||||||
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
|
||||||
|
|
||||||
[[ $(eselect opengl show) != ati ]] && eselect opengl set ati
|
|
||||||
[[ $(eselect xvmc show) != ati ]] && eselect xvmc set ati
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/fglrx.stop
|
|
||||||
#
|
|
||||||
|
|
||||||
rmmod ${1} || die "Failed to remove ${1} module"
|
|
||||||
#
|
|
||||||
# FIXME: Is this necessary? Comment out if necessary.
|
|
||||||
#
|
|
||||||
rmmod uvesafb > /dev/null 2>&1
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,25 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/nouveau.stop
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# FIXME: Comment out & edit if necessary to unload
|
|
||||||
# nouveau/drm/kms/ttm i.e. to be able to load nVidia.
|
|
||||||
#
|
|
||||||
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
|
||||||
echo 0 >/sys/class/vtconsole/vtcon1/bind
|
|
||||||
if ! rmmod nouveau; then
|
|
||||||
die "Failed to remove ${1} kernel module"
|
|
||||||
else
|
|
||||||
[[ -x /etc/init.d/consolefont ]] &&
|
|
||||||
/etc/init.d/consolefont restart
|
|
||||||
rmmod ttm
|
|
||||||
rmmod drm_kms_helper
|
|
||||||
rmmod dri
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,12 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/nvidia.start
|
|
||||||
#
|
|
||||||
|
|
||||||
modprobe uvesafb > /dev/null 2>&1
|
|
||||||
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
|
||||||
|
|
||||||
[[ $(eselect opengl show) != ${1} ]] && eselect opengl set ${1}
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,10 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/nvidia.stop
|
|
||||||
#
|
|
||||||
|
|
||||||
rmmod ${1} || die "Failed to remove ${1} kernel module"
|
|
||||||
rmmod uvesafb > /dev/null 2>&1
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,20 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/radeon.start
|
|
||||||
#
|
|
||||||
|
|
||||||
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
|
||||||
|
|
||||||
if [[ -e /sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
|
||||||
echo DIS >/sys/kernel/debug/vgaswitcheroo/switch
|
|
||||||
# echo OFF >/sys/kernel/debug/vgaswitcheroo/switch
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo low >/sys/class/drm/card0/device/power_profile
|
|
||||||
[[ $(eselect opengl show) != xorg-x11 ]] && eselect opengl set xorg-x11
|
|
||||||
[[ $(eselect xvmc show) != xorg-x11 ]] && eselect xvmc set xorg-x11
|
|
||||||
echo profile >/sys/class/drm/card0/power_method # or 'dynpm'
|
|
||||||
echo auto >/sys/class/drm/card0/power_profile # or 'low|mid'
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -1,25 +0,0 @@
|
|||||||
#
|
|
||||||
# vga/scripts/radeon.stop
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# FIXME: Comment in & edit if necessary to unload
|
|
||||||
# radeon/drm/kms/ttm i.e. to be able to load Fglrx.
|
|
||||||
#
|
|
||||||
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
|
||||||
# echo 0 >/sys/class/vtconsole/vtcon1/bind
|
|
||||||
if ! rmmod radeon; then
|
|
||||||
echo "Failed to remove ${1} module"
|
|
||||||
else
|
|
||||||
[[ -x /etc/init.d/consolefont ]] &&
|
|
||||||
/etc/init.d/consolefont restart
|
|
||||||
# rmmod ttm
|
|
||||||
# rmmod drm_kms_helper
|
|
||||||
# rmmod dri
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
|
||||||
#
|
|
@ -2,6 +2,7 @@
|
|||||||
# vga/scripts/fglrx.start
|
# vga/scripts/fglrx.start
|
||||||
#
|
#
|
||||||
|
|
||||||
|
modprobe uvesafb > /dev/null 2>&1
|
||||||
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
||||||
|
|
||||||
[[ $(eselect opengl show) != ati ]] && eselect opengl set ati
|
[[ $(eselect opengl show) != ati ]] && eselect opengl set ati
|
||||||
|
@ -2,7 +2,11 @@
|
|||||||
# vga/scripts/fglrx.stop
|
# vga/scripts/fglrx.stop
|
||||||
#
|
#
|
||||||
|
|
||||||
rmmod ${1} || die "failed to remove ${1} module"
|
rmmod ${1} || die "Failed to remove ${1} module"
|
||||||
|
#
|
||||||
|
# FIXME: Is this necessary? Comment out if necessary.
|
||||||
|
#
|
||||||
|
rmmod uvesafb > /dev/null 2>&1
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -3,13 +3,16 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# Uncomment the following line and last one if one need
|
#
|
||||||
# to force remove nouveau/kms driver for e.g. nvidia
|
# FIXME: Comment out & edit if necessary to unload
|
||||||
|
# nouveau/drm/kms/ttm i.e. to be able to load nVidia.
|
||||||
|
#
|
||||||
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
||||||
echo 0 >/sys/class/vtconsole/vtcon1/bind
|
echo 0 >/sys/class/vtconsole/vtcon1/bind
|
||||||
if ! rmmod nouveau; then
|
if ! rmmod nouveau; then
|
||||||
die "Failed to remove nouveau kernel module"
|
die "Failed to remove ${1} kernel module"
|
||||||
else
|
else
|
||||||
|
[[ -x /etc/init.d/consolefont ]] &&
|
||||||
/etc/init.d/consolefont restart
|
/etc/init.d/consolefont restart
|
||||||
rmmod ttm
|
rmmod ttm
|
||||||
rmmod drm_kms_helper
|
rmmod drm_kms_helper
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
# vga/scripts/nvidia.start
|
# vga/scripts/nvidia.start
|
||||||
#
|
#
|
||||||
|
|
||||||
|
modprobe uvesafb > /dev/null 2>&1
|
||||||
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
modprobe ${1} || die "Failed to insert ${1} kernel module"
|
||||||
|
|
||||||
[[ $(eselect opengl show) != ${1} ]] && eselect opengl set ${1}
|
[[ $(eselect opengl show) != ${1} ]] && eselect opengl set ${1}
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
rmmod ${1} || die "Failed to remove ${1} kernel module"
|
rmmod ${1} || die "Failed to remove ${1} kernel module"
|
||||||
|
rmmod uvesafb > /dev/null 2>&1
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -12,8 +12,8 @@ fi
|
|||||||
echo low >/sys/class/drm/card0/device/power_profile
|
echo low >/sys/class/drm/card0/device/power_profile
|
||||||
[[ $(eselect opengl show) != xorg-x11 ]] && eselect opengl set xorg-x11
|
[[ $(eselect opengl show) != xorg-x11 ]] && eselect opengl set xorg-x11
|
||||||
[[ $(eselect xvmc show) != xorg-x11 ]] && eselect xvmc set xorg-x11
|
[[ $(eselect xvmc show) != xorg-x11 ]] && eselect xvmc set xorg-x11
|
||||||
echo profile >/sys/class/drm/card0/device/power_method # or 'dynpm'
|
echo profile >/sys/class/drm/card0/power_method # or 'dynpm'
|
||||||
echo auto >/sys/class/drm/card0/device/power_profile # or 'low|mid'
|
echo auto >/sys/class/drm/card0/power_profile # or 'low|mid'
|
||||||
|
|
||||||
#
|
#
|
||||||
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
# vim:fenc=utf-8:ft=sh:ci:pi:sts=0:sw=4:ts=4:
|
||||||
|
@ -3,12 +3,14 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# Comment the following line and uncomment the other lines
|
#
|
||||||
# to force remove nouveau/kms driver for e.g. fglrx
|
# FIXME: Comment in & edit if necessary to unload
|
||||||
|
# radeon/drm/kms/ttm i.e. to be able to load Fglrx.
|
||||||
|
#
|
||||||
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
if [[ ! -e sys/kernel/debug/vgaswitcheroo/switch ]]; then
|
||||||
# echo 0 >/sys/class/vtconsole/vtcon1/bind
|
# echo 0 >/sys/class/vtconsole/vtcon1/bind
|
||||||
if ! rmmod nouveau; then
|
if ! rmmod radeon; then
|
||||||
echo "failed to remove fglrx module"
|
echo "Failed to remove ${1} module"
|
||||||
else
|
else
|
||||||
[[ -x /etc/init.d/consolefont ]] &&
|
[[ -x /etc/init.d/consolefont ]] &&
|
||||||
/etc/init.d/consolefont restart
|
/etc/init.d/consolefont restart
|
||||||
|
@ -1,176 +0,0 @@
|
|||||||
# i3 config file (v4)
|
|
||||||
#
|
|
||||||
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
|
|
||||||
#
|
|
||||||
# This config file uses keycodes (bindsym) and was written for the QWERTY
|
|
||||||
# layout.
|
|
||||||
#
|
|
||||||
# To get a config file with the same key positions, but for your current
|
|
||||||
# layout, use the i3-config-wizard
|
|
||||||
#
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
|
||||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
|
||||||
font pango:DejaVu Sans Mono 8
|
|
||||||
# Before i3 v4.8, we used to recommend this one as the default:
|
|
||||||
# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
|
||||||
# The font above is very space-efficient, that is, it looks good, sharp and
|
|
||||||
# clear in small sizes. However, its unicode glyph coverage is limited, the old
|
|
||||||
# X core fonts rendering does not support right-to-left and this being a bitmap
|
|
||||||
# font, it doesn’t scale on retina/hidpi displays.
|
|
||||||
|
|
||||||
# use these keys for focus, movement, and resize directions when reaching for
|
|
||||||
# the arrows is not convenient
|
|
||||||
set $up l
|
|
||||||
set $down k
|
|
||||||
set $left j
|
|
||||||
set $right semicolon
|
|
||||||
|
|
||||||
# use Mouse+Mod1 to drag floating windows to their wanted position
|
|
||||||
floating_modifier Mod1
|
|
||||||
|
|
||||||
# start a terminal
|
|
||||||
bindsym Mod1+Return exec i3-sensible-terminal
|
|
||||||
|
|
||||||
# kill focused window
|
|
||||||
bindsym Mod1+Shift+q kill
|
|
||||||
|
|
||||||
# start dmenu (a program launcher)
|
|
||||||
bindsym Mod1+d exec dmenu_run
|
|
||||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
|
||||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
|
||||||
# installed.
|
|
||||||
# bindsym Mod1+d exec --no-startup-id i3-dmenu-desktop
|
|
||||||
|
|
||||||
# change focus
|
|
||||||
bindsym Mod1+$left focus left
|
|
||||||
bindsym Mod1+$down focus down
|
|
||||||
bindsym Mod1+$up focus up
|
|
||||||
bindsym Mod1+$right focus right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindsym Mod1+Left focus left
|
|
||||||
bindsym Mod1+Down focus down
|
|
||||||
bindsym Mod1+Up focus up
|
|
||||||
bindsym Mod1+Right focus right
|
|
||||||
|
|
||||||
# move focused window
|
|
||||||
bindsym Mod1+Shift+$left move left
|
|
||||||
bindsym Mod1+Shift+$down move down
|
|
||||||
bindsym Mod1+Shift+$up move up
|
|
||||||
bindsym Mod1+Shift+$right move right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindsym Mod1+Shift+Left move left
|
|
||||||
bindsym Mod1+Shift+Down move down
|
|
||||||
bindsym Mod1+Shift+Up move up
|
|
||||||
bindsym Mod1+Shift+Right move right
|
|
||||||
|
|
||||||
# split in horizontal orientation
|
|
||||||
bindsym Mod1+h split h
|
|
||||||
|
|
||||||
# split in vertical orientation
|
|
||||||
bindsym Mod1+v split v
|
|
||||||
|
|
||||||
# enter fullscreen mode for the focused container
|
|
||||||
bindsym Mod1+f fullscreen toggle
|
|
||||||
|
|
||||||
# change container layout (stacked, tabbed, toggle split)
|
|
||||||
bindsym Mod1+s layout stacking
|
|
||||||
bindsym Mod1+w layout tabbed
|
|
||||||
bindsym Mod1+e layout toggle split
|
|
||||||
|
|
||||||
# toggle tiling / floating
|
|
||||||
bindsym Mod1+Shift+space floating toggle
|
|
||||||
|
|
||||||
# change focus between tiling / floating windows
|
|
||||||
bindsym Mod1+space focus mode_toggle
|
|
||||||
|
|
||||||
# focus the parent container
|
|
||||||
bindsym Mod1+a focus parent
|
|
||||||
|
|
||||||
# focus the child container
|
|
||||||
#bindsym Mod1+d focus child
|
|
||||||
|
|
||||||
# move the currently focused window to the scratchpad
|
|
||||||
bindsym Mod1+Shift+minus move scratchpad
|
|
||||||
|
|
||||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
|
||||||
# If there are multiple scratchpad windows, this command cycles through them.
|
|
||||||
bindsym Mod1+minus scratchpad show
|
|
||||||
|
|
||||||
# switch to workspace
|
|
||||||
bindsym Mod1+1 workspace 1
|
|
||||||
bindsym Mod1+2 workspace 2
|
|
||||||
bindsym Mod1+3 workspace 3
|
|
||||||
bindsym Mod1+4 workspace 4
|
|
||||||
bindsym Mod1+5 workspace 5
|
|
||||||
bindsym Mod1+6 workspace 6
|
|
||||||
bindsym Mod1+7 workspace 7
|
|
||||||
bindsym Mod1+8 workspace 8
|
|
||||||
bindsym Mod1+9 workspace 9
|
|
||||||
bindsym Mod1+0 workspace 10
|
|
||||||
|
|
||||||
# move focused container to workspace
|
|
||||||
bindsym Mod1+Shift+1 move container to workspace 1
|
|
||||||
bindsym Mod1+Shift+2 move container to workspace 2
|
|
||||||
bindsym Mod1+Shift+3 move container to workspace 3
|
|
||||||
bindsym Mod1+Shift+4 move container to workspace 4
|
|
||||||
bindsym Mod1+Shift+5 move container to workspace 5
|
|
||||||
bindsym Mod1+Shift+6 move container to workspace 6
|
|
||||||
bindsym Mod1+Shift+7 move container to workspace 7
|
|
||||||
bindsym Mod1+Shift+8 move container to workspace 8
|
|
||||||
bindsym Mod1+Shift+9 move container to workspace 9
|
|
||||||
bindsym Mod1+Shift+0 move container to workspace 10
|
|
||||||
|
|
||||||
# reload the configuration file
|
|
||||||
bindsym Mod1+Shift+c reload
|
|
||||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
|
||||||
bindsym Mod1+Shift+r restart
|
|
||||||
# exit i3 (logs you out of your X session)
|
|
||||||
bindsym Mod1+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
|
|
||||||
|
|
||||||
# resize window (you can also use the mouse for that)
|
|
||||||
mode "resize" {
|
|
||||||
# These bindings trigger as soon as you enter the resize mode
|
|
||||||
|
|
||||||
# Pressing left will shrink the window’s width.
|
|
||||||
# Pressing right will grow the window’s width.
|
|
||||||
# Pressing up will shrink the window’s height.
|
|
||||||
# Pressing down will grow the window’s height.
|
|
||||||
bindsym $left resize shrink width 10 px or 10 ppt
|
|
||||||
bindsym $down resize grow height 10 px or 10 ppt
|
|
||||||
bindsym $up resize shrink height 10 px or 10 ppt
|
|
||||||
bindsym $right resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# same bindings, but for the arrow keys
|
|
||||||
bindsym Left resize shrink width 10 px or 10 ppt
|
|
||||||
bindsym Down resize grow height 10 px or 10 ppt
|
|
||||||
bindsym Up resize shrink height 10 px or 10 ppt
|
|
||||||
bindsym Right resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# back to normal: Enter or Escape
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
bindsym Mod1+r mode "resize"
|
|
||||||
|
|
||||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
|
||||||
# finds out, if available)
|
|
||||||
bar {
|
|
||||||
status_command i3status
|
|
||||||
}
|
|
||||||
|
|
||||||
#######################################################################
|
|
||||||
# automatically start i3-config-wizard to offer the user to create a
|
|
||||||
# keysym-based config which used his favorite modifier (alt or windows)
|
|
||||||
#
|
|
||||||
# i3-config-wizard will not launch if there already is a config file
|
|
||||||
# in ~/.i3/config.
|
|
||||||
#
|
|
||||||
# Please remove the following exec line:
|
|
||||||
#######################################################################
|
|
||||||
exec i3-config-wizard
|
|
@ -1,152 +0,0 @@
|
|||||||
# WARNING
|
|
||||||
# WARNING: This configuration file is a template for the i3-config-wizard to
|
|
||||||
# WARNING: generate a config which uses keysyms in your current layout. It does
|
|
||||||
# WARNING: not get loaded by i3. Please do not change it.
|
|
||||||
# WARNING
|
|
||||||
|
|
||||||
# i3 config file (v4)
|
|
||||||
#
|
|
||||||
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
|
|
||||||
|
|
||||||
set $mod Mod1
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
|
||||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
|
||||||
font pango:DejaVu Sans Mono 8
|
|
||||||
# Before i3 v4.8, we used to recommend this one as the default:
|
|
||||||
# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
|
||||||
# The font above is very space-efficient, that is, it looks good, sharp and
|
|
||||||
# clear in small sizes. However, its unicode glyph coverage is limited, the old
|
|
||||||
# X core fonts rendering does not support right-to-left and this being a bitmap
|
|
||||||
# font, it doesn’t scale on retina/hidpi displays.
|
|
||||||
|
|
||||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
|
||||||
floating_modifier $mod
|
|
||||||
|
|
||||||
# start a terminal
|
|
||||||
bindcode $mod+36 exec i3-sensible-terminal
|
|
||||||
|
|
||||||
# kill focused window
|
|
||||||
bindcode $mod+Shift+24 kill
|
|
||||||
|
|
||||||
# start dmenu (a program launcher)
|
|
||||||
bindcode $mod+40 exec dmenu_run
|
|
||||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
|
||||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
|
||||||
# installed.
|
|
||||||
# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
|
|
||||||
|
|
||||||
# change focus
|
|
||||||
bindcode $mod+44 focus left
|
|
||||||
bindcode $mod+45 focus down
|
|
||||||
bindcode $mod+46 focus up
|
|
||||||
bindcode $mod+47 focus right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindcode $mod+113 focus left
|
|
||||||
bindcode $mod+116 focus down
|
|
||||||
bindcode $mod+111 focus up
|
|
||||||
bindcode $mod+114 focus right
|
|
||||||
|
|
||||||
# move focused window
|
|
||||||
bindcode $mod+Shift+44 move left
|
|
||||||
bindcode $mod+Shift+45 move down
|
|
||||||
bindcode $mod+Shift+46 move up
|
|
||||||
bindcode $mod+Shift+47 move right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindcode $mod+Shift+113 move left
|
|
||||||
bindcode $mod+Shift+116 move down
|
|
||||||
bindcode $mod+Shift+111 move up
|
|
||||||
bindcode $mod+Shift+114 move right
|
|
||||||
|
|
||||||
# split in horizontal orientation
|
|
||||||
bindcode $mod+43 split h
|
|
||||||
|
|
||||||
# split in vertical orientation
|
|
||||||
bindcode $mod+55 split v
|
|
||||||
|
|
||||||
# enter fullscreen mode for the focused container
|
|
||||||
bindcode $mod+41 fullscreen toggle
|
|
||||||
|
|
||||||
# change container layout (stacked, tabbed, toggle split)
|
|
||||||
bindcode $mod+39 layout stacking
|
|
||||||
bindcode $mod+25 layout tabbed
|
|
||||||
bindcode $mod+26 layout toggle split
|
|
||||||
|
|
||||||
# toggle tiling / floating
|
|
||||||
bindcode $mod+Shift+65 floating toggle
|
|
||||||
|
|
||||||
# change focus between tiling / floating windows
|
|
||||||
bindcode $mod+65 focus mode_toggle
|
|
||||||
|
|
||||||
# focus the parent container
|
|
||||||
bindcode $mod+38 focus parent
|
|
||||||
|
|
||||||
# focus the child container
|
|
||||||
#bindsym $mod+d focus child
|
|
||||||
|
|
||||||
# switch to workspace
|
|
||||||
bindcode $mod+10 workspace 1
|
|
||||||
bindcode $mod+11 workspace 2
|
|
||||||
bindcode $mod+12 workspace 3
|
|
||||||
bindcode $mod+13 workspace 4
|
|
||||||
bindcode $mod+14 workspace 5
|
|
||||||
bindcode $mod+15 workspace 6
|
|
||||||
bindcode $mod+16 workspace 7
|
|
||||||
bindcode $mod+17 workspace 8
|
|
||||||
bindcode $mod+18 workspace 9
|
|
||||||
bindcode $mod+19 workspace 10
|
|
||||||
|
|
||||||
# move focused container to workspace
|
|
||||||
bindcode $mod+Shift+10 move container to workspace 1
|
|
||||||
bindcode $mod+Shift+11 move container to workspace 2
|
|
||||||
bindcode $mod+Shift+12 move container to workspace 3
|
|
||||||
bindcode $mod+Shift+13 move container to workspace 4
|
|
||||||
bindcode $mod+Shift+14 move container to workspace 5
|
|
||||||
bindcode $mod+Shift+15 move container to workspace 6
|
|
||||||
bindcode $mod+Shift+16 move container to workspace 7
|
|
||||||
bindcode $mod+Shift+17 move container to workspace 8
|
|
||||||
bindcode $mod+Shift+18 move container to workspace 9
|
|
||||||
bindcode $mod+Shift+19 move container to workspace 10
|
|
||||||
|
|
||||||
# reload the configuration file
|
|
||||||
bindcode $mod+Shift+54 reload
|
|
||||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
|
||||||
bindcode $mod+Shift+27 restart
|
|
||||||
# exit i3 (logs you out of your X session)
|
|
||||||
bindcode $mod+Shift+26 exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
|
|
||||||
|
|
||||||
# resize window (you can also use the mouse for that)
|
|
||||||
mode "resize" {
|
|
||||||
# These bindings trigger as soon as you enter the resize mode
|
|
||||||
|
|
||||||
# Pressing left will shrink the window’s width.
|
|
||||||
# Pressing right will grow the window’s width.
|
|
||||||
# Pressing up will shrink the window’s height.
|
|
||||||
# Pressing down will grow the window’s height.
|
|
||||||
bindcode 44 resize shrink width 10 px or 10 ppt
|
|
||||||
bindcode 45 resize grow height 10 px or 10 ppt
|
|
||||||
bindcode 46 resize shrink height 10 px or 10 ppt
|
|
||||||
bindcode 47 resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# same bindings, but for the arrow keys
|
|
||||||
bindcode 113 resize shrink width 10 px or 10 ppt
|
|
||||||
bindcode 116 resize grow height 10 px or 10 ppt
|
|
||||||
bindcode 111 resize shrink height 10 px or 10 ppt
|
|
||||||
bindcode 114 resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# back to normal: Enter or Escape
|
|
||||||
bindcode 36 mode "default"
|
|
||||||
bindcode 9 mode "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
bindcode $mod+27 mode "resize"
|
|
||||||
|
|
||||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
|
||||||
# finds out, if available)
|
|
||||||
bar {
|
|
||||||
status_command i3status
|
|
||||||
}
|
|
@ -1,179 +0,0 @@
|
|||||||
# i3 config file (v4)
|
|
||||||
#
|
|
||||||
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
|
|
||||||
#
|
|
||||||
# This config file uses keycodes (bindsym) and was written for the QWERTY
|
|
||||||
# layout.
|
|
||||||
#
|
|
||||||
# To get a config file with the same key positions, but for your current
|
|
||||||
# layout, use the i3-config-wizard
|
|
||||||
#
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
font pango:monospace 8
|
|
||||||
|
|
||||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
|
||||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
|
||||||
#font pango:DejaVu Sans Mono 8
|
|
||||||
|
|
||||||
# Before i3 v4.8, we used to recommend this one as the default:
|
|
||||||
# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
|
||||||
# The font above is very space-efficient, that is, it looks good, sharp and
|
|
||||||
# clear in small sizes. However, its unicode glyph coverage is limited, the old
|
|
||||||
# X core fonts rendering does not support right-to-left and this being a bitmap
|
|
||||||
# font, it doesn’t scale on retina/hidpi displays.
|
|
||||||
|
|
||||||
# use these keys for focus, movement, and resize directions when reaching for
|
|
||||||
# the arrows is not convenient
|
|
||||||
set $up l
|
|
||||||
set $down k
|
|
||||||
set $left j
|
|
||||||
set $right semicolon
|
|
||||||
|
|
||||||
# use Mouse+Mod1 to drag floating windows to their wanted position
|
|
||||||
floating_modifier Mod1
|
|
||||||
|
|
||||||
# start a terminal
|
|
||||||
bindsym Mod1+Return exec i3-sensible-terminal
|
|
||||||
|
|
||||||
# kill focused window
|
|
||||||
bindsym Mod1+Shift+q kill
|
|
||||||
|
|
||||||
# start dmenu (a program launcher)
|
|
||||||
bindsym Mod1+d exec dmenu_run
|
|
||||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
|
||||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
|
||||||
# installed.
|
|
||||||
# bindsym Mod1+d exec --no-startup-id i3-dmenu-desktop
|
|
||||||
|
|
||||||
# change focus
|
|
||||||
bindsym Mod1+$left focus left
|
|
||||||
bindsym Mod1+$down focus down
|
|
||||||
bindsym Mod1+$up focus up
|
|
||||||
bindsym Mod1+$right focus right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindsym Mod1+Left focus left
|
|
||||||
bindsym Mod1+Down focus down
|
|
||||||
bindsym Mod1+Up focus up
|
|
||||||
bindsym Mod1+Right focus right
|
|
||||||
|
|
||||||
# move focused window
|
|
||||||
bindsym Mod1+Shift+$left move left
|
|
||||||
bindsym Mod1+Shift+$down move down
|
|
||||||
bindsym Mod1+Shift+$up move up
|
|
||||||
bindsym Mod1+Shift+$right move right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindsym Mod1+Shift+Left move left
|
|
||||||
bindsym Mod1+Shift+Down move down
|
|
||||||
bindsym Mod1+Shift+Up move up
|
|
||||||
bindsym Mod1+Shift+Right move right
|
|
||||||
|
|
||||||
# split in horizontal orientation
|
|
||||||
bindsym Mod1+h split h
|
|
||||||
|
|
||||||
# split in vertical orientation
|
|
||||||
bindsym Mod1+v split v
|
|
||||||
|
|
||||||
# enter fullscreen mode for the focused container
|
|
||||||
bindsym Mod1+f fullscreen toggle
|
|
||||||
|
|
||||||
# change container layout (stacked, tabbed, toggle split)
|
|
||||||
bindsym Mod1+s layout stacking
|
|
||||||
bindsym Mod1+w layout tabbed
|
|
||||||
bindsym Mod1+e layout toggle split
|
|
||||||
|
|
||||||
# toggle tiling / floating
|
|
||||||
bindsym Mod1+Shift+space floating toggle
|
|
||||||
|
|
||||||
# change focus between tiling / floating windows
|
|
||||||
bindsym Mod1+space focus mode_toggle
|
|
||||||
|
|
||||||
# focus the parent container
|
|
||||||
bindsym Mod1+a focus parent
|
|
||||||
|
|
||||||
# focus the child container
|
|
||||||
#bindsym Mod1+d focus child
|
|
||||||
|
|
||||||
# move the currently focused window to the scratchpad
|
|
||||||
bindsym Mod1+Shift+minus move scratchpad
|
|
||||||
|
|
||||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
|
||||||
# If there are multiple scratchpad windows, this command cycles through them.
|
|
||||||
bindsym Mod1+minus scratchpad show
|
|
||||||
|
|
||||||
# switch to workspace
|
|
||||||
bindsym Mod1+1 workspace 1
|
|
||||||
bindsym Mod1+2 workspace 2
|
|
||||||
bindsym Mod1+3 workspace 3
|
|
||||||
bindsym Mod1+4 workspace 4
|
|
||||||
bindsym Mod1+5 workspace 5
|
|
||||||
bindsym Mod1+6 workspace 6
|
|
||||||
bindsym Mod1+7 workspace 7
|
|
||||||
bindsym Mod1+8 workspace 8
|
|
||||||
bindsym Mod1+9 workspace 9
|
|
||||||
bindsym Mod1+0 workspace 10
|
|
||||||
|
|
||||||
# move focused container to workspace
|
|
||||||
bindsym Mod1+Shift+1 move container to workspace 1
|
|
||||||
bindsym Mod1+Shift+2 move container to workspace 2
|
|
||||||
bindsym Mod1+Shift+3 move container to workspace 3
|
|
||||||
bindsym Mod1+Shift+4 move container to workspace 4
|
|
||||||
bindsym Mod1+Shift+5 move container to workspace 5
|
|
||||||
bindsym Mod1+Shift+6 move container to workspace 6
|
|
||||||
bindsym Mod1+Shift+7 move container to workspace 7
|
|
||||||
bindsym Mod1+Shift+8 move container to workspace 8
|
|
||||||
bindsym Mod1+Shift+9 move container to workspace 9
|
|
||||||
bindsym Mod1+Shift+0 move container to workspace 10
|
|
||||||
|
|
||||||
# reload the configuration file
|
|
||||||
bindsym Mod1+Shift+c reload
|
|
||||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
|
||||||
bindsym Mod1+Shift+r restart
|
|
||||||
# exit i3 (logs you out of your X session)
|
|
||||||
bindsym Mod1+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
|
|
||||||
|
|
||||||
# resize window (you can also use the mouse for that)
|
|
||||||
mode "resize" {
|
|
||||||
# These bindings trigger as soon as you enter the resize mode
|
|
||||||
|
|
||||||
# Pressing left will shrink the window’s width.
|
|
||||||
# Pressing right will grow the window’s width.
|
|
||||||
# Pressing up will shrink the window’s height.
|
|
||||||
# Pressing down will grow the window’s height.
|
|
||||||
bindsym $left resize shrink width 10 px or 10 ppt
|
|
||||||
bindsym $down resize grow height 10 px or 10 ppt
|
|
||||||
bindsym $up resize shrink height 10 px or 10 ppt
|
|
||||||
bindsym $right resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# same bindings, but for the arrow keys
|
|
||||||
bindsym Left resize shrink width 10 px or 10 ppt
|
|
||||||
bindsym Down resize grow height 10 px or 10 ppt
|
|
||||||
bindsym Up resize shrink height 10 px or 10 ppt
|
|
||||||
bindsym Right resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# back to normal: Enter or Escape
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
bindsym Mod1+r mode "resize"
|
|
||||||
|
|
||||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
|
||||||
# finds out, if available)
|
|
||||||
bar {
|
|
||||||
status_command i3status
|
|
||||||
}
|
|
||||||
|
|
||||||
#######################################################################
|
|
||||||
# automatically start i3-config-wizard to offer the user to create a
|
|
||||||
# keysym-based config which used their favorite modifier (alt or windows)
|
|
||||||
#
|
|
||||||
# i3-config-wizard will not launch if there already is a config file
|
|
||||||
# in ~/.i3/config.
|
|
||||||
#
|
|
||||||
# Please remove the following exec line:
|
|
||||||
#######################################################################
|
|
||||||
exec i3-config-wizard
|
|
@ -1,155 +0,0 @@
|
|||||||
# WARNING
|
|
||||||
# WARNING: This configuration file is a template for the i3-config-wizard to
|
|
||||||
# WARNING: generate a config which uses keysyms in your current layout. It does
|
|
||||||
# WARNING: not get loaded by i3. Please do not change it.
|
|
||||||
# WARNING
|
|
||||||
|
|
||||||
# i3 config file (v4)
|
|
||||||
#
|
|
||||||
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
|
|
||||||
|
|
||||||
set $mod Mod1
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
font pango:monospace 8
|
|
||||||
|
|
||||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
|
||||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
|
||||||
#font pango:DejaVu Sans Mono 8
|
|
||||||
|
|
||||||
# Before i3 v4.8, we used to recommend this one as the default:
|
|
||||||
# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
|
||||||
# The font above is very space-efficient, that is, it looks good, sharp and
|
|
||||||
# clear in small sizes. However, its unicode glyph coverage is limited, the old
|
|
||||||
# X core fonts rendering does not support right-to-left and this being a bitmap
|
|
||||||
# font, it doesn’t scale on retina/hidpi displays.
|
|
||||||
|
|
||||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
|
||||||
floating_modifier $mod
|
|
||||||
|
|
||||||
# start a terminal
|
|
||||||
bindcode $mod+36 exec i3-sensible-terminal
|
|
||||||
|
|
||||||
# kill focused window
|
|
||||||
bindcode $mod+Shift+24 kill
|
|
||||||
|
|
||||||
# start dmenu (a program launcher)
|
|
||||||
bindcode $mod+40 exec dmenu_run
|
|
||||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
|
||||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
|
||||||
# installed.
|
|
||||||
# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
|
|
||||||
|
|
||||||
# change focus
|
|
||||||
bindcode $mod+44 focus left
|
|
||||||
bindcode $mod+45 focus down
|
|
||||||
bindcode $mod+46 focus up
|
|
||||||
bindcode $mod+47 focus right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindcode $mod+113 focus left
|
|
||||||
bindcode $mod+116 focus down
|
|
||||||
bindcode $mod+111 focus up
|
|
||||||
bindcode $mod+114 focus right
|
|
||||||
|
|
||||||
# move focused window
|
|
||||||
bindcode $mod+Shift+44 move left
|
|
||||||
bindcode $mod+Shift+45 move down
|
|
||||||
bindcode $mod+Shift+46 move up
|
|
||||||
bindcode $mod+Shift+47 move right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindcode $mod+Shift+113 move left
|
|
||||||
bindcode $mod+Shift+116 move down
|
|
||||||
bindcode $mod+Shift+111 move up
|
|
||||||
bindcode $mod+Shift+114 move right
|
|
||||||
|
|
||||||
# split in horizontal orientation
|
|
||||||
bindcode $mod+43 split h
|
|
||||||
|
|
||||||
# split in vertical orientation
|
|
||||||
bindcode $mod+55 split v
|
|
||||||
|
|
||||||
# enter fullscreen mode for the focused container
|
|
||||||
bindcode $mod+41 fullscreen toggle
|
|
||||||
|
|
||||||
# change container layout (stacked, tabbed, toggle split)
|
|
||||||
bindcode $mod+39 layout stacking
|
|
||||||
bindcode $mod+25 layout tabbed
|
|
||||||
bindcode $mod+26 layout toggle split
|
|
||||||
|
|
||||||
# toggle tiling / floating
|
|
||||||
bindcode $mod+Shift+65 floating toggle
|
|
||||||
|
|
||||||
# change focus between tiling / floating windows
|
|
||||||
bindcode $mod+65 focus mode_toggle
|
|
||||||
|
|
||||||
# focus the parent container
|
|
||||||
bindcode $mod+38 focus parent
|
|
||||||
|
|
||||||
# focus the child container
|
|
||||||
#bindsym $mod+d focus child
|
|
||||||
|
|
||||||
# switch to workspace
|
|
||||||
bindcode $mod+10 workspace 1
|
|
||||||
bindcode $mod+11 workspace 2
|
|
||||||
bindcode $mod+12 workspace 3
|
|
||||||
bindcode $mod+13 workspace 4
|
|
||||||
bindcode $mod+14 workspace 5
|
|
||||||
bindcode $mod+15 workspace 6
|
|
||||||
bindcode $mod+16 workspace 7
|
|
||||||
bindcode $mod+17 workspace 8
|
|
||||||
bindcode $mod+18 workspace 9
|
|
||||||
bindcode $mod+19 workspace 10
|
|
||||||
|
|
||||||
# move focused container to workspace
|
|
||||||
bindcode $mod+Shift+10 move container to workspace 1
|
|
||||||
bindcode $mod+Shift+11 move container to workspace 2
|
|
||||||
bindcode $mod+Shift+12 move container to workspace 3
|
|
||||||
bindcode $mod+Shift+13 move container to workspace 4
|
|
||||||
bindcode $mod+Shift+14 move container to workspace 5
|
|
||||||
bindcode $mod+Shift+15 move container to workspace 6
|
|
||||||
bindcode $mod+Shift+16 move container to workspace 7
|
|
||||||
bindcode $mod+Shift+17 move container to workspace 8
|
|
||||||
bindcode $mod+Shift+18 move container to workspace 9
|
|
||||||
bindcode $mod+Shift+19 move container to workspace 10
|
|
||||||
|
|
||||||
# reload the configuration file
|
|
||||||
bindcode $mod+Shift+54 reload
|
|
||||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
|
||||||
bindcode $mod+Shift+27 restart
|
|
||||||
# exit i3 (logs you out of your X session)
|
|
||||||
bindcode $mod+Shift+26 exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
|
|
||||||
|
|
||||||
# resize window (you can also use the mouse for that)
|
|
||||||
mode "resize" {
|
|
||||||
# These bindings trigger as soon as you enter the resize mode
|
|
||||||
|
|
||||||
# Pressing left will shrink the window’s width.
|
|
||||||
# Pressing right will grow the window’s width.
|
|
||||||
# Pressing up will shrink the window’s height.
|
|
||||||
# Pressing down will grow the window’s height.
|
|
||||||
bindcode 44 resize shrink width 10 px or 10 ppt
|
|
||||||
bindcode 45 resize grow height 10 px or 10 ppt
|
|
||||||
bindcode 46 resize shrink height 10 px or 10 ppt
|
|
||||||
bindcode 47 resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# same bindings, but for the arrow keys
|
|
||||||
bindcode 113 resize shrink width 10 px or 10 ppt
|
|
||||||
bindcode 116 resize grow height 10 px or 10 ppt
|
|
||||||
bindcode 111 resize shrink height 10 px or 10 ppt
|
|
||||||
bindcode 114 resize grow width 10 px or 10 ppt
|
|
||||||
|
|
||||||
# back to normal: Enter or Escape
|
|
||||||
bindcode 36 mode "default"
|
|
||||||
bindcode 9 mode "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
bindcode $mod+27 mode "resize"
|
|
||||||
|
|
||||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
|
||||||
# finds out, if available)
|
|
||||||
bar {
|
|
||||||
status_command i3status
|
|
||||||
}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user