From: Frank Brehm Date: Mon, 20 May 2013 08:55:14 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=882dec03d190a860710654cc83debf522f14cf03;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/X11/app-defaults/XDvi b/X11/app-defaults/XDvi deleted file mode 100644 index c1fcea2..0000000 --- a/X11/app-defaults/XDvi +++ /dev/null @@ -1,370 +0,0 @@ -!!! Global application defaults for XDvik -!!! Install this file into $TEXMF/xdvi/XDvi -!!! (use kpsewhich --expand-path '$TEXMF' to determine the location of -!!! $TEXMF on you system). -!!! -!!! Lines commented out (starting with `!') are examples of -!!! how to customize Xdvi for your personal needs. -!!! To use these settings, copy them into your $HOME/.Xdefaults file -!!! (remove the comments), prefix each line with `xdvi', and activate -!!! them with: -!!! $ xrdb -merge $HOME/.Xdefaults - -!!!------------------------------------------------------------------------------ -!!!------------------------ useful global settings ------------------------------ -!!!------------------------------------------------------------------------------ - -!!! Use `logical' (TeX) pages instead of physical pages for the `g' keystroke: -*useTeXPages: True - -!!! A fairly high resolution, which usually gives better results for anti-aliasing -!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an -!!! issue when using T1lib. -!*mfMode: ljfour -!*paper: a4 - -!!! This should be the best choice for modern displays with large color depth. -*thorough: true - -!!! Add some useful translations for the mouse wheel (bug #1422928) -*wheelTranslations:\ -Shift:left(.08)\n\ -Shift:right(.08)\n\ -Ctrl:set-shrink-factor(+)\n\ -Ctrl:set-shrink-factor(-)\n\ -:wheel(-.7)\n\ -:wheel(.7) - -!!!------------------------------------------------------------------------------ -!!!------------------------------ Motif toolbar --------------------------------- -!!!------------------------------------------------------------------------------ - -!!! filename of the XPM file used for the toolbar pixmaps: -*toolbarPixmapFile: toolbar.xpm - -!!! Use toolbar buttons that are non-raised by default and only appear raised -!!! when the mouse is over a button, as in e.g. Netscape 4.x: -*toolbarButtonsRaised: False - -!!! don't draw a border around armed buttons: -*button*highlightThickness: 0 - -!!! no extra margin above/below buttons -*toolBar.marginHeight:0 - -!!! some spacing around button icons and button edges -*toolBar*button*marginHeight: 2 -*toolBar*button*marginWidth: 2 - - -!!! don't draw the small grey rectangle inside the armed button: -*button*fillOnArm: false - -!!! Or, for a more traditional Motif look, use something like: -!*toolbarButtonsRaised: True -!*button*fillOnArm: True -!*button*shadowThickness: 1 -!*toolBar.marginHeight: 0 -!*toolBarFrame.marginWidth: 0 -!*button*highlightThickness: 2 - -!!!------------------------------------------------------------------------------ -!!!-------------------------------- Motif widgets ------------------------------- -!!!------------------------------------------------------------------------------ -!!! small shadows like in netscape 4.x -*menuBar.shadowThickness: 1 -*button*shadowThickness: 2 -*toolBar.shadowThickness: 1 -*toolBarFrame.shadowThickness: 1 -*helppanel.shadowThickness: 1 -*toolBarFrame.marginWidth: 2 -*statusline*shadowThickness: 1 - -!!! prevent the Motif file selector widget from resizing itself, and start with a reasonable default: -*resizePolicy: XmRESIZE_NONE -*textColumns: 50 - -!!! make all text/entry fields white, for better contrasts: -*XmDialogShell*XmTextField.background: white -*XmDialogShell*XmText.background: white -*XmDialogShell*XmList.background: white - -!!! adjust position of header in help window -*help_window*right_form.topOffset: 10 - -!!!------------------------------------------------------------------------------ -!!!----------------------------- Preferences window ----------------------------- -!!!------------------------------------------------------------------------------ - -*XmComboBox*List*background: white -*XmComboBox*Text*background: white -*XmComboBox*Text*borderWidth: 2 -*XmComboBox*Text*borderColor: black - -!!!------------------------------------------------------------------------------ -!!!--------------------------------- Help window -------------------------------- -!!!------------------------------------------------------------------------------ -!!! (See also the fontList entries for TOPIC_LABEL and TOPIC_HEADING) -!!! -!!! Set this to something that fits to your font size: -*help_text.rows: 23 -*help_text.columns: 56 - -!!! fg/bg for help topics label -*help_label*shadowThickness: 2 -!!! ... if you want a more colorful label: -!*help_label*foreground: blue4 -!*help_label*background: grey90 - - -!!! help topics label for Xaw -*help_label.font: -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-* - -!!!------------------------------------------------------------------------------ -!!!-------------------------------- Motif tooltips ------------------------------ -!!!------------------------------------------------------------------------------ -!!! background color and font: -*tipShell.background: cornsilk -*tipShell.fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-* - -!!! time the mouse needs to stay on a button until tooltips pop up, -!!! in milliseconds; set to a negative value to disable: -*tipShell.waitPeriod: 800 - - -!!!------------------------------------------------------------------------------ -!!!------------------------------ Fonts and colors ------------------------------ -!!!------------------------------------------------------------------------------ -*font: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-* -!!! Use a smaller font for the statusline in the Xaw version: -*statusline.font: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-* - -!!! Motif fonts. Meaning of the tags is: -!!! NORMAL: Ordinary text, labels etc. -!!! UNMARKED: Unmarked entries in page list -!!! MARKED: Marked entries in page list, emphasized entries in other lists -!!! TOPIC_LABEL: Label for topics list in help window -!!! TOPIC_HEADING: Heading for help text in help window -!!! -*fontList: \ --*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=NORMAL,\ --*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=UNMARKED,\ --*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=MARKED,\ --*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=TOPIC_LABEL,\ --*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*=TOPIC_HEADING - - -!!! Color used for page border, image bounding boxes and the ruler in `Ruler mode'. -*highlight: red - -!!! Color used for the magnifier and its rulers: -*rulecolor: blue - -!!!------------------------------------------------------------------------------ -!!!---------------------------------- hyperlinks ------------------------------- -!!!------------------------------------------------------------------------------ - -!!! Colors for unvisited and visited hyperlinks (can be any valid X color spec, -!!! also in hex format): -*linkColor: Blue2 -*visitedLinkColor: Purple4 - -!!! Link style: -!!! 0: no highlighting at all -!!! 1: underline with linkColor -!!! 2: no underlining, text with linkColor -!!! 3: underlining and text with linkColor -*linkStyle: 3 - -!!!------------------------------------------------------------------------------ -!!!------------------------------ helper applications --------------------------- -!!!------------------------------------------------------------------------------ - -!!! the editor used for `forward search'; can also be set via $EDITOR, $VISUAL -!!! or $XEDITOR. Setting the X resource will override the environment variables. -!!! The format strings `%l' and `%f' are optional. -!!! You could use this for older emacsen that come with emacsclient: -!*editor: emacsclient --no-wait +%l %f -!!! and this for current emacs or xemacs that come with gnuclient (which is much better): -!*editor: gnuclient -q +%l %f - -!!!------------------------------------------------------------------------------ -!!!------------------------------ Xaw buttons and helptexts --------------------- -!!!------------------------------------------------------------------------------ - -!!! The following sections are of a more esoteric nature, giving -!!! examples for customizing the Xaw buttons and the help texts. -!!! Maybe these are useful for i18n. - -!!!------------------------------ -!!! This is the default Xaw button configuration: -!!!------------------------------ -! *buttonTranslations: \ -! File_Open ...:select-dvi-file()\n\ -! File_Reload:reread-dvi-file()\n\ -! File_Back Hyperref:htex-back()\n\ -! File_Quit:quit()\n\ -! Page_First page:goto-page(1)\n\ -! Page_Page-10:back-page(10)\n\ -! Page_Page-5:back-page(10)\n\ -! Page_Prev:back-page(1)\n\ -! Page_Next:forward-page(1)\n\ -! Page_Page+5:forward-page(5)\n\ -! Page_Page+10:forward-page(10)\n\ -! Page_Last page:goto-page()\n\ -! Zoom_Full size:set-shrink-factor(1)\n\ -! Zoom_$%%:shrink-to-dpi(150)\n\ -! Zoom_$%%:shrink-to-dpi(100)\n\ -! Zoom_$%%:shrink-to-dpi(50)\n\ -! Zoom_Fit in window:set-shrink-factor()\n\ -! Options_View PS:set-ps(toggle)\n\ -! Options_Keep position:set-keep-flag()\n\ -! Help_About ...:popup-help(helpGeneral)\n\ -! Help_Page Motion ...:popup-help(helpPagemotion)\n\ -! Help_Other Commands ...:popup-help(helpOthercommands)\n\ -! Help_HyperTeX commands ...:popup-help(helpHypertex)\n\ -! Help_Source specials ...:popup-help(helpSourcespecials)\n - -!!!------------------------------ -!!! help texts -!!!------------------------------ - -!!!------------------------------ -!!! about/general -!!!------------------------------ -! *.helpGeneral: \ -! \n\ -! This is xdvik, CVS version.\n\ -! \n\ -! The xdvik project homepage is located at\n\ -! http://sourceforge.net/projects/xdvi,\n\ -! where you can find updates, report bugs and submit feature requests.\n\ -! \n\ -! Getting help and exiting xdvi\n\ -! \n\ -! h or ? or `Help' button\n\ -! Displays this help text.\n\ -! \n\ -! q or Control-C or Control-D or Cancel or Stop or Control-Z (VAX VMS)\n\ -! Quits the program.\n -! - -!!!------------------------------ -!!! other commands -!!!------------------------------ -! *helpOthercommands: \ -! \n\ -! Other Commands\n\ -! \n\ -! \n\ -! Control-F\n\ -! Find another DVI file.\n\ -! \n\ -! Control-L or Clear\n\ -! Redisplays the current page.\n\ -! \n\ -! Control-P\n\ -! Prints bitmap unit, bit order, and byte order.\n\ -! \n\ -! ^ or Home\n\ -! Move to the ``home'' position of the page. This is\n\ -! normally the upper left-hand corner of the page,\n\ -! depending on the margins as described in the -margins\n\ -! option, above.\n\ -! \n\ -! c Moves the page so that the point currently beneath the\n\ -! cursor is moved to the middle of the window. It also\n\ -! (gasp!) warps the cursor to the same place.\n\ -! \n\ -! G This key toggles the use of greyscale anti-aliasing for\n\ -! displaying shrunken bitmaps. In addition, the key\n\ -! sequences `0G' and `1G' clear and set this flag,\n\ -! respectively. See also the -nogrey option.\n\ -! \n\ -! k Normally when xdvi switches pages, it moves to the home\n\ -! position as well. The `k' keystroke toggles a `keep-\n\ -! position' flag which, when set, will keep the same\n\ -! position when moving between pages. Also `0k' and `1k'\n\ -! clear and set this flag, respectively. See also the\n\ -! -keep option.\n\ -! \n\ -! M Sets the margins so that the point currently under the\n\ -! cursor is the upper left-hand corner of the text in the\n\ -! page. Note that this command itself does not move the\n\ -! image at all. For details on how the margins are used,\n\ -! see the -margins option.\n\ -! \n\ -! P ``This is page number n.'' This can be used to make\n\ -! the `g' keystroke refer to actual page numbers instead\n\ -! of absolute page numbers.\n\ -! \n\ -! R Forces the dvi file to be reread. This allows you to\n\ -! preview many versions of the same file while running\n\ -! xdvi only once.\n\ -! \n\ -! s Changes the shrink factor to the given number. If no\n\ -! number is given, the smallest factor that makes the\n\ -! entire page fit in the window will be used. (Margins\n\ -! are ignored in this computation.)\n\ -! \n\ -! S Sets the density factor to be used when shrinking\n\ -! bitmaps. This should be a number between 0 and 100;\n\ -! higher numbers produce lighter characters.\n\ -! \n\ -! t Toggles to the next unit in a sorted list of TeX dimension\n\ -! units for the popup magnifier ruler.\n\ -! \n\ -! V Toggles Ghostscript anti-aliasing. Also `0V' and `1V' clear\n\ -! and enables this mode, respectively. See also the the\n\ -! -gsalpha option.\n\ -! \n\ -! x Toggles expert mode (in which the buttons do not appear).\n\ -! `1x' toggles display of the statusline at the bottom of\n\ -! the window.\n - -!!!------------------------------ -!!! page motion -!!!------------------------------ -! *helpPagemotion: \ -! \n\ -! Moving around in the document\n\ -! \n\ -! \n\ -! \n\ -! n or f or Space or Return or LineFeed or PgDn\n\ -! Moves to the next page (or to the nth next page if a\n\ -! number is given).\n\ -! \n\ -! p or b or Control-H or BackSpace or DELete or PgUp\n\ -! Moves to the previous page (or back n pages).\n\ -! \n\ -! u or Up-arrow\n\ -! Moves up two thirds of a window-full.\n\ -! \n\ -! d or Down-arrow\n\ -! Moves down two thirds of a window-full.\n\ -! \n\ -! l or Left-arrow\n\ -! Moves left two thirds of a window-full.\n\ -! \n\ -! r or Right-arrow\n\ -! Moves right two thirds of a window-full.\n\ -! \n\ -! g or j or End\n\ -! Moves to the page with the given number. Initially,\n\ -! the first page is assumed to be page number 1, but this\n\ -! can be changed with the `P' keystroke, below. If no\n\ -! page number is given, then it goes to the last page.\n\ -! \n\ -! < Move to first page in document.\n\ -! > Move to last page in document.\n - -!!!------------------------------ -!!! end of helptexts -!!!------------------------------ - - -!!!------------------------------------------------------------------------------ -!!!-------------- used for internal checking - DO NOT CHANGE THIS! -------------- -!!!------------------------------------------------------------------------------ -*appDefaultsFileVersion: 20030303 diff --git a/bash/bashrc b/bash/bashrc index 978da9b..f32b3e5 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -25,10 +25,10 @@ shopt -s histappend # Change the window title of X terminals case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix) + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix) PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' ;; - screen) + screen*) PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"' ;; esac @@ -68,7 +68,9 @@ if ${use_color} ; then fi alias ls='ls --color=auto' - #alias grep='grep --colour=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 diff --git a/chktexrc b/chktexrc index d6f288a..f14c252 100644 --- a/chktexrc +++ b/chktexrc @@ -14,7 +14,7 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## ## Contact the author at: ## Jens Berger @@ -56,8 +56,8 @@ # look at the examples of their use. # # Please also note that if you specify a list-keyword twice, we'll -# concatenate the lists. If you you specify a item-keyword twice, -# we'll kill the previous value. +# concatenate the lists. If you specify a item-keyword twice, we'll +# kill the previous value. # # We are slightly context-sensitive when detecting tokens like "}" # and "]"; they have to be preceded by a space. This generally makes @@ -101,14 +101,14 @@ # Quick summary of keywords follows. Keywords marked with a * accept # keywords accepting case-insensitive lists. # -# Abbrev* - A list of abbreviations not automatically catched. +# Abbrev* - A list of abbreviations not automatically caught. # CenterDots - Commands/characters which should have \cdots in # between. # CmdLine - Default commandline options. These will be # processed before the ones you give on the command # line. # HyphDash \ -# NumDash - No. of dashes allowed in different contexts. +# NumDash - Number of dashes allowed in different contexts. # WordDash / # IJAccent - Commands which puts an accent _over_ their # argument. @@ -119,9 +119,11 @@ # LowDots - Commands/characters which should have \ldots in # between. # MathEnvir - Environments which turn on math mode. +# MathCmd - Commands which turn on math mode. +# TextCmd - Commands which turn off math mode. # MathRoman - Mathematical operators with LaTeX replacement # defined. -# NoCharNext - Insists on that certain commands aren't followed by +# NoCharNext - Insists on that certain commands aren't followed by # certain characters. # NonItalic - Commands immediately turning off italic mode. # NotPreSpaced- Commands which should not have a space in front of @@ -180,7 +182,7 @@ CmdLine # # These patterns will be searched for through the text; no matter # whether they appear as normal text, commands or whatever. -# Currently case-sensitive. +# Currently case-sensitive. They are not found in comments. # # I usually define a special command like this: # @@ -214,6 +216,51 @@ UserWarn ] + +### +# +# These patterns will be searched for, no matter whether they appear +# as normal text, commands or arguments. However, they will _not_ +# match in verbatim environments. +# +# Remember that you have to escape (with a !) the following +# characters: "#!= as well as spaces and {}[] if they are proceeded by +# a space. +# +# Since these are PCRE regular expressions, you can use (?i) to make +# the expression case insensitive. See the man pages (man pcresyntax) +# or the nicely formatted http://perldoc.perl.org/perlre.html for +# documentation on the regular expression syntax. Note however that +# some the features of perl regular expression are not available such +# as running code (callouts), and replacing. +# +# An initial PCRE comment (?# ... ) can be used change what is +# displayed, thereby reminding yourself how to fix the problem. +# +### +UserWarnRegex +{ + + (?!#Always! use! \nmid)\\not! *(\||\\mid) + + # capitalize section when saying Section 6. + (?!#-1:Capitalize! before! references)PCRE:\b(chapter|(sub)?section|theorem|lemma|proposition|corollary|appendix)~\\ref + (?!#1:Capitalize! before! references)POSIX:([^[:alnum:]]|^)(chapter|(sub)?section|theorem|lemma|proposition|corollary|appendix)~\\ref + + # spell it out. + PCRE:(?i)\bintro\b(?!#Spell! it! out.! This! comment! is! not! used.) + POSIX:([^[:alnum:]]|^)intro([^[:alnum:]]|$) + + # Pretty tables--see http://texdoc.net/texmf-dist/doc/latex/booktabs/booktabs.pdf + (?!#-2:Use! \toprule,! midrule,! or! \bottomrule! from! booktabs)\\hline + # This relies on it being on a single line, and not having anything + # else on that line. With PCRE we could match balanced [] and {}, + # but I wonder if it's worth the complexity... + (?!#-2:Vertical! rules! in! tables! are! ugly)\\begin\{(array|tabularx?\*?)\}(\[.*\])?\{.*\|.*\} + +} + + ##################################################################### # # Here you can list the path of where ChkTeX should look for files it @@ -237,11 +284,11 @@ TeXInputs ##################################################################### # -# Here you may specify more outputformats for use with the -v option, +# Here you may specify more output formats for use with the -v option, # it simply indexes into this list. Remember to use ! instead of \, # though. # -# For explanation of how % fields expand; look at ChkTeX.{dvi,ps}. +# For explanation of how % fields expand; look at ChkTeX.{dvi,ps,pdf}. # # We will by default select entry number _two_ in this list (we count # from 0), and -v without any parameter selects entry number _three_. @@ -268,14 +315,19 @@ OutFormat # -v5; no line number, ease auto-test "%k %n in %f: %m!n%r%s%t!n%u!n" +# -v6; emacs compilation mode +"!"%f!", line %l.%c:(#%n) %m!n" + } ##################################################################### # -# These commands should be ignored when detecting whether a command -# is ended by a space. +# These commands should be ignored when detecting whether a command +# is ended by a space. You can specify regular expressions in the [] +# section in case you have many custom macros that can be safely +# terminated with a space. # Silent @@ -312,28 +364,41 @@ Silent \textwidth \textheight \hsize \vsize - \if \fi + \if \fi \else \csname \endcsname \z@ \p@ \@warning \typeout \dots \ldots \input \endinput \nextline \leavevmode \cdots -- \appendix \listfiles \and \quad - \vfill \vfil \hfill \hfil \topmargin \oddsidemargin + \appendix \listfiles \and \quad + \hskip \vfill \vfil \hfill \hfil \topmargin \oddsidemargin \frenchspacing \nonfrenchspacing \begingroup \endgroup \par \vrefwarning \upshape \headheight \headsep \hoffset \voffset \cdot \qquad \left \right -} + \qedhere + + \xspace + + \addlinespace \cr \fill \frontmatter + \toprule \midrule \bottomrule + +}[ +# Here you can put regular expressions to match Silent macros. It was +# designed for the case where you have many custom macros sharing a +# common prefix, but can of course be used for other things. + +# \\my.* +] ##################################################################### # # Here, you can specify the length of various dashes. We sort the # dash according to which type of characters that are on the left and -# right of of it. We are only conclusive if they are the same. +# right of it. We are only conclusive if they are the same. # # We associate as follows: # @@ -343,7 +408,7 @@ Silent # WordDash Space (like this --- see?) # # Below you specify how many dashes which are legal in each case. We -# define 0 as an magic constant which always generates an error. You +# define 0 as a magic constant which always generates an error. You # may specify more than one legal dash-length. # # Let's look at an example. You use the following dash-syntax: @@ -375,13 +440,15 @@ WordDash ##################################################################### # -# This keyword indicates commands which argument isn't LaTeX code, -# and which thus should be ignored. +# This keyword indicates commands whose argument isn't LaTeX code, +# and thus should be ignored. # -# After the command, you may place arguments that you wish that -# should be wiped in the process; use [] for optional arguments, {} -# for required ones and * if the command supports an alternative -# variant. These should be separated from the command with a colon. +# After the command, you may place arguments that you wish that +# should be wiped in the process; use [] for optional arguments, {} +# for required ones and * if the command supports an alternative +# variant. These should be separated from the command with a colon. +# Some commands (e.g. \cmidrule) use () to delimit and optional +# argument and so this syntax is supported as well. # # For instance, if you would like to wipe the \newcommand command, # you would declare it as \newcommand:*[][]{} @@ -392,15 +459,25 @@ WordDash WipeArg { - \label:{} \ref:{} \vref:{} \pageref:{} \index:{} \cite:[]{} + \label:{} \ref:{} \eqref:{} \vref:{} \pageref:{} \index:[]{} + \cite:[]{} \nocite:{} \input:{} \verbatiminput:[]{} \listinginput:[]{}{} - \verbatimtabinput:[]{} \include:{} \includeonly:{} + \verbatimtabinput:[]{} \include:{} \includeonly:{} \bibitem:[]{} + \cline:{} \cmidrule:[](){} + \href:{}{} + # Cleveref -- there are many others that could be here as well... + \cref:*{} \cpageref:*{} \crefrange:*{}{} \cpagerefrange:*{}{} + \Cref:*{} \Cpageref:*{} \Crefrange:*{}{} \Cpagerefrange:*{}{} + # natbib + \citet:*[][]{} \citep:*[][]{} \citealt:*{} \citealp:*[]{} \citeauthor:*{} + \Citet:*[][]{} \Citep:*[][]{} \Citealt:*{} \Citealp:*[]{} \Citeauthor:{} + \citetext:{} \citeyear:*{} \citeyearpar:{} } ##################################################################### # -# These environments contains material which will be typeset as +# These environments contain material which will be typeset as # mathematics by LaTeX. This turns on/off some warnings. # # We will automagically append a * to each keyword. @@ -412,6 +489,31 @@ MathEnvir align alignat gather flalign multline } +##################################################################### +# +# These commands contain material which will be typeset as mathematics +# by LaTeX. The commands are assumed to have one mandatory argument +# which is in math mode. This turns on/off some warnings. +# + +MathCmd +{ + \ensuremath +} + +##################################################################### +# +# These commands contain material which will _not_ be typeset as +# mathematics by LaTeX even if it would otherwise be in mathmode. The +# commands are assumed to have one mandatory argument which is in text +# mode. This turns on/off some warnings. +# + +TextCmd +{ + \text \intertext \shortintertext \mbox +} + ##################################################################### # # These environments contains material which contents should be @@ -423,6 +525,7 @@ MathEnvir VerbEnvir { verbatim comment listing verbatimtab rawhtml errexam picture texdraw + filecontents pgfpicture tikzpicture } ##################################################################### @@ -444,7 +547,6 @@ VerbEnvir # by Russ Bubley, . # - Abbrev { # Ordinals @@ -538,10 +640,10 @@ NonItalic ##################################################################### # -# Commands which puts their argument into italic (and thus possibly +# Commands which put their argument into italic (and thus possibly # needs italic correction in the end). # -# This is currently empty, since \textit, \textsl and \emph do that +# This is currently empty, since \textit, \textsl and \emph do that # automatically. # @@ -582,7 +684,7 @@ NotPreSpaced Linker { - \ref \vref \pageref \cite + \ref \vref \pageref \eqref \cite } ##################################################################### @@ -623,8 +725,9 @@ MathRoman ##################################################################### # -# These TeX commands have become unnecessary, as there are LaTeX cmds -# that does the same. Purists should thus avoid these in their code. +# These TeX commands have become unnecessary, as there are LaTeX +# commands that does the same. Purists should thus avoid these in +# their code. # # (These are a spell-corrected version of those lacheck uses). # @@ -640,11 +743,11 @@ Primitives # # Format: \command:characters # -# We'll emit a warning if any of characters are found after the +# We'll emit a warning if any of characters are found after the # command. # -NoCharNext +NoCharNext { \left:{}$ \right:{}$ } @@ -652,18 +755,18 @@ NoCharNext ##################################################################### # # We're killing \verb@...@ commands and the arguments of the commands -# listed above in WIPEARG by overwriting them with a string or a +# listed above in WipeArg by overwriting them with a string or a # single character. # -# This should not contain an alphabetic character (in case the user -# writes (\foo\verb@bar@), neither should it contain be one of LaTeX' -# reserved characters (`#$%&~_^\{}'), or any parenthesis character -# ('()[]{}'). If possible, don't use a punctuation character, -# either, or any spacing character. +# This should not contain an alphabetic character (in case the user +# writes (\foo\verb@bar@), neither should it contain be one of +# LaTeX's reserved characters (`#$%&~_^\{}'), or any parenthesis +# character ('()[]{}'). If possible, don't use a punctuation +# character, either, or any spacing character. # -# The asterix is also unsuitable, as some commands behave in another -# way if they are postpended with an asterix. Which more or less -# leaves us with the pipe. +# The asterisk is also unsuitable, as some commands behave in another +# way if they are appended with an asterisk. Which more or less +# leaves us with the pipe. # # Please note that this may also be a _string_, which will be # repeated until the proper length is reached. @@ -675,4 +778,3 @@ VerbClear = "|" # All for now - have fun. # ##################################################################### - diff --git a/conf.d/dropbox b/conf.d/dropbox new file mode 100644 index 0000000..c20c3c4 --- /dev/null +++ b/conf.d/dropbox @@ -0,0 +1,14 @@ +# /etc/conf.d/dropbox.conf: config file for /etc/init.d/dropbox + +# Users to run dropbox +DROPBOX_USERS="" + +# integer [-20 .. 19 ] default 0 +# change the priority of the server -20 (high) to 19 (low) +# see nice(1) for description +#NICE=0 + +# See start-stop-daemon(8) for possible settings +#IONICE=2 + +PID_DIR=/var/run/dropbox diff --git a/config-archive/etc/bash/bashrc b/config-archive/etc/bash/bashrc index 56e9931..978da9b 100644 --- a/config-archive/etc/bash/bashrc +++ b/config-archive/etc/bash/bashrc @@ -150,22 +150,22 @@ if [ -f /usr/share/mc/mc.gentoo ]; then . /usr/share/mc/mc.gentoo fi -#if [ -e /etc/bash_completion.d/git -o "${HOME}"/.bash_completion.d/git ] ; then -# #echo "/etc/bash_completion.d/git or ${HOME}/.bash_completion.d/git exists ..." -# if ${use_color} ; then -# if [ "$UID" = 0 ]; then -# PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' -# else -# PS1='$? \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' -# fi -# else -# if [ "$UID" = 0 ]; then -# PS1='$? \h:\w$(__git_ps1) \$ ' -# else -# PS1='$? \u@\h:\w$(__git_ps1) > ' -# fi -# fi -#fi +if [ -e /etc/bash_completion.d/git -o "${HOME}"/.bash_completion.d/git ] ; then + #echo "/etc/bash_completion.d/git or ${HOME}/.bash_completion.d/git exists ..." + if ${use_color} ; then + if [ "$UID" = 0 ]; then + PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' + else + PS1='$? \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' + fi + else + if [ "$UID" = 0 ]; then + PS1='$? \h:\w$(__git_ps1) \$ ' + else + PS1='$? \u@\h:\w$(__git_ps1) > ' + fi + fi +fi unset use_color diff --git a/config-archive/etc/bash/bashrc.1 b/config-archive/etc/bash/bashrc.1 new file mode 100644 index 0000000..56e9931 --- /dev/null +++ b/config-archive/etc/bash/bashrc.1 @@ -0,0 +1,172 @@ +# /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) + 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}$(/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\] ' + PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w \$ \[\033[00m\]' + else + #PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' + PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w > \[\033[00m\]' + fi + + alias ls='ls --color=auto' + #alias grep='grep --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 safe_term match_lhs + +if [ -d /usr/scripts ] ; then + export PATH="/usr/scripts:${PATH}" +fi + +if [ -d "${HOME}/bin" ] ; then + export PATH="${PATH}:${HOME}/bin" +fi + +if [ -d "$HOME/lib" ] ; then + if [ -d "$HOME/lib/perl" ] ; then + if [ -z "${PERL5LIB}" ] ; then + export PERL5LIB="$HOME/lib/perl" + else + export PERL5LIB="$HOME/lib/perl:${PERL5LIB}" + fi + fi + if [ -d "$HOME/lib/python" ] ; then + if [ -z "${PYTHONPATH}" ] ; then + export PYTHONPATH="$HOME/lib/python" + else + export PYTHONPATH="$HOME/lib/python:${PYTHONPATH}" + fi + fi +fi + + +#if [[ ${EUID} == 0 ]] ; then +# alias ll="ls -lA" +#else +# alias ll="ls -l" +#fi +alias l="ls -l" +alias ll="ls -lA" +alias la="ls -la" +alias md=mkdir +alias rd=rmdir +alias ..='cd ..' +alias ...='cd ../..' +alias cd..='cd ..' +alias cd...='cd ../..' +alias pl="ps -fu $USER" + +lcd() { + cd $( perl -e ' +use strict; +use Cwd; +my $new = shift; +my $cwd = Cwd::abs_path(getcwd()); +my $newa = $cwd; +if ($new){ + $newa = Cwd::abs_path($new); + $newa = $cwd unless $newa; +}; +printf("%s\n", $newa); +' $1 ) +} + +export LESS="-R -M -I --shift 5" +export LESSCHARSET="utf-8" + +HISTCONTROL=ignoreboth +HISTSIZE=50000 +HISTFILESIZE=50000 +HISTTIMEFORMAT='%Y-%m-%d %H:%M:%S ' + +if [ -f /usr/share/mc/mc.gentoo ]; then + . /usr/share/mc/mc.gentoo +fi + +#if [ -e /etc/bash_completion.d/git -o "${HOME}"/.bash_completion.d/git ] ; then +# #echo "/etc/bash_completion.d/git or ${HOME}/.bash_completion.d/git exists ..." +# if ${use_color} ; then +# if [ "$UID" = 0 ]; then +# PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' +# else +# PS1='$? \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' +# fi +# else +# if [ "$UID" = 0 ]; then +# PS1='$? \h:\w$(__git_ps1) \$ ' +# else +# PS1='$? \u@\h:\w$(__git_ps1) > ' +# fi +# fi +#fi + +unset use_color + +# vim: ts=4 expandtab diff --git a/config-archive/etc/bash/bashrc.dist b/config-archive/etc/bash/bashrc.dist new file mode 100644 index 0000000..3067022 --- /dev/null +++ b/config-archive/etc/bash/bashrc.dist @@ -0,0 +1,82 @@ +# /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) + 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}$(/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 diff --git a/config-archive/etc/bash/bashrc.dist.new b/config-archive/etc/bash/bashrc.dist.new deleted file mode 100644 index 24a1431..0000000 --- a/config-archive/etc/bash/bashrc.dist.new +++ /dev/null @@ -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) - 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}$(/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 diff --git a/config-archive/etc/conf.d/xdm b/config-archive/etc/conf.d/xdm new file mode 100644 index 0000000..3b6c5c7 --- /dev/null +++ b/config-archive/etc/conf.d/xdm @@ -0,0 +1,11 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +#DISPLAYMANAGER="xdm" +DISPLAYMANAGER="gdm" diff --git a/config-archive/etc/conf.d/xdm.dist.new b/config-archive/etc/conf.d/xdm.dist.new new file mode 100644 index 0000000..c82fece --- /dev/null +++ b/config-archive/etc/conf.d/xdm.dist.new @@ -0,0 +1,10 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="xdm" diff --git a/config-archive/etc/logrotate.d/libvirtd b/config-archive/etc/logrotate.d/libvirtd new file mode 100644 index 0000000..c011052 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd @@ -0,0 +1,9 @@ +/var/log/libvirt/libvirtd.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + size 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.dist b/config-archive/etc/logrotate.d/libvirtd.dist new file mode 100644 index 0000000..869c879 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.dist @@ -0,0 +1,9 @@ +/var/log/libvirt/libvirtd.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.lxc b/config-archive/etc/logrotate.d/libvirtd.lxc new file mode 100644 index 0000000..195c359 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.lxc @@ -0,0 +1,9 @@ +/var/log/libvirt/lxc/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + size 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.lxc.dist b/config-archive/etc/logrotate.d/libvirtd.lxc.dist new file mode 100644 index 0000000..af0adc2 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.lxc.dist @@ -0,0 +1,9 @@ +/var/log/libvirt/lxc/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.qemu b/config-archive/etc/logrotate.d/libvirtd.qemu new file mode 100644 index 0000000..eb2edc2 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.qemu @@ -0,0 +1,9 @@ +/var/log/libvirt/qemu/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + size 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.qemu.dist b/config-archive/etc/logrotate.d/libvirtd.qemu.dist new file mode 100644 index 0000000..6a866f9 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.qemu.dist @@ -0,0 +1,9 @@ +/var/log/libvirt/qemu/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.uml b/config-archive/etc/logrotate.d/libvirtd.uml new file mode 100644 index 0000000..200ddb8 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.uml @@ -0,0 +1,9 @@ +/var/log/libvirt/uml/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + size 100k +} diff --git a/config-archive/etc/logrotate.d/libvirtd.uml.dist b/config-archive/etc/logrotate.d/libvirtd.uml.dist new file mode 100644 index 0000000..441a905 --- /dev/null +++ b/config-archive/etc/logrotate.d/libvirtd.uml.dist @@ -0,0 +1,9 @@ +/var/log/libvirt/uml/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf new file mode 100644 index 0000000..1db1c0d --- /dev/null +++ b/config-archive/etc/postfix/main.cf @@ -0,0 +1,670 @@ +# Global Postfix configuration file. This file lists only a subset +# of all parameters. For the syntax, and for a complete parameter +# list, see the postconf(5) manual page (command: "man 5 postconf"). +# +# For common configuration examples, see BASIC_CONFIGURATION_README +# and STANDARD_CONFIGURATION_README. To find these documents, use +# the command "postconf html_directory readme_directory", or go to +# http://www.postfix.org/. +# +# For best results, change no more than 2-3 parameters at a time, +# and test if Postfix still works after every change. + +# SOFT BOUNCE +# +# The soft_bounce parameter provides a limited safety net for +# testing. When soft_bounce is enabled, mail will remain queued that +# would otherwise bounce. This parameter disables locally-generated +# bounces, and prevents the SMTP server from rejecting mail permanently +# (by changing 5xx replies into 4xx replies). However, soft_bounce +# is no cure for address rewriting mistakes or mail routing mistakes. +# +#soft_bounce = no + +# LOCAL PATHNAME INFORMATION +# +# The queue_directory specifies the location of the Postfix queue. +# This is also the root directory of Postfix daemons that run chrooted. +# See the files in examples/chroot-setup for setting up Postfix chroot +# environments on different UNIX systems. +# +queue_directory = /var/spool/postfix + +# The command_directory parameter specifies the location of all +# postXXX commands. +# +command_directory = /usr/sbin + +# The daemon_directory parameter specifies the location of all Postfix +# daemon programs (i.e. programs listed in the master.cf file). This +# directory must be owned by root. +# +daemon_directory = /usr/libexec/postfix + +# The data_directory parameter specifies the location of Postfix-writable +# data files (caches, random numbers). This directory must be owned +# by the mail_owner account (see below). +# +data_directory = /var/lib/postfix + +# QUEUE AND PROCESS OWNERSHIP +# +# The mail_owner parameter specifies the owner of the Postfix queue +# and of most Postfix daemon processes. Specify the name of a user +# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS +# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In +# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED +# USER. +# +mail_owner = postfix + +# The default_privs parameter specifies the default rights used by +# the local delivery agent for delivery to external file or command. +# These rights are used in the absence of a recipient user context. +# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. +# +#default_privs = nobody + +# INTERNET HOST AND DOMAIN NAMES +# +# The myhostname parameter specifies the internet hostname of this +# mail system. The default is to use the fully-qualified domain name +# from gethostname(). $myhostname is used as a default value for many +# other configuration parameters. +# +#myhostname = host.domain.tld +#myhostname = virtual.domain.tld + +# The mydomain parameter specifies the local internet domain name. +# The default is to use $myhostname minus the first component. +# $mydomain is used as a default value for many other configuration +# parameters. +# +#mydomain = domain.tld + +# SENDING MAIL +# +# The myorigin parameter specifies the domain that locally-posted +# mail appears to come from. The default is to append $myhostname, +# which is fine for small sites. If you run a domain with multiple +# machines, you should (1) change this to $mydomain and (2) set up +# a domain-wide alias database that aliases each user to +# user@that.users.mailhost. +# +# For the sake of consistency between sender and recipient addresses, +# myorigin also specifies the default domain name that is appended +# to recipient addresses that have no @domain part. +# +#myorigin = $myhostname +#myorigin = $mydomain + +# RECEIVING MAIL + +# The inet_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on. By default, +# the software claims all active interfaces on the machine. The +# parameter also controls delivery of mail to user@[ip.address]. +# +# See also the proxy_interfaces parameter, for network addresses that +# are forwarded to us via a proxy or network address translator. +# +# Note: you need to stop/start Postfix when this parameter changes. +# +#inet_interfaces = all +#inet_interfaces = $myhostname +#inet_interfaces = $myhostname, localhost + +# The proxy_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on by way of a +# proxy or network address translation unit. This setting extends +# the address list specified with the inet_interfaces parameter. +# +# You must specify your proxy/NAT addresses when your system is a +# backup MX host for other domains, otherwise mail delivery loops +# will happen when the primary MX host is down. +# +#proxy_interfaces = +#proxy_interfaces = 1.2.3.4 + +# The mydestination parameter specifies the list of domains that this +# machine considers itself the final destination for. +# +# These domains are routed to the delivery agent specified with the +# local_transport parameter setting. By default, that is the UNIX +# compatible delivery agent that lookups all recipients in /etc/passwd +# and /etc/aliases or their equivalent. +# +# The default is $myhostname + localhost.$mydomain. On a mail domain +# gateway, you should also include $mydomain. +# +# Do not specify the names of virtual domains - those domains are +# specified elsewhere (see VIRTUAL_README). +# +# Do not specify the names of domains that this machine is backup MX +# host for. Specify those names via the relay_domains settings for +# the SMTP server, or use permit_mx_backup if you are lazy (see +# STANDARD_CONFIGURATION_README). +# +# The local machine is always the final destination for mail addressed +# to user@[the.net.work.address] of an interface that the mail system +# receives mail on (see the inet_interfaces parameter). +# +# Specify a list of host or domain names, /file/name or type:table +# patterns, separated by commas and/or whitespace. A /file/name +# pattern is replaced by its contents; a type:table is matched when +# a name matches a lookup key (the right-hand side is ignored). +# Continue long lines by starting the next line with whitespace. +# +# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". +# +#mydestination = $myhostname, localhost.$mydomain, localhost +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, +# mail.$mydomain, www.$mydomain, ftp.$mydomain + +# REJECTING MAIL FOR UNKNOWN LOCAL USERS +# +# The local_recipient_maps parameter specifies optional lookup tables +# with all names or addresses of users that are local with respect +# to $mydestination, $inet_interfaces or $proxy_interfaces. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown local users. This parameter is defined by default. +# +# To turn off local recipient checking in the SMTP server, specify +# local_recipient_maps = (i.e. empty). +# +# The default setting assumes that you use the default Postfix local +# delivery agent for local delivery. You need to update the +# local_recipient_maps setting if: +# +# - You define $mydestination domain recipients in files other than +# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. +# For example, you define $mydestination domain recipients in +# the $virtual_mailbox_maps files. +# +# - You redefine the local delivery agent in master.cf. +# +# - You redefine the "local_transport" setting in main.cf. +# +# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" +# feature of the Postfix local delivery agent (see local(8)). +# +# Details are described in the LOCAL_RECIPIENT_README file. +# +# Beware: if the Postfix SMTP server runs chrooted, you probably have +# to access the passwd file via the proxymap service, in order to +# overcome chroot restrictions. The alternative, having a copy of +# the system passwd file in the chroot jail is just not practical. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify a bare username, an @domain.tld +# wild-card, or specify a user@domain.tld address. +# +#local_recipient_maps = unix:passwd.byname $alias_maps +#local_recipient_maps = proxy:unix:passwd.byname $alias_maps +#local_recipient_maps = + +# The unknown_local_recipient_reject_code specifies the SMTP server +# response code when a recipient domain matches $mydestination or +# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty +# and the recipient address or address local-part is not found. +# +# The default setting is 550 (reject mail) but it is safer to start +# with 450 (try again later) until you are certain that your +# local_recipient_maps settings are OK. +# +unknown_local_recipient_reject_code = 550 + +# TRUST AND RELAY CONTROL + +# The mynetworks parameter specifies the list of "trusted" SMTP +# clients that have more privileges than "strangers". +# +# In particular, "trusted" SMTP clients are allowed to relay mail +# through Postfix. See the smtpd_recipient_restrictions parameter +# in postconf(5). +# +# You can specify the list of "trusted" network addresses by hand +# or you can let Postfix do it for you (which is the default). +# +# By default (mynetworks_style = subnet), Postfix "trusts" SMTP +# clients in the same IP subnetworks as the local machine. +# On Linux, this does works correctly only with interfaces specified +# with the "ifconfig" command. +# +# Specify "mynetworks_style = class" when Postfix should "trust" SMTP +# clients in the same IP class A/B/C networks as the local machine. +# Don't do this with a dialup site - it would cause Postfix to "trust" +# your entire provider's network. Instead, specify an explicit +# mynetworks list by hand, as described below. +# +# Specify "mynetworks_style = host" when Postfix should "trust" +# only the local machine. +# +#mynetworks_style = class +#mynetworks_style = subnet +#mynetworks_style = host + +# Alternatively, you can specify the mynetworks list by hand, in +# which case Postfix ignores the mynetworks_style setting. +# +# Specify an explicit list of network/netmask patterns, where the +# mask specifies the number of bits in the network part of a host +# address. +# +# You can also specify the absolute pathname of a pattern file instead +# of listing the patterns here. Specify type:table for table-based lookups +# (the value on the table right-hand side is not used). +# +#mynetworks = 168.100.189.0/28, 127.0.0.0/8 +#mynetworks = $config_directory/mynetworks +#mynetworks = hash:/etc/postfix/network_table + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] +#relayhost = [mail.pb.local] +relayhost = [smtp.googlemail.com] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = no + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = no +home_mailbox = .maildir/ +mydomain = pb.local +canonical_maps = pcre:/etc/postfix/canonical +myorigin = profitbricks.com +smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth +smtp_sasl_auth_enable = yes +smtp_tls_cert_file = /etc/postfix/postfix.pem +smtp_sasl_security_options = noanonymous +smtp_tls_enforce_peername = no +smtp_tls_key_file = /etc/postfix/postfix.pem +smtp_use_tls = yes +tls_random_source = dev:/dev/urandom diff --git a/config-archive/etc/postfix/main.cf.dist.new b/config-archive/etc/postfix/main.cf.dist.new new file mode 100644 index 0000000..91b548c --- /dev/null +++ b/config-archive/etc/postfix/main.cf.dist.new @@ -0,0 +1,659 @@ +# Global Postfix configuration file. This file lists only a subset +# of all parameters. For the syntax, and for a complete parameter +# list, see the postconf(5) manual page (command: "man 5 postconf"). +# +# For common configuration examples, see BASIC_CONFIGURATION_README +# and STANDARD_CONFIGURATION_README. To find these documents, use +# the command "postconf html_directory readme_directory", or go to +# http://www.postfix.org/. +# +# For best results, change no more than 2-3 parameters at a time, +# and test if Postfix still works after every change. + +# SOFT BOUNCE +# +# The soft_bounce parameter provides a limited safety net for +# testing. When soft_bounce is enabled, mail will remain queued that +# would otherwise bounce. This parameter disables locally-generated +# bounces, and prevents the SMTP server from rejecting mail permanently +# (by changing 5xx replies into 4xx replies). However, soft_bounce +# is no cure for address rewriting mistakes or mail routing mistakes. +# +#soft_bounce = no + +# LOCAL PATHNAME INFORMATION +# +# The queue_directory specifies the location of the Postfix queue. +# This is also the root directory of Postfix daemons that run chrooted. +# See the files in examples/chroot-setup for setting up Postfix chroot +# environments on different UNIX systems. +# +queue_directory = /var/spool/postfix + +# The command_directory parameter specifies the location of all +# postXXX commands. +# +command_directory = /usr/sbin + +# The daemon_directory parameter specifies the location of all Postfix +# daemon programs (i.e. programs listed in the master.cf file). This +# directory must be owned by root. +# +daemon_directory = /usr/libexec/postfix + +# The data_directory parameter specifies the location of Postfix-writable +# data files (caches, random numbers). This directory must be owned +# by the mail_owner account (see below). +# +data_directory = /var/lib/postfix + +# QUEUE AND PROCESS OWNERSHIP +# +# The mail_owner parameter specifies the owner of the Postfix queue +# and of most Postfix daemon processes. Specify the name of a user +# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS +# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In +# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED +# USER. +# +mail_owner = postfix + +# The default_privs parameter specifies the default rights used by +# the local delivery agent for delivery to external file or command. +# These rights are used in the absence of a recipient user context. +# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. +# +#default_privs = nobody + +# INTERNET HOST AND DOMAIN NAMES +# +# The myhostname parameter specifies the internet hostname of this +# mail system. The default is to use the fully-qualified domain name +# from gethostname(). $myhostname is used as a default value for many +# other configuration parameters. +# +#myhostname = host.domain.tld +#myhostname = virtual.domain.tld + +# The mydomain parameter specifies the local internet domain name. +# The default is to use $myhostname minus the first component. +# $mydomain is used as a default value for many other configuration +# parameters. +# +#mydomain = domain.tld + +# SENDING MAIL +# +# The myorigin parameter specifies the domain that locally-posted +# mail appears to come from. The default is to append $myhostname, +# which is fine for small sites. If you run a domain with multiple +# machines, you should (1) change this to $mydomain and (2) set up +# a domain-wide alias database that aliases each user to +# user@that.users.mailhost. +# +# For the sake of consistency between sender and recipient addresses, +# myorigin also specifies the default domain name that is appended +# to recipient addresses that have no @domain part. +# +#myorigin = $myhostname +#myorigin = $mydomain + +# RECEIVING MAIL + +# The inet_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on. By default, +# the software claims all active interfaces on the machine. The +# parameter also controls delivery of mail to user@[ip.address]. +# +# See also the proxy_interfaces parameter, for network addresses that +# are forwarded to us via a proxy or network address translator. +# +# Note: you need to stop/start Postfix when this parameter changes. +# +#inet_interfaces = all +#inet_interfaces = $myhostname +#inet_interfaces = $myhostname, localhost + +# The proxy_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on by way of a +# proxy or network address translation unit. This setting extends +# the address list specified with the inet_interfaces parameter. +# +# You must specify your proxy/NAT addresses when your system is a +# backup MX host for other domains, otherwise mail delivery loops +# will happen when the primary MX host is down. +# +#proxy_interfaces = +#proxy_interfaces = 1.2.3.4 + +# The mydestination parameter specifies the list of domains that this +# machine considers itself the final destination for. +# +# These domains are routed to the delivery agent specified with the +# local_transport parameter setting. By default, that is the UNIX +# compatible delivery agent that lookups all recipients in /etc/passwd +# and /etc/aliases or their equivalent. +# +# The default is $myhostname + localhost.$mydomain. On a mail domain +# gateway, you should also include $mydomain. +# +# Do not specify the names of virtual domains - those domains are +# specified elsewhere (see VIRTUAL_README). +# +# Do not specify the names of domains that this machine is backup MX +# host for. Specify those names via the relay_domains settings for +# the SMTP server, or use permit_mx_backup if you are lazy (see +# STANDARD_CONFIGURATION_README). +# +# The local machine is always the final destination for mail addressed +# to user@[the.net.work.address] of an interface that the mail system +# receives mail on (see the inet_interfaces parameter). +# +# Specify a list of host or domain names, /file/name or type:table +# patterns, separated by commas and/or whitespace. A /file/name +# pattern is replaced by its contents; a type:table is matched when +# a name matches a lookup key (the right-hand side is ignored). +# Continue long lines by starting the next line with whitespace. +# +# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". +# +#mydestination = $myhostname, localhost.$mydomain, localhost +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, +# mail.$mydomain, www.$mydomain, ftp.$mydomain + +# REJECTING MAIL FOR UNKNOWN LOCAL USERS +# +# The local_recipient_maps parameter specifies optional lookup tables +# with all names or addresses of users that are local with respect +# to $mydestination, $inet_interfaces or $proxy_interfaces. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown local users. This parameter is defined by default. +# +# To turn off local recipient checking in the SMTP server, specify +# local_recipient_maps = (i.e. empty). +# +# The default setting assumes that you use the default Postfix local +# delivery agent for local delivery. You need to update the +# local_recipient_maps setting if: +# +# - You define $mydestination domain recipients in files other than +# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. +# For example, you define $mydestination domain recipients in +# the $virtual_mailbox_maps files. +# +# - You redefine the local delivery agent in master.cf. +# +# - You redefine the "local_transport" setting in main.cf. +# +# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" +# feature of the Postfix local delivery agent (see local(8)). +# +# Details are described in the LOCAL_RECIPIENT_README file. +# +# Beware: if the Postfix SMTP server runs chrooted, you probably have +# to access the passwd file via the proxymap service, in order to +# overcome chroot restrictions. The alternative, having a copy of +# the system passwd file in the chroot jail is just not practical. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify a bare username, an @domain.tld +# wild-card, or specify a user@domain.tld address. +# +#local_recipient_maps = unix:passwd.byname $alias_maps +#local_recipient_maps = proxy:unix:passwd.byname $alias_maps +#local_recipient_maps = + +# The unknown_local_recipient_reject_code specifies the SMTP server +# response code when a recipient domain matches $mydestination or +# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty +# and the recipient address or address local-part is not found. +# +# The default setting is 550 (reject mail) but it is safer to start +# with 450 (try again later) until you are certain that your +# local_recipient_maps settings are OK. +# +unknown_local_recipient_reject_code = 550 + +# TRUST AND RELAY CONTROL + +# The mynetworks parameter specifies the list of "trusted" SMTP +# clients that have more privileges than "strangers". +# +# In particular, "trusted" SMTP clients are allowed to relay mail +# through Postfix. See the smtpd_recipient_restrictions parameter +# in postconf(5). +# +# You can specify the list of "trusted" network addresses by hand +# or you can let Postfix do it for you (which is the default). +# +# By default (mynetworks_style = subnet), Postfix "trusts" SMTP +# clients in the same IP subnetworks as the local machine. +# On Linux, this does works correctly only with interfaces specified +# with the "ifconfig" command. +# +# Specify "mynetworks_style = class" when Postfix should "trust" SMTP +# clients in the same IP class A/B/C networks as the local machine. +# Don't do this with a dialup site - it would cause Postfix to "trust" +# your entire provider's network. Instead, specify an explicit +# mynetworks list by hand, as described below. +# +# Specify "mynetworks_style = host" when Postfix should "trust" +# only the local machine. +# +#mynetworks_style = class +#mynetworks_style = subnet +#mynetworks_style = host + +# Alternatively, you can specify the mynetworks list by hand, in +# which case Postfix ignores the mynetworks_style setting. +# +# Specify an explicit list of network/netmask patterns, where the +# mask specifies the number of bits in the network part of a host +# address. +# +# You can also specify the absolute pathname of a pattern file instead +# of listing the patterns here. Specify type:table for table-based lookups +# (the value on the table right-hand side is not used). +# +#mynetworks = 168.100.189.0/28, 127.0.0.0/8 +#mynetworks = $config_directory/mynetworks +#mynetworks = hash:/etc/postfix/network_table + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = no + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = no +inet_protocols = ipv4 +home_mailbox = .maildir/ +smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination diff --git a/config-archive/etc/skel/.bash_logout b/config-archive/etc/skel/.bash_logout new file mode 100644 index 0000000..62581c4 --- /dev/null +++ b/config-archive/etc/skel/.bash_logout @@ -0,0 +1,6 @@ +# /etc/skel/.bash_logout + +# This file is sourced when a login shell terminates. + +# Clear the screen for security's sake. +#clear diff --git a/config-archive/etc/skel/.bash_logout.dist.new b/config-archive/etc/skel/.bash_logout.dist.new new file mode 100644 index 0000000..44b6f79 --- /dev/null +++ b/config-archive/etc/skel/.bash_logout.dist.new @@ -0,0 +1,6 @@ +# /etc/skel/.bash_logout + +# This file is sourced when a login shell terminates. + +# Clear the screen for security's sake. +clear diff --git a/config-archive/etc/sudoers b/config-archive/etc/sudoers new file mode 100644 index 0000000..93fce16 --- /dev/null +++ b/config-archive/etc/sudoers @@ -0,0 +1,93 @@ +## sudoers file. +## +## This file MUST be edited with the 'visudo' command as root. +## Failure to use 'visudo' may result in syntax or file permission errors +## that prevent sudo from running. +## +## See the sudoers man page for the details on how to write a sudoers file. +## + +## +## Host alias specification +## +## Groups of machines. These may include host names (optionally with wildcards), +## IP addresses, network numbers or netgroups. +# Host_Alias WEBSERVERS = www1, www2, www3 + +## +## User alias specification +## +## Groups of users. These may consist of user names, uids, Unix groups, +## or netgroups. +# User_Alias ADMINS = millert, dowdy, mikef + +## +## Cmnd alias specification +## +## Groups of commands. Often used to group related commands together. +# Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \ +# /usr/bin/pkill, /usr/bin/top + +## +## Defaults specification +## +## You may wish to keep some of the following environment variables +## when running commands via sudo. +## +## Locale settings +# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET" +## +## Run X applications through sudo; HOME is used to find the +## .Xauthority file. Note that other programs use HOME to find +## configuration files and this may lead to privilege escalation! +# Defaults env_keep += "HOME" +## +## X11 resource path settings +# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH" +## +## Desktop path settings +# Defaults env_keep += "QTDIR KDEDIR" +## +## Allow sudo-run commands to inherit the callers' ConsoleKit session +# Defaults env_keep += "XDG_SESSION_COOKIE" +## +## Uncomment to enable special input methods. Care should be taken as +## this may allow users to subvert the command being run via sudo. +# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +## +## Uncomment to enable logging of a command's output, except for +## sudoreplay and reboot. Use sudoreplay to play back logged sessions. +# Defaults log_output +# Defaults!/usr/bin/sudoreplay !log_output +# Defaults!/usr/local/bin/sudoreplay !log_output +# Defaults!/sbin/reboot !log_output + +## +## Runas alias specification +## + +## +## User privilege specification +## +root ALL=(ALL) ALL + +## Uncomment to allow members of group wheel to execute any command +# %wheel ALL=(ALL) ALL + +## Same thing without a password +# %wheel ALL=(ALL) NOPASSWD: ALL + +## Uncomment to allow members of group sudo to execute any command +# %sudo ALL=(ALL) ALL + +## Uncomment to allow any user to run sudo if they know the password +## of the user they are running the command as (root by default). +# Defaults targetpw # Ask for the password of the target user +# ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' + +## Read drop-in files from /etc/sudoers.d +## (the '#' here does not indicate a comment) +#includedir /etc/sudoers.d + +fbrehm ALL=(ALL) NOPASSWD: ALL +sysadmin ALL=(ALL) NOPASSWD: ALL diff --git a/config-archive/etc/sudoers.dist.new b/config-archive/etc/sudoers.dist.new new file mode 100644 index 0000000..0d7760b --- /dev/null +++ b/config-archive/etc/sudoers.dist.new @@ -0,0 +1,90 @@ +## sudoers file. +## +## This file MUST be edited with the 'visudo' command as root. +## Failure to use 'visudo' may result in syntax or file permission errors +## that prevent sudo from running. +## +## See the sudoers man page for the details on how to write a sudoers file. +## + +## +## Host alias specification +## +## Groups of machines. These may include host names (optionally with wildcards), +## IP addresses, network numbers or netgroups. +# Host_Alias WEBSERVERS = www1, www2, www3 + +## +## User alias specification +## +## Groups of users. These may consist of user names, uids, Unix groups, +## or netgroups. +# User_Alias ADMINS = millert, dowdy, mikef + +## +## Cmnd alias specification +## +## Groups of commands. Often used to group related commands together. +# Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \ +# /usr/bin/pkill, /usr/bin/top + +## +## Defaults specification +## +## You may wish to keep some of the following environment variables +## when running commands via sudo. +## +## Locale settings +# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET" +## +## Run X applications through sudo; HOME is used to find the +## .Xauthority file. Note that other programs use HOME to find +## configuration files and this may lead to privilege escalation! +# Defaults env_keep += "HOME" +## +## X11 resource path settings +# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH" +## +## Desktop path settings +# Defaults env_keep += "QTDIR KDEDIR" +## +## Allow sudo-run commands to inherit the callers' ConsoleKit session +# Defaults env_keep += "XDG_SESSION_COOKIE" +## +## Uncomment to enable special input methods. Care should be taken as +## this may allow users to subvert the command being run via sudo. +# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +## +## Uncomment to enable logging of a command's output, except for +## sudoreplay and reboot. Use sudoreplay to play back logged sessions. +# Defaults log_output +# Defaults!/usr/bin/sudoreplay !log_output +# Defaults!/usr/local/bin/sudoreplay !log_output +# Defaults!/sbin/reboot !log_output + +## +## Runas alias specification +## + +## +## User privilege specification +## +root ALL=(ALL) ALL + +## Uncomment to allow members of group wheel to execute any command +# %wheel ALL=(ALL) ALL + +## Same thing without a password +# %wheel ALL=(ALL) NOPASSWD: ALL + +## Uncomment to allow members of group sudo to execute any command +# %sudo ALL=(ALL) ALL + +## Uncomment to allow any user to run sudo if they know the password +## of the user they are running the command as (root by default). +# Defaults targetpw # Ask for the password of the target user +# ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' + +## Read drop-in files from /etc/sudoers.d +## (the '#' here does not indicate a comment) +#includedir /etc/sudoers.d diff --git a/env.d/05portage b/env.d/05portage deleted file mode 100644 index e55d2d8..0000000 --- a/env.d/05portage +++ /dev/null @@ -1 +0,0 @@ -PYTHONPATH="/usr/lib/portage/pym" diff --git a/env.d/65openvpn b/env.d/65openvpn deleted file mode 100644 index 4ddb034..0000000 --- a/env.d/65openvpn +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT="/usr/share/openvpn/easy-rsa" diff --git a/gentoo-release b/gentoo-release index 0c77c69..e19f985 100644 --- a/gentoo-release +++ b/gentoo-release @@ -1 +1 @@ -Gentoo Base System release 2.1 +Gentoo Base System release 2.2 diff --git a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules index d344d2d..aa3f5d3 100644 --- a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules @@ -1,6 +1,6 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0 from gtk+-2.24.16 +# Created by gtk-query-immodules-2.0 from gtk+-2.24.17 # # ModulesPath = /root/.gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib64/gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/2.10.0/immodules:/usr/lib64/gtk-2.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/immodules # diff --git a/init.d/dropbox b/init.d/dropbox new file mode 100755 index 0000000..9bdbb83 --- /dev/null +++ b/init.d/dropbox @@ -0,0 +1,67 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.2 2012/07/25 02:39:58 naota Exp $ + +PID_DIR=/var/run/dropbox + +depend() { + need localmount net + after bootmisc +} + +start() { + local tmpnice="${NICE:+"--nicelevel "}${NICE}" + local tmpionice="${IONICE:+"--ionice "}${IONICE}" + local started="" + + mkdir -p ${PID_DIR} + + ebegin "Starting dropbox" + for dbuser in ${DROPBOX_USERS}; do + local homedir=$(eval echo ~${dbuser}) + if test -d "${homedir}" && \ + start-stop-daemon -S -b \ + -m --pidfile ${PID_DIR}/$dbuser.pid \ + ${tmpnice} ${tmpionice} \ + -u ${dbuser} -v \ + -e HOME=${homedir} \ + -x /opt/bin/dropbox; then + started="${started} ${dbuser}" + else + eend $? + eerror "Failed to start dropbox for ${dbuser}" + if [ -n "${started}" ]; then + eerror "Stopping already started dropbox" + DROPBOX_USERS=${started} stop + fi + return 1 + fi + done + if [ -z "${started}" ];then + eerror "No dropbox started" + eend 1 + else + eend 0 + fi +} + +stop() { + local retval=0 + ebegin "Stopping dropbox" + for dbuser in ${DROPBOX_USERS}; do + start-stop-daemon --stop \ + --pidfile ${PID_DIR}/${dbuser}.pid || retval=$? + done + eend ${retval} +} + +status() { + for dbuser in ${DROPBOX_USERS}; do + if [ -e ${PID_DIR}/${dbuser}.pid ] ; then + echo "dropboxd for USER $dbuser: running." + else + echo "dropboxd for USER $dbuser: not running." + fi + done +} diff --git a/init.d/mysql b/init.d/mysql index d824b6a..511a6bf 100755 --- a/init.d/mysql +++ b/init.d/mysql @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d,v 1.1 2011/01/13 20:06:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v 1.1 2013/01/18 01:51:47 robbat2 Exp $ depend() { use net.lo @@ -25,12 +25,12 @@ mysql_svcname() { start() { # Check for old conf.d variables that mean migration was not yet done. - local varlist="${!mysql_slot_*} ${!MYSQL_BLOG_PID_FILE*} ${!STOPTIMEOUT*}" - varlist="${varlist// /}" + set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)' + rc=$? # Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable. # It does have a use in testing, as it is possible to build a config file # that works with both the old and new init scripts simulateously. - if [ -n "${varlist}" -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then + if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp." eerror "Not proceeding because it may be dangerous." return 1 @@ -65,14 +65,11 @@ start() { fi local piddir="${pidfile%/*}" - if [ ! -d "$piddir" ] ; then - mkdir "$piddir" && \ - chown mysql "$piddir" - rc=$? - if [ $rc -ne 0 ]; then - eerror "Directory $piddir for pidfile does not exist and cannot be created" - return 1 - fi + checkpath -d --owner mysql:mysql --mode 0755 "$piddir" + rc=$? + if [ $rc -ne 0 ]; then + eerror "Directory $piddir for pidfile does not exist and cannot be created" + return 1 fi local startup_timeout=${STARTUP_TIMEOUT:-900} @@ -80,7 +77,7 @@ start() { local tmpnice="${NICE:+"--nicelevel "}${NICE}" local tmpionice="${IONICE:+"--ionice "}${IONICE}" start-stop-daemon \ - ${DEBUG/*/"--verbose"} \ + ${DEBUG:+"--verbose"} \ --start \ --exec "${basedir}"/sbin/mysqld \ --pidfile "${pidfile}" \ @@ -110,7 +107,7 @@ stop() { local stop_timeout=${STOP_TIMEOUT:-120} start-stop-daemon \ - ${DEBUG/*/"--verbose"} \ + ${DEBUG:+"--verbose"} \ --stop \ --exec "${basedir}"/sbin/mysqld \ --pidfile "${pidfile}" \ diff --git a/iproute2/ematch_map b/iproute2/ematch_map index 7c6a281..1823983 100644 --- a/iproute2/ematch_map +++ b/iproute2/ematch_map @@ -3,3 +3,5 @@ 2 nbyte 3 u32 4 meta +7 canid +8 ipset diff --git a/logrotate.d/libvirtd b/logrotate.d/libvirtd index c011052..869c879 100644 --- a/logrotate.d/libvirtd +++ b/logrotate.d/libvirtd @@ -5,5 +5,5 @@ compress delaycompress copytruncate - size 100k + minsize 100k } diff --git a/logrotate.d/libvirtd.lxc b/logrotate.d/libvirtd.lxc index 195c359..af0adc2 100644 --- a/logrotate.d/libvirtd.lxc +++ b/logrotate.d/libvirtd.lxc @@ -5,5 +5,5 @@ compress delaycompress copytruncate - size 100k + minsize 100k } diff --git a/logrotate.d/libvirtd.qemu b/logrotate.d/libvirtd.qemu index eb2edc2..6a866f9 100644 --- a/logrotate.d/libvirtd.qemu +++ b/logrotate.d/libvirtd.qemu @@ -5,5 +5,5 @@ compress delaycompress copytruncate - size 100k + minsize 100k } diff --git a/logrotate.d/libvirtd.uml b/logrotate.d/libvirtd.uml index 200ddb8..441a905 100644 --- a/logrotate.d/libvirtd.uml +++ b/logrotate.d/libvirtd.uml @@ -5,5 +5,5 @@ compress delaycompress copytruncate - size 100k + minsize 100k } diff --git a/modprobe.d/aliases.conf b/modprobe.d/aliases.conf index 52f30c9..202a93b 100644 --- a/modprobe.d/aliases.conf +++ b/modprobe.d/aliases.conf @@ -23,7 +23,7 @@ alias ppp-compress-21 bsd_comp alias ppp-compress-24 ppp_deflate alias ppp-compress-26 ppp_deflate -# Crypto modules (see http://www.kerneli.org/) +# Crypto modules alias loop-xfer-gen-0 loop_gen alias loop-xfer-3 loop_fish2 alias loop-xfer-gen-10 loop_gen diff --git a/os-release b/os-release new file mode 100644 index 0000000..44ff8fb --- /dev/null +++ b/os-release @@ -0,0 +1,7 @@ +NAME=Gentoo +ID=gentoo +PRETTY_NAME="Gentoo/Linux" +ANSI_COLOR="1;32" +HOME_URL="http://www.gentoo.org/" +SUPPORT_URL="http://www.gentoo.org/main/en/support.xml" +BUG_REPORT_URL="https://bugs.gentoo.org/" diff --git a/postfix/master.cf b/postfix/master.cf index 90ad69a..ec708eb 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -17,19 +17,27 @@ smtp inet n - n - - smtpd # -o syslog_name=postfix/submission # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject +# -o smtpd_reject_unlisted_recipient=no +# -o smtpd_client_restrictions=$mua_client_restrictions +# -o smtpd_helo_restrictions=$mua_helo_restrictions +# -o smtpd_sender_restrictions=$mua_sender_restrictions +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING #smtps inet n - n - - smtpd # -o syslog_name=postfix/smtps # -o smtpd_tls_wrappermode=yes # -o smtpd_sasl_auth_enable=yes -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject +# -o smtpd_reject_unlisted_recipient=no +# -o smtpd_client_restrictions=$mua_client_restrictions +# -o smtpd_helo_restrictions=$mua_helo_restrictions +# -o smtpd_sender_restrictions=$mua_sender_restrictions +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING #628 inet n - n - - qmqpd -pickup fifo n - n 60 1 pickup +pickup unix n - n 60 1 pickup cleanup unix n - n - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - n 300 1 oqmgr +qmgr unix n - n 300 1 qmgr +#qmgr unix n - n 300 1 oqmgr tlsmgr unix - - n 1000? 1 tlsmgr rewrite unix - - n - - trivial-rewrite bounce unix - - n - 0 bounce diff --git a/revdep-rebuild/61-oracle-jdk-bin-1.7 b/revdep-rebuild/61-oracle-jdk-bin-1.7 index 7a38f30..8db1283 100644 --- a/revdep-rebuild/61-oracle-jdk-bin-1.7 +++ b/revdep-rebuild/61-oracle-jdk-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.17" +SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.21" diff --git a/revdep-rebuild/61-oracle-jre-bin-1.7 b/revdep-rebuild/61-oracle-jre-bin-1.7 index 7c90bf1..b7eb98b 100644 --- a/revdep-rebuild/61-oracle-jre-bin-1.7 +++ b/revdep-rebuild/61-oracle-jre-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.17" +SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.21" diff --git a/sgml/catalog b/sgml/catalog index aa9936e..553d531 100644 --- a/sgml/catalog +++ b/sgml/catalog @@ -6,6 +6,6 @@ CATALOG "/etc/sgml/xml-docbook-4.2.cat" CATALOG "/etc/sgml/xml-docbook-4.1.2.cat" CATALOG "/etc/sgml/xml-docbook-4.3.cat" CATALOG "/etc/sgml/xml-docbook-4.4.cat" -CATALOG "/etc/sgml/openjade-1.3.2.cat" CATALOG "/etc/sgml/xml-docbook-4.5.cat" CATALOG "/etc/sgml/xhtml1.cat" +CATALOG "/etc/sgml/openjade-1.3.2.cat" diff --git a/texmf/language.dat.d/language.texlive-langgerman.dat b/texmf/language.dat.d/language.texlive-langgerman.dat index 2abf20f..8866fd3 100644 --- a/texmf/language.dat.d/language.texlive-langgerman.dat +++ b/texmf/language.dat.d/language.texlive-langgerman.dat @@ -1,6 +1,6 @@ -german-x-2009-06-19 dehypht-x-2009-06-19.tex +german-x-2012-05-30 dehypht-x-2012-05-30.tex =german-x-latest -ngerman-x-2009-06-19 dehyphn-x-2009-06-19.tex +ngerman-x-2012-05-30 dehyphn-x-2012-05-30.tex =ngerman-x-latest german loadhyph-de-1901.tex ngerman loadhyph-de-1996.tex diff --git a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua index 9613046..9fbb615 100644 --- a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua +++ b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua @@ -1,13 +1,13 @@ - ['german-x-2009-06-19'] = { - loader = 'dehypht-x-2009-06-19.tex', + ['german-x-2012-05-30'] = { + loader = 'dehypht-x-2012-05-30.tex', lefthyphenmin = 2, righthyphenmin = 2, synonyms = { 'german-x-latest' }, patterns = 'hyph-de-1901.pat.txt', hyphenation = 'hyph-de-1901.hyp.txt', }, - ['ngerman-x-2009-06-19'] = { - loader = 'dehyphn-x-2009-06-19.tex', + ['ngerman-x-2012-05-30'] = { + loader = 'dehyphn-x-2012-05-30.tex', lefthyphenmin = 2, righthyphenmin = 2, synonyms = { 'ngerman-x-latest' }, diff --git a/texmf/language.def.d/language.texlive-langgerman.def b/texmf/language.def.d/language.texlive-langgerman.def index 85d8ccd..26e4e2c 100644 --- a/texmf/language.def.d/language.texlive-langgerman.def +++ b/texmf/language.def.d/language.texlive-langgerman.def @@ -1,7 +1,7 @@ -\addlanguage{german-x-2009-06-19}{dehypht-x-2009-06-19.tex}{}{2}{2} -\addlanguage{german-x-latest}{dehypht-x-2009-06-19.tex}{}{2}{2} -\addlanguage{ngerman-x-2009-06-19}{dehyphn-x-2009-06-19.tex}{}{2}{2} -\addlanguage{ngerman-x-latest}{dehyphn-x-2009-06-19.tex}{}{2}{2} +\addlanguage{german-x-2012-05-30}{dehypht-x-2012-05-30.tex}{}{2}{2} +\addlanguage{german-x-latest}{dehypht-x-2012-05-30.tex}{}{2}{2} +\addlanguage{ngerman-x-2012-05-30}{dehyphn-x-2012-05-30.tex}{}{2}{2} +\addlanguage{ngerman-x-latest}{dehyphn-x-2012-05-30.tex}{}{2}{2} \addlanguage{german}{loadhyph-de-1901.tex}{}{2}{2} \addlanguage{ngerman}{loadhyph-de-1996.tex}{}{2}{2} \addlanguage{swissgerman}{loadhyph-de-ch-1901.tex}{}{2}{2} diff --git a/texmf/ls-R b/texmf/ls-R index cd14e71..5882c9c 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -66,8 +66,8 @@ language.texlive-langgerman.def 80jadetex.cnf ./updmap.d: -.keep_app-text_texlive-core-0 00updmap.cfg +.keep_app-text_texlive-core-0 texlive-basic.cfg texlive-context.cfg texlive-fontsextra.cfg @@ -84,8 +84,8 @@ texlive-pictures.cfg texlive-science.cfg ./web2c: -.keep_app-text_texlive-core-0 fmtutil.cnf +.keep_app-text_texlive-core-0 texmf.cnf updmap.cfg diff --git a/texmf/texmf.d/00header.cnf b/texmf/texmf.d/00header.cnf index 5b31f3b..e0d38fd 100644 --- a/texmf/texmf.d/00header.cnf +++ b/texmf/texmf.d/00header.cnf @@ -4,8 +4,8 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,3 +40,4 @@ % use of this. + diff --git a/texmf/texmf.d/05searchpaths.cnf b/texmf/texmf.d/05searchpaths.cnf index 6858b04..03eaeae 100644 --- a/texmf/texmf.d/05searchpaths.cnf +++ b/texmf/texmf.d/05searchpaths.cnf @@ -7,6 +7,8 @@ % (http://tug.org/tds), or files may not be found. % % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +% Kpathsea sets SELFAUTOLOC (the directory with the binary), +% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share % The tree containing runtime files related to the specific diff --git a/texmf/texmf.d/10standardpaths.cnf b/texmf/texmf.d/10standardpaths.cnf index c9a284f..d046a95 100644 --- a/texmf/texmf.d/10standardpaths.cnf +++ b/texmf/texmf.d/10standardpaths.cnf @@ -83,11 +83,17 @@ TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. -TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// +TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// -% epTeX. -TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// +% epTeX, and for pmpost. +TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEX.pmpost = eptex + +% (e)up(La)TeX. +TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// +TEXINPUTS.uptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// +TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic}// % pBibTeX bibliographies and style files. BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// @@ -177,6 +183,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + % MFT style files. MFTINPUTS = .;$TEXMF/mft// @@ -242,11 +252,13 @@ MPSUPPORT = .;$TEXMF/metapost/support MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc -% Default settings for fontconfig library, used by Windows versions of -% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this. -FONTCONFIG_FILE=fonts.conf -FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf -FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache +% Default settings for the fontconfig library as used by the Windows +% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores +% this. ConTeXT MkIV (all platforms) also use these values. +% +FONTCONFIG_FILE = fonts.conf +FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf +FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache % TeX documentation and source files, for use with texdoc and kpsewhich. TEXDOCS = $TEXMF/doc// @@ -281,10 +293,19 @@ TW_INIPATH = $TW_LIBPATH % would allow command execution. DVIPDFMXINPUTS = $TEXMF/dvipdfmx -% Find scripts that are distributed/installed in the texmf tree. - % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS sufficess for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// % Lua needs to look for binary lua libraries distributed with packages. CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// @@ -314,9 +335,39 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file % will take precedence over the distributed one under texmf/web2c. % -% For security reasons, it is better not to include . in this path. +% For security reasons, it is best not to include . in this path. +% +% The idea behind this lengthy definition: for each of +% SELFAUTO{LOC,DIR,AUTO}, look in the directory, +% then the subdirectories share/texmf-local and share/texmf, +% then ./texmf-local and ./texmf. +% +% However, we want to include one more directory: the +% great-grandparent's texmf-local, because that is how TL is installed +% by default. That is, given a binary +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +% +% As a result, we cannot use actual brace expansion in the definition, +% since we don't want to scatter ../'s throughout the value. Hence we +% explicitly list every directory. Arguably more understandable this +% way anyway. +% +TEXMFCNF = {\ +$SELFAUTOLOC,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTODIR,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTOPARENT/../texmf-local/web2c,\ +$SELFAUTOPARENT,\ +$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +} % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} +% For reference, here is the old brace-using definition: +%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} % kpathsea 3.5.3 and later sets these at runtime. To avoid empty % expansions from binaries linked against an earlier version of the @@ -326,4 +377,3 @@ engine = unsetengine - diff --git a/texmf/texmf.d/15options.cnf b/texmf/texmf.d/15options.cnf index 809a038..e947780 100644 --- a/texmf/texmf.d/15options.cnf +++ b/texmf/texmf.d/15options.cnf @@ -37,6 +37,7 @@ shell_escape_commands = \ bibtex,bibtex8,\ kpsewhich,\ makeindex,\ +mpost,\ repstopdf,\ % we'd like to allow: @@ -146,4 +147,3 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 - diff --git a/texmf/texmf.d/20sizes.cnf b/texmf/texmf.d/20sizes.cnf index c7bf620..24a6289 100644 --- a/texmf/texmf.d/20sizes.cnf +++ b/texmf/texmf.d/20sizes.cnf @@ -96,7 +96,7 @@ screen_depth.mf = 1200 % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 -glob_str_size = 5000 +glob_str_size = 20000 max_strings.bibtex = 35307 max_strings.bibtex8 = 35307 max_strings.bibtexu = 35307 @@ -106,3 +106,5 @@ max_strings.pbibtex = 35307 line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 + + diff --git a/texmf/updmap.d/00updmap.cfg b/texmf/updmap.d/00updmap.cfg index 1b91171..7128c79 100644 --- a/texmf/updmap.d/00updmap.cfg +++ b/texmf/updmap.d/00updmap.cfg @@ -1,30 +1,5 @@ -# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 31 04:12:04 2011 -# $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $ -# -# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with -# all the Map and MixedMap lines from an installation, possibly -# appending a local configuration file. -# -# To make local customizations to the map files, please use of the -# following methods: -# -# 1) call -# updmap-sys --enable Map=foo.map -# for each map file. (Or MixedMap instead of Map, if your font has -# both Metafont and outline definitions.) See the updmap --help -# documentation. -# -# 2) add your local map entries to the file -# TEXMFLOCAL/web2c/updmap-local.cfg -# and then call -# tlmgr generate updmap -# which will concatenate updmap-local.cfg to the end of the final -# updmap.cfg. (You can override the local.cfg file location with the -# --localcfg option; see tlmgr --help.) -# -# If you use either of these methods, your local adaptations will be -# preserved when tlmgr updates the installation or this config file. -# Manual edits to updmap.cfg may be lost on update. +# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ +# updmap.cfg for TEXMFMAIN - updmap options. ################################################################ @@ -67,7 +42,7 @@ LW35 URWkb # the LW35 fonts resp. use the built-in fonts. # # Valid settings are true / false: -dvipsDownloadBase35 false +dvipsDownloadBase35 true # # pdftexDownloadBase14 @@ -82,223 +57,20 @@ pdftexDownloadBase14 true # # dvipdfmDownloadBase14 # -# Should dvipdfm download the base 14 pdf fonts? Since some configurations +# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download # the fonts. The pdf files will get bigger, though. # Valid settings are true (download the fonts) or false (don't download # the fonts). dvipdfmDownloadBase14 true -################################################################ -# Map files. -################################################################ # -# There are two possible entries: Map and MixedMap. Both have one additional -# argument: the filename of the map file. MixedMap ("mixed" means that -# the font is available as bitmap and as outline) lines will not be used -# in the default map of dvips if dvipsPreferOutline is false. Inactive -# Map files should be marked by "#! " (without the quotes), not just #. +# kanjiEmbed # - -#! Map OrnementsADF.map -#! Map ArrowsADF.map -#! Map BulletsADF.map -#! MixedMap allrunes.map -#! Map euler.map -#! MixedMap cm.map -#! MixedMap cmextra.map -#! MixedMap cyrillic.map -#! MixedMap latxfont.map -#! MixedMap symbols.map -#! Map uaq.map -#! Map antt.map -#! Map arabi.map -#! MixedMap arabtex.map -#! Map archaicprw.map -#! Map arev.map -#! Map bkaiu.map -#! Map bsmiu.map -#! Map gbsnu.map -#! Map gkaiu.map -#! Map ascii.map -#! Map augie.map -#! Map auncial.map -#! Map aurical.map -#! Map ybv.map -#! MixedMap bbold.map -#! Map belleek.map -#! Map bera.map -#! Map ybd.map -#! Map sqrcaps.map -#! Map boondox.map -#! Map pbsi.map -#! Map burmese.map -#! Map cantarell.map -#! Map cmin.map -#! MixedMap cbgreek-full.map -#! MixedMap ccpl.map -#! Map ccicons.map -#! Map clm.map -#! Map chemarrow.map -#! Map cjhebrew.map -#! MixedMap cmtext-bsr-interpolated.map -#! Map cm-lgc.map -#! MixedMap cm-super-t1.map -#! MixedMap cm-super-t2a.map -#! MixedMap cm-super-t2b.map -#! MixedMap cm-super-t2c.map -#! MixedMap cm-super-ts1.map -#! MixedMap cm-super-x2.map -#! Map cmcyr.map -#! MixedMap cmll.map -#! Map comfortaa.map -#! Map original-context-symbol.map -#! MixedMap csother.map -#! MixedMap cstext.map -#! Map cyklop.map -#! Map dictsym.map -#! Map dstroke.map -#! Map droid.map -#! Map yes.map -#! Map epigrafica.map -#! Map epiolmec.map -#! MixedMap esint.map -#! Map ESSTIX.map -#! Map esvect.map -#! MixedMap ethiop.map -#! MixedMap eurosym.map -#! Map fdsymbol.map -#! Map fge.map -#! Map foekfont.map -#! Map fonetika.map -#! Map fourier-utopia-expert.map -#! Map fourier.map -#! Map garuda-c90.map -#! Map gfsartemisia.map -#! Map gfsbaskerville.map -#! Map gfsbodoni.map -#! Map gfscomplutum.map -#! Map gfsdidot.map -#! Map gfsneohellenic.map -#! Map gfsporson.map -#! Map gfssolomos.map -#! Map yfrak.map -#! Map ugq.map -#! Map grverb.map -#! MixedMap hfbright.map -#! MixedMap iby.map -#! Map fi4.map -#! Map Acorn.map -#! Map AnnSton.map -#! Map ArtNouv.map -#! Map ArtNouvc.map -#! Map Carrickc.map -#! Map Eichenla.map -#! Map Eileen.map -#! Map EileenBl.map -#! Map Elzevier.map -#! Map GotIn.map -#! Map GoudyIn.map -#! Map Kinigcap.map -#! Map Konanur.map -#! Map Kramer.map -#! Map MorrisIn.map -#! Map Nouveaud.map -#! Map Romantik.map -#! Map Rothdn.map -#! Map RoyalIn.map -#! Map Sanremo.map -#! Map Starburst.map -#! Map Typocaps.map -#! Map Zallman.map -#! Map iwona.map -#! Map kerkis.map -#! Map knitfont.map -#! Map kpfonts.map -#! Map kurier.map -#! Map lato.map -#! Map libertine.map -#! Map yly.map -#! Map linearA.map -#! Map l7x-urwvn.map -#! Map lm.map -#! MixedMap lxfonts.map -#! MixedMap manfnt.map -#! Map marvosym.map -#! Map mathabx.map -#! Map mdbch.map -#! Map mdput.map -#! Map mdugm.map -#! Map troff-updmap.map -#! MixedMap mflogo.map -#! Map MnSymbol.map -#! MixedMap mongolian.map -#! MixedMap musix.map -#! Map norasi-c90.map -#! Map cherokee.map -#! Map ocrb.map -#! Map oinuit.map -#! Map omega.map -#! Map phaistos.map -#! MixedMap pigpen.map -#! MixedMap plother.map -#! MixedMap pltext.map -#! Map ap.map -#! Map prodint.map -#! Map charter.map -#! Map fpls.map -#! Map pazo.map -#! Map utopia.map -#! Map PTSans-type1.map -#! Map PTSerif-type1.map -#! Map pxfonts.map -#! Map recycle.map -#! Map yrd.map -#! MixedMap rsfs.map -#! Map skt.map -#! MixedMap semaf.map -#! Map SkakNew.map -#! Map starfont.map -#! Map icelandic.map -#! MixedMap stmaryrd.map -#! Map tabvar.map -Map mathpple.map -#! Map qag.map -#! Map qbk.map -#! Map qcr.map -#! Map qcs.map -#! Map qhv.map -#! Map qpl.map -#! Map qtm.map -#! Map qzc.map -#! Map tfrupee.map -#! MixedMap tipa.map -#! MixedMap trajan.map -#! Map txfonts.map -#! Map gptimes.map -#! Map umj.map -#! MixedMap dvng.map -#! Map yv1.map -#! Map yv2.map -#! Map yv3.map -#! Map yvo.map -#! Map yvt.map -#! Map arevvn.map -#! Map chartervn.map -#! Map cmbrightvn.map -#! Map concretevn.map -#! Map grotesqvn.map -#! Map txttvn.map -#! Map urwvn.map -#! MixedMap vnrother.map -#! MixedMap vnrtext.map -#! Map vntopia.map -#! Map dgj.map -#! Map dmj.map -#! Map mc2j.map -#! Map mcj.map -#! Map mr2j.map -#! Map mrj.map -#! MixedMap wasy.map -#! MixedMap xypic.map -#! MixedMap yhmath.map +# updmap generates a file kanjix.map for usage with dvipdfmx. With this +# option one can switch between not embedding any kanji font, or +# any of the several available. +# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring +# in a map file name will be replaced with this value, and the respective +# map file used. +kanjiEmbed noEmbed diff --git a/texmf/updmap.d/texlive-fontsextra.cfg b/texmf/updmap.d/texlive-fontsextra.cfg index a346e91..61f3a10 100644 --- a/texmf/updmap.d/texlive-fontsextra.cfg +++ b/texmf/updmap.d/texlive-fontsextra.cfg @@ -7,6 +7,7 @@ Map antt.map Map archaicprw.map Map arev.map Map ascii.map +Map aspectratio.map Map augie.map Map auncial.map Map aurical.map @@ -15,9 +16,11 @@ MixedMap bbold.map Map belleek.map Map bera.map Map ybd.map +Map bguq.map Map sqrcaps.map Map boondox.map Map pbsi.map +Map calligra.map Map cantarell.map Map cmin.map Map ccicons.map @@ -25,10 +28,13 @@ Map clm.map Map cm-lgc.map MixedMap cmll.map Map comfortaa.map +Map CountriesOfEurope.map Map cyklop.map +Map dejavu-type1.map Map dictsym.map Map dstroke.map Map droid.map +Map dutchcal.map Map yes.map Map epigrafica.map Map ESSTIX.map @@ -39,6 +45,7 @@ Map foekfont.map Map fonetika.map Map fourier.map Map fourier-utopia-expert.map +Map frcursive.map Map gfsartemisia.map Map gfsbodoni.map Map gfscomplutum.map @@ -84,18 +91,23 @@ Map mathabx.map Map mdbch.map Map mdput.map Map mdugm.map +Map mdsymbol.map Map MnSymbol.map +Map ntx.map Map cherokee.map Map ocrb.map Map oinuit.map +Map opensans.map +Map paratype-type1.map Map phaistos.map MixedMap pigpen.map Map ap.map Map prodint.map -Map PTSans-type1.map -Map PTSerif-type1.map +Map pxtx.map Map recycle.map Map yrd.map +Map rsfso.map +Map sansmathaccent.map MixedMap semaf.map Map starfont.map Map icelandic.map diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg index 68bdc36..5eda450 100644 --- a/texmf/web2c.d/updmap-hdr.cfg +++ b/texmf/web2c.d/updmap-hdr.cfg @@ -1,101 +1,27 @@ -# $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $ +# $Id: updmap-hdr.cfg 26891 2012-06-10 22:41:49Z karl $ # -# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with -# all the Map and MixedMap lines from an installation, possibly -# appending a local configuration file. +# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by +# concatenating updmap-hdr.cfg with all updmap.cfg files found. # -# To make local customizations to the map files, please use of the -# following methods: +# To make local customizations to the map files, using one of the +# following methods is simplest: # -# 1) call +# 1) run # updmap-sys --enable Map=foo.map # for each map file. (Or MixedMap instead of Map, if your font has # both Metafont and outline definitions.) See the updmap --help -# documentation. +# documentation. This will add lines to the updmap.cfg file in +# TEXMFSYSCONFIG (creating it if necessary). # -# 2) add your local map entries to the file -# TEXMFLOCAL/web2c/updmap-local.cfg -# and then call -# tlmgr generate updmap -# which will concatenate updmap-local.cfg to the end of the final -# updmap.cfg. (You can override the local.cfg file location with the -# --localcfg option; see tlmgr --help.) +# 2) put all your additional fonts into TEXMFLOCAL, edit +# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. # -# If you use either of these methods, your local adaptations will be -# preserved when tlmgr updates the installation or this config file. -# Manual edits to updmap.cfg may be lost on update. - - -################################################################ -# OPTIONS -################################################################ - -# -# dvipsPreferOutline -# -# Should dvips (by default) prefer bitmap fonts or outline fonts -# if both are available? Independent of this setting, outlines -# can be forced by putting "p psfonts_t1.map" into a config file -# that dvips reads. Bitmaps (for the fonts in question) can -# be forced by putting "p psfonts_pk.map" into a config file. -# We provide such config files which can be enabled via -# dvips -Poutline ... resp. dvips -Ppk ... -# -# Valid settings for dvipsPreferOutline are true / false: -dvipsPreferOutline true - -# -# LW35 -# -# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and -# how are the filenames chosen? Valid settings: -# URW: URW fonts with "vendor" filenames (e.g. n019064l.pfb) -# URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) -# ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) -# ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) -LW35 URWkb - -# -# dvipsDownloadBase35 +# See the output of updmap --help and/or +# http://tug.org/fonts/fontinstall.html for more. # -# Should dvips (by default) download the standard 35 LaserWriter fonts -# with the document (then set dvipsDownloadBase35 true) or should these -# fonts be used from the ps interpreter / printer? -# Whatever the default is, the user can override it by specifying -# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download -# the LW35 fonts resp. use the built-in fonts. -# -# Valid settings are true / false: -dvipsDownloadBase35 false - -# -# pdftexDownloadBase14 -# -# Should pdftex download the base 14 pdf fonts? Since some configurations -# (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). Adobe recommends embedding all fonts. -pdftexDownloadBase14 true - -# -# dvipdfmDownloadBase14 -# -# Should dvipdfm download the base 14 pdf fonts? Since some configurations -# (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). -dvipdfmDownloadBase14 true - -################################################################ -# Map files. -################################################################ -# -# There are two possible entries: Map and MixedMap. Both have one additional -# argument: the filename of the map file. MixedMap ("mixed" means that -# the font is available as bitmap and as outline) lines will not be used -# in the default map of dvips if dvipsPreferOutline is false. Inactive -# Map files should be marked by "#! " (without the quotes), not just #. +# In any case, manual edits to TL's updmap.cfg files, psfonts.map, +# pdftex.map, etc., will be lost on update. So don't do that. # - +# The default settings of the updmap options (not maps) are specified in +# TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in +# any other tree. diff --git a/texmf/web2c/texmf.cnf b/texmf/web2c/texmf.cnf index 23129f4..b36dbed 100644 --- a/texmf/web2c/texmf.cnf +++ b/texmf/web2c/texmf.cnf @@ -4,8 +4,8 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,6 +40,7 @@ % use of this. + % Part 1: Search paths and directories. % This is the parent directory of our several trees, i.e., @@ -49,6 +50,8 @@ % (http://tug.org/tds), or files may not be found. % % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +% Kpathsea sets SELFAUTOLOC (the directory with the binary), +% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share % The tree containing runtime files related to the specific @@ -216,11 +219,17 @@ TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. -TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// +TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// + +% epTeX, and for pmpost. +TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEX.pmpost = eptex -% epTeX. -TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// +% (e)up(La)TeX. +TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// +TEXINPUTS.uptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// +TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic}// % pBibTeX bibliographies and style files. BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// @@ -310,6 +319,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + % MFT style files. MFTINPUTS = .;$TEXMF/mft// @@ -375,11 +388,13 @@ MPSUPPORT = .;$TEXMF/metapost/support MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc -% Default settings for fontconfig library, used by Windows versions of -% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this. -FONTCONFIG_FILE=fonts.conf -FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf -FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache +% Default settings for the fontconfig library as used by the Windows +% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores +% this. ConTeXT MkIV (all platforms) also use these values. +% +FONTCONFIG_FILE = fonts.conf +FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf +FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache % TeX documentation and source files, for use with texdoc and kpsewhich. TEXDOCS = $TEXMF/doc// @@ -414,10 +429,19 @@ TW_INIPATH = $TW_LIBPATH % would allow command execution. DVIPDFMXINPUTS = $TEXMF/dvipdfmx -% Find scripts that are distributed/installed in the texmf tree. - % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS sufficess for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// % Lua needs to look for binary lua libraries distributed with packages. CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// @@ -447,9 +471,39 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file % will take precedence over the distributed one under texmf/web2c. % -% For security reasons, it is better not to include . in this path. +% For security reasons, it is best not to include . in this path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} +% The idea behind this lengthy definition: for each of +% SELFAUTO{LOC,DIR,AUTO}, look in the directory, +% then the subdirectories share/texmf-local and share/texmf, +% then ./texmf-local and ./texmf. +% +% However, we want to include one more directory: the +% great-grandparent's texmf-local, because that is how TL is installed +% by default. That is, given a binary +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +% +% As a result, we cannot use actual brace expansion in the definition, +% since we don't want to scatter ../'s throughout the value. Hence we +% explicitly list every directory. Arguably more understandable this +% way anyway. +% +TEXMFCNF = {\ +$SELFAUTOLOC,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTODIR,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTOPARENT/../texmf-local/web2c,\ +$SELFAUTOPARENT,\ +$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +} +% +% For reference, here is the old brace-using definition: +%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} % kpathsea 3.5.3 and later sets these at runtime. To avoid empty % expansions from binaries linked against an earlier version of the @@ -459,7 +513,6 @@ engine = unsetengine - % Part 2: Options. % If this option is set to true, `tex a.b' will look first for a.b.tex @@ -499,6 +552,7 @@ shell_escape_commands = \ bibtex,bibtex8,\ kpsewhich,\ makeindex,\ +mpost,\ repstopdf,\ % we'd like to allow: @@ -608,7 +662,6 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 - % Part 3: Array and other sizes for TeX (and Metafont). % % If you want to change some of these sizes only for a certain TeX @@ -707,7 +760,7 @@ screen_depth.mf = 1200 % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 -glob_str_size = 5000 +glob_str_size = 20000 max_strings.bibtex = 35307 max_strings.bibtex8 = 35307 max_strings.bibtexu = 35307 @@ -717,6 +770,8 @@ max_strings.pbibtex = 35307 line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 + + % -- tex4ht configuration params added by texmf-update -- TEX4HTINPUTS=.;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts// T4HTINPUTS=.;$TEXMF/tex4ht/base// diff --git a/texmf/web2c/updmap.cfg b/texmf/web2c/updmap.cfg index c705eb1..48c8410 100644 --- a/texmf/web2c/updmap.cfg +++ b/texmf/web2c/updmap.cfg @@ -1,30 +1,5 @@ -# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 31 04:12:04 2011 -# $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $ -# -# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with -# all the Map and MixedMap lines from an installation, possibly -# appending a local configuration file. -# -# To make local customizations to the map files, please use of the -# following methods: -# -# 1) call -# updmap-sys --enable Map=foo.map -# for each map file. (Or MixedMap instead of Map, if your font has -# both Metafont and outline definitions.) See the updmap --help -# documentation. -# -# 2) add your local map entries to the file -# TEXMFLOCAL/web2c/updmap-local.cfg -# and then call -# tlmgr generate updmap -# which will concatenate updmap-local.cfg to the end of the final -# updmap.cfg. (You can override the local.cfg file location with the -# --localcfg option; see tlmgr --help.) -# -# If you use either of these methods, your local adaptations will be -# preserved when tlmgr updates the installation or this config file. -# Manual edits to updmap.cfg may be lost on update. +# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ +# updmap.cfg for TEXMFMAIN - updmap options. ################################################################ @@ -67,7 +42,7 @@ LW35 URWkb # the LW35 fonts resp. use the built-in fonts. # # Valid settings are true / false: -dvipsDownloadBase35 false +dvipsDownloadBase35 true # # pdftexDownloadBase14 @@ -82,226 +57,23 @@ pdftexDownloadBase14 true # # dvipdfmDownloadBase14 # -# Should dvipdfm download the base 14 pdf fonts? Since some configurations +# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download # the fonts. The pdf files will get bigger, though. # Valid settings are true (download the fonts) or false (don't download # the fonts). dvipdfmDownloadBase14 true -################################################################ -# Map files. -################################################################ # -# There are two possible entries: Map and MixedMap. Both have one additional -# argument: the filename of the map file. MixedMap ("mixed" means that -# the font is available as bitmap and as outline) lines will not be used -# in the default map of dvips if dvipsPreferOutline is false. Inactive -# Map files should be marked by "#! " (without the quotes), not just #. +# kanjiEmbed # - -#! Map OrnementsADF.map -#! Map ArrowsADF.map -#! Map BulletsADF.map -#! MixedMap allrunes.map -#! Map euler.map -#! MixedMap cm.map -#! MixedMap cmextra.map -#! MixedMap cyrillic.map -#! MixedMap latxfont.map -#! MixedMap symbols.map -#! Map uaq.map -#! Map antt.map -#! Map arabi.map -#! MixedMap arabtex.map -#! Map archaicprw.map -#! Map arev.map -#! Map bkaiu.map -#! Map bsmiu.map -#! Map gbsnu.map -#! Map gkaiu.map -#! Map ascii.map -#! Map augie.map -#! Map auncial.map -#! Map aurical.map -#! Map ybv.map -#! MixedMap bbold.map -#! Map belleek.map -#! Map bera.map -#! Map ybd.map -#! Map sqrcaps.map -#! Map boondox.map -#! Map pbsi.map -#! Map burmese.map -#! Map cantarell.map -#! Map cmin.map -#! MixedMap cbgreek-full.map -#! MixedMap ccpl.map -#! Map ccicons.map -#! Map clm.map -#! Map chemarrow.map -#! Map cjhebrew.map -#! MixedMap cmtext-bsr-interpolated.map -#! Map cm-lgc.map -#! MixedMap cm-super-t1.map -#! MixedMap cm-super-t2a.map -#! MixedMap cm-super-t2b.map -#! MixedMap cm-super-t2c.map -#! MixedMap cm-super-ts1.map -#! MixedMap cm-super-x2.map -#! Map cmcyr.map -#! MixedMap cmll.map -#! Map comfortaa.map -#! Map original-context-symbol.map -#! MixedMap csother.map -#! MixedMap cstext.map -#! Map cyklop.map -#! Map dictsym.map -#! Map dstroke.map -#! Map droid.map -#! Map yes.map -#! Map epigrafica.map -#! Map epiolmec.map -#! MixedMap esint.map -#! Map ESSTIX.map -#! Map esvect.map -#! MixedMap ethiop.map -#! MixedMap eurosym.map -#! Map fdsymbol.map -#! Map fge.map -#! Map foekfont.map -#! Map fonetika.map -#! Map fourier-utopia-expert.map -#! Map fourier.map -#! Map garuda-c90.map -#! Map gfsartemisia.map -#! Map gfsbaskerville.map -#! Map gfsbodoni.map -#! Map gfscomplutum.map -#! Map gfsdidot.map -#! Map gfsneohellenic.map -#! Map gfsporson.map -#! Map gfssolomos.map -#! Map yfrak.map -#! Map ugq.map -#! Map grverb.map -#! MixedMap hfbright.map -#! MixedMap iby.map -#! Map fi4.map -#! Map Acorn.map -#! Map AnnSton.map -#! Map ArtNouv.map -#! Map ArtNouvc.map -#! Map Carrickc.map -#! Map Eichenla.map -#! Map Eileen.map -#! Map EileenBl.map -#! Map Elzevier.map -#! Map GotIn.map -#! Map GoudyIn.map -#! Map Kinigcap.map -#! Map Konanur.map -#! Map Kramer.map -#! Map MorrisIn.map -#! Map Nouveaud.map -#! Map Romantik.map -#! Map Rothdn.map -#! Map RoyalIn.map -#! Map Sanremo.map -#! Map Starburst.map -#! Map Typocaps.map -#! Map Zallman.map -#! Map iwona.map -#! Map kerkis.map -#! Map knitfont.map -#! Map kpfonts.map -#! Map kurier.map -#! Map lato.map -#! Map libertine.map -#! Map yly.map -#! Map linearA.map -#! Map l7x-urwvn.map -#! Map lm.map -#! MixedMap lxfonts.map -#! MixedMap manfnt.map -#! Map marvosym.map -#! Map mathabx.map -#! Map mdbch.map -#! Map mdput.map -#! Map mdugm.map -#! Map troff-updmap.map -#! MixedMap mflogo.map -#! Map MnSymbol.map -#! MixedMap mongolian.map -#! MixedMap musix.map -#! Map norasi-c90.map -#! Map cherokee.map -#! Map ocrb.map -#! Map oinuit.map -#! Map omega.map -#! Map phaistos.map -#! MixedMap pigpen.map -#! MixedMap plother.map -#! MixedMap pltext.map -#! Map ap.map -#! Map prodint.map -#! Map charter.map -#! Map fpls.map -#! Map pazo.map -#! Map utopia.map -#! Map PTSans-type1.map -#! Map PTSerif-type1.map -#! Map pxfonts.map -#! Map recycle.map -#! Map yrd.map -#! MixedMap rsfs.map -#! Map skt.map -#! MixedMap semaf.map -#! Map SkakNew.map -#! Map starfont.map -#! Map icelandic.map -#! MixedMap stmaryrd.map -#! Map tabvar.map -Map mathpple.map -#! Map qag.map -#! Map qbk.map -#! Map qcr.map -#! Map qcs.map -#! Map qhv.map -#! Map qpl.map -#! Map qtm.map -#! Map qzc.map -#! Map tfrupee.map -#! MixedMap tipa.map -#! MixedMap trajan.map -#! Map txfonts.map -#! Map gptimes.map -#! Map umj.map -#! MixedMap dvng.map -#! Map yv1.map -#! Map yv2.map -#! Map yv3.map -#! Map yvo.map -#! Map yvt.map -#! Map arevvn.map -#! Map chartervn.map -#! Map cmbrightvn.map -#! Map concretevn.map -#! Map grotesqvn.map -#! Map txttvn.map -#! Map urwvn.map -#! MixedMap vnrother.map -#! MixedMap vnrtext.map -#! Map vntopia.map -#! Map dgj.map -#! Map dmj.map -#! Map mc2j.map -#! Map mcj.map -#! Map mr2j.map -#! Map mrj.map -#! MixedMap wasy.map -#! MixedMap xypic.map -#! MixedMap yhmath.map +# updmap generates a file kanjix.map for usage with dvipdfmx. With this +# option one can switch between not embedding any kanji font, or +# any of the several available. +# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring +# in a map file name will be replaced with this value, and the respective +# map file used. +kanjiEmbed noEmbed Map euler.map MixedMap cmextra.map MixedMap cm.map @@ -320,6 +92,7 @@ Map antt.map Map archaicprw.map Map arev.map Map ascii.map +Map aspectratio.map Map augie.map Map auncial.map Map aurical.map @@ -328,9 +101,11 @@ MixedMap bbold.map Map belleek.map Map bera.map Map ybd.map +Map bguq.map Map sqrcaps.map Map boondox.map Map pbsi.map +Map calligra.map Map cantarell.map Map cmin.map Map ccicons.map @@ -338,10 +113,13 @@ Map clm.map Map cm-lgc.map MixedMap cmll.map Map comfortaa.map +Map CountriesOfEurope.map Map cyklop.map +Map dejavu-type1.map Map dictsym.map Map dstroke.map Map droid.map +Map dutchcal.map Map yes.map Map epigrafica.map Map ESSTIX.map @@ -352,6 +130,7 @@ Map foekfont.map Map fonetika.map Map fourier.map Map fourier-utopia-expert.map +Map frcursive.map Map gfsartemisia.map Map gfsbodoni.map Map gfscomplutum.map @@ -397,18 +176,23 @@ Map mathabx.map Map mdbch.map Map mdput.map Map mdugm.map +Map mdsymbol.map Map MnSymbol.map +Map ntx.map Map cherokee.map Map ocrb.map Map oinuit.map +Map opensans.map +Map paratype-type1.map Map phaistos.map MixedMap pigpen.map Map ap.map Map prodint.map -Map PTSans-type1.map -Map PTSerif-type1.map +Map pxtx.map Map recycle.map Map yrd.map +Map rsfso.map +Map sansmathaccent.map MixedMap semaf.map Map starfont.map Map icelandic.map diff --git a/xdg/xfce4/helpers.rc b/xdg/xfce4/helpers.rc index 0c77f07..e0b4c15 100644 --- a/xdg/xfce4/helpers.rc +++ b/xdg/xfce4/helpers.rc @@ -6,5 +6,5 @@ WebBrowser=firefox MailReader=thunderbird -TerminalEmulator=Terminal +TerminalEmulator=xfce4-terminal FileManager=Thunar