From 25dd7ab9fec4cb8d8fbca575eee60cf0c568a245 Mon Sep 17 00:00:00 2001 From: Emerson Date: Thu, 25 Feb 2016 11:52:09 -0500 Subject: [PATCH] Big overhaul --- .vim/after/ftplugin/html.vim | 3 +- .vim/after/ftplugin/markdown.vim | 1 - .vim/after/ftplugin/php.vim | 4 +- .vim/after/ftplugin/python.vim | 6 +- .vim/after/syntax/css/compositing-1.vim | 4 - .vim/after/syntax/css/css-align-3.vim | 5 - .vim/after/syntax/css/css-cascade-3.vim | 2 - .vim/after/syntax/css/css-cascade-4.vim | 2 - .../after/syntax/css/css-counter-styles-3.vim | 14 - .vim/after/syntax/css/css-display-3.vim | 5 - .vim/after/syntax/css/css-flexbox-1.vim | 7 - .vim/after/syntax/css/css-gcpm-3.vim | 7 - .vim/after/syntax/css/css-grid-1.vim | 9 - .vim/after/syntax/css/css-inline-3.vim | 4 - .vim/after/syntax/css/css-line-grid-1.vim | 6 - .vim/after/syntax/css/css-lists-3.vim | 6 - .vim/after/syntax/css/css-masking-1.vim | 10 - .vim/after/syntax/css/css-overflow-3.vim | 4 - .vim/after/syntax/css/css-page-floats-3.vim | 4 - .vim/after/syntax/css/css-pseudo-4.vim | 1 - .vim/after/syntax/css/css-round-display-1.vim | 7 - .vim/after/syntax/css/css-ruby-1.vim | 4 - .vim/after/syntax/css/css-scoping-1.vim | 5 - .vim/after/syntax/css/css-shapes-1.vim | 4 - .vim/after/syntax/css/css-snappoints-1.vim | 2 - .vim/after/syntax/css/css-text-3.vim | 8 - .vim/after/syntax/css/css-text-4.vim | 14 - .vim/after/syntax/css/css-text-decor-3.vim | 3 - .vim/after/syntax/css/css-ui-3.vim | 2 - .vim/after/syntax/css/css-ui-4.vim | 3 - .vim/after/syntax/css/css-values.vim | 3 - .vim/after/syntax/css/css-variables.vim | 3 - .vim/after/syntax/css/css-will-change-1.vim | 3 - .vim/after/syntax/css/css-writing-modes-3.vim | 7 - .vim/after/syntax/css/css3-animations.vim | 4 - .vim/after/syntax/css/css3-background.vim | 7 - .vim/after/syntax/css/css3-box.vim | 5 - .vim/after/syntax/css/css3-break.vim | 4 - .vim/after/syntax/css/css3-colors.vim | 3 - .vim/after/syntax/css/css3-conditional.vim | 1 - .vim/after/syntax/css/css3-content.vim | 3 - .vim/after/syntax/css/css3-exclusions.vim | 3 - .vim/after/syntax/css/css3-fonts.vim | 17 - .vim/after/syntax/css/css3-images.vim | 7 - .vim/after/syntax/css/css3-multicol.vim | 5 - .vim/after/syntax/css/css3-page.vim | 3 - .vim/after/syntax/css/css3-positioning.vim | 3 - .vim/after/syntax/css/css3-regions.vim | 6 - .vim/after/syntax/css/css3-selectors.vim | 5 - .vim/after/syntax/css/css3-sizing.vim | 3 - .vim/after/syntax/css/css3-speech.vim | 6 - .vim/after/syntax/css/css3-transforms.vim | 7 - .vim/after/syntax/css/css3-transitions.vim | 6 - .vim/after/syntax/css/html5-elements.vim | 19 - .vim/after/syntax/css/selectors4.vim | 9 - .vim/after/syntax/html.vim | 62 --- .vim/after/syntax/scss.vim | 1 - .vim/ftplugin/html.vim | 3 - .vim/ftplugin/markdown.vim | 4 - .vim/ftplugin/php.vim | 6 - .vim/ftplugin/python.vim | 4 - .vimrc | 32 +- README.md | 5 +- install.sh | 15 + mail/dovecot/10-auth.conf | 128 ------ mail/dovecot/10-mail.conf | 371 ------------------ mail/dovecot/10-master.conf | 123 ------ mail/dovecot/10-ssl.conf | 58 --- mail/dovecot/15-lda.conf | 48 --- mail/dovecot/20-imap.conf | 65 --- mail/dovecot/auth-passwdfile.conf.ext | 15 - mail/dovecot/dovecot.conf | 104 ----- mail/opendkim/KeyTable | 2 - mail/opendkim/SigningTable | 2 - mail/opendkim/TrustedHosts | 2 - mail/opendkim/opendkim.conf | 18 - mail/postfix/aliasen | 2 - mail/postfix/client_checks | 19 - mail/postfix/mailboxen | 1 - mail/postfix/main.cf | 78 ---- mail/postfix/master.cf | 126 ------ mail/postgrey/whitelist_clients | 19 - 82 files changed, 48 insertions(+), 1563 deletions(-) delete mode 100644 .vim/after/ftplugin/markdown.vim delete mode 100644 .vim/after/syntax/css/compositing-1.vim delete mode 100644 .vim/after/syntax/css/css-align-3.vim delete mode 100644 .vim/after/syntax/css/css-cascade-3.vim delete mode 100644 .vim/after/syntax/css/css-cascade-4.vim delete mode 100644 .vim/after/syntax/css/css-counter-styles-3.vim delete mode 100644 .vim/after/syntax/css/css-display-3.vim delete mode 100644 .vim/after/syntax/css/css-flexbox-1.vim delete mode 100644 .vim/after/syntax/css/css-gcpm-3.vim delete mode 100644 .vim/after/syntax/css/css-grid-1.vim delete mode 100644 .vim/after/syntax/css/css-inline-3.vim delete mode 100644 .vim/after/syntax/css/css-line-grid-1.vim delete mode 100644 .vim/after/syntax/css/css-lists-3.vim delete mode 100644 .vim/after/syntax/css/css-masking-1.vim delete mode 100644 .vim/after/syntax/css/css-overflow-3.vim delete mode 100644 .vim/after/syntax/css/css-page-floats-3.vim delete mode 100644 .vim/after/syntax/css/css-pseudo-4.vim delete mode 100644 .vim/after/syntax/css/css-round-display-1.vim delete mode 100644 .vim/after/syntax/css/css-ruby-1.vim delete mode 100644 .vim/after/syntax/css/css-scoping-1.vim delete mode 100644 .vim/after/syntax/css/css-shapes-1.vim delete mode 100644 .vim/after/syntax/css/css-snappoints-1.vim delete mode 100644 .vim/after/syntax/css/css-text-3.vim delete mode 100644 .vim/after/syntax/css/css-text-4.vim delete mode 100644 .vim/after/syntax/css/css-text-decor-3.vim delete mode 100644 .vim/after/syntax/css/css-ui-3.vim delete mode 100644 .vim/after/syntax/css/css-ui-4.vim delete mode 100644 .vim/after/syntax/css/css-values.vim delete mode 100644 .vim/after/syntax/css/css-variables.vim delete mode 100644 .vim/after/syntax/css/css-will-change-1.vim delete mode 100644 .vim/after/syntax/css/css-writing-modes-3.vim delete mode 100644 .vim/after/syntax/css/css3-animations.vim delete mode 100644 .vim/after/syntax/css/css3-background.vim delete mode 100644 .vim/after/syntax/css/css3-box.vim delete mode 100644 .vim/after/syntax/css/css3-break.vim delete mode 100644 .vim/after/syntax/css/css3-colors.vim delete mode 100644 .vim/after/syntax/css/css3-conditional.vim delete mode 100644 .vim/after/syntax/css/css3-content.vim delete mode 100644 .vim/after/syntax/css/css3-exclusions.vim delete mode 100644 .vim/after/syntax/css/css3-fonts.vim delete mode 100644 .vim/after/syntax/css/css3-images.vim delete mode 100644 .vim/after/syntax/css/css3-multicol.vim delete mode 100644 .vim/after/syntax/css/css3-page.vim delete mode 100644 .vim/after/syntax/css/css3-positioning.vim delete mode 100644 .vim/after/syntax/css/css3-regions.vim delete mode 100644 .vim/after/syntax/css/css3-selectors.vim delete mode 100644 .vim/after/syntax/css/css3-sizing.vim delete mode 100644 .vim/after/syntax/css/css3-speech.vim delete mode 100644 .vim/after/syntax/css/css3-transforms.vim delete mode 100644 .vim/after/syntax/css/css3-transitions.vim delete mode 100644 .vim/after/syntax/css/html5-elements.vim delete mode 100644 .vim/after/syntax/css/selectors4.vim delete mode 100644 .vim/after/syntax/html.vim delete mode 100644 .vim/after/syntax/scss.vim delete mode 100644 .vim/ftplugin/html.vim delete mode 100644 .vim/ftplugin/markdown.vim delete mode 100644 .vim/ftplugin/php.vim delete mode 100644 .vim/ftplugin/python.vim create mode 100644 install.sh delete mode 100644 mail/dovecot/10-auth.conf delete mode 100644 mail/dovecot/10-mail.conf delete mode 100644 mail/dovecot/10-master.conf delete mode 100644 mail/dovecot/10-ssl.conf delete mode 100644 mail/dovecot/15-lda.conf delete mode 100644 mail/dovecot/20-imap.conf delete mode 100755 mail/dovecot/auth-passwdfile.conf.ext delete mode 100755 mail/dovecot/dovecot.conf delete mode 100644 mail/opendkim/KeyTable delete mode 100644 mail/opendkim/SigningTable delete mode 100644 mail/opendkim/TrustedHosts delete mode 100644 mail/opendkim/opendkim.conf delete mode 100644 mail/postfix/aliasen delete mode 100644 mail/postfix/client_checks delete mode 100644 mail/postfix/mailboxen delete mode 100644 mail/postfix/main.cf delete mode 100644 mail/postfix/master.cf delete mode 100644 mail/postgrey/whitelist_clients diff --git a/.vim/after/ftplugin/html.vim b/.vim/after/ftplugin/html.vim index da5bd7f..8f84179 100644 --- a/.vim/after/ftplugin/html.vim +++ b/.vim/after/ftplugin/html.vim @@ -1,2 +1 @@ -set tw=0 - +setlocal tw=0 diff --git a/.vim/after/ftplugin/markdown.vim b/.vim/after/ftplugin/markdown.vim deleted file mode 100644 index bcefda2..0000000 --- a/.vim/after/ftplugin/markdown.vim +++ /dev/null @@ -1 +0,0 @@ -set tw=80 diff --git a/.vim/after/ftplugin/php.vim b/.vim/after/ftplugin/php.vim index 0147abe..67c8c5f 100644 --- a/.vim/after/ftplugin/php.vim +++ b/.vim/after/ftplugin/php.vim @@ -1 +1,3 @@ -set noexpandtab +setlocal ts=4 +setlocal sts=4 +setlocal sw=4 diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim index dd03d80..d3ef77d 100644 --- a/.vim/after/ftplugin/python.vim +++ b/.vim/after/ftplugin/python.vim @@ -1,4 +1,4 @@ -set ts=4 -set sts=4 -set sw=4 set cinwords=if,elif,else,for,while,try,except,finally,def,class +setlocal ts=4 +setlocal sts=4 +setlocal sw=4 diff --git a/.vim/after/syntax/css/compositing-1.vim b/.vim/after/syntax/css/compositing-1.vim deleted file mode 100644 index b0c80e2..0000000 --- a/.vim/after/syntax/css/compositing-1.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssCompositingProp and cssCompositingAttr -syn keyword cssFontProp contained isolation -syn match cssFontProp contained "\<\(mix\|background\)-blend-mode\>" -syn keyword cssFontAttr contained multiply screen overlay darken lighten color-dodge color-burn hard-light soft-light difference exclusion hue saturation color luminosity diff --git a/.vim/after/syntax/css/css-align-3.vim b/.vim/after/syntax/css/css-align-3.vim deleted file mode 100644 index 4cfbf5f..0000000 --- a/.vim/after/syntax/css/css-align-3.vim +++ /dev/null @@ -1,5 +0,0 @@ -" TODO: create cssAlignProp group and cssAlignAttr group -syn match cssFontProp contained "\<\(justify\|align\)-\(self\|content\|items\)\>" -syn keyword cssFontAttr contained safe true -syn match cssFontAttr contained "\<\(self\|flex\)-\(start\|end\)\>" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-cascade-3.vim b/.vim/after/syntax/css/css-cascade-3.vim deleted file mode 100644 index 2192a87..0000000 --- a/.vim/after/syntax/css/css-cascade-3.vim +++ /dev/null @@ -1,2 +0,0 @@ -syn keyword cssFontProp all -syn keyword cssCommonAttr contained initial unset diff --git a/.vim/after/syntax/css/css-cascade-4.vim b/.vim/after/syntax/css/css-cascade-4.vim deleted file mode 100644 index 094a570..0000000 --- a/.vim/after/syntax/css/css-cascade-4.vim +++ /dev/null @@ -1,2 +0,0 @@ -syn keyword cssCommonAttr contained revert -syn region cssURL contained matchgroup=cssFunctionName start="\/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock -syn keyword cssGeneratedContentProp contained system negative prefix suffix range pad fallback -syn match cssGeneratedContentProp contained "\<\(additive-\)\=symbols\>" -syn match cssGeneratedContentProp contained "\" -syn keyword cssGeneratedContentAttr contained cyclic symbolic additive extends bullets numbers words bengali cambodian khmer devanagari gujarati gurmukhi kannada lao malayalam mongolian myanmar oriya persian tamil telugu thai tibetan -syn match cssGeneratedContentAttr contained "\<\(ethiopic-\)\=numeric\>" -syn match cssGeneratedContentAttr contained "\" -syn match cssGeneratedContentAttr contained "\<\(upper\|lower\)-armenian\>" -syn match cssGeneratedContentAttr contained "\" -syn match cssGeneratedContentAttr contained "\" -syn match cssGeneratedContentAttr contained "\<\(japanese\|korean-hanja\|\(simp\|trad\)-chinese\)-\(in\)\=formal\>" -syn match cssGeneratedContentAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\" -syn keyword cssFontAttr contained contents discard -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-flexbox-1.vim b/.vim/after/syntax/css/css-flexbox-1.vim deleted file mode 100644 index 3049b64..0000000 --- a/.vim/after/syntax/css/css-flexbox-1.vim +++ /dev/null @@ -1,7 +0,0 @@ -" TODO: create cssFlexboxProp group and cssFlexboxAttr group -syn keyword cssFontProp order -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained flex row wrap -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\<\(row\|column\|wrap\)-reverse\>" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-gcpm-3.vim b/.vim/after/syntax/css/css-gcpm-3.vim deleted file mode 100644 index 5452de2..0000000 --- a/.vim/after/syntax/css/css-gcpm-3.vim +++ /dev/null @@ -1,7 +0,0 @@ -syn keyword cssGeneratedContentProp contained running -syn match cssGeneratedContentProp contained "\" -syn match cssGeneratedContentProp contained "\" -syn match cssGeneratedContentProp contained "\" -syn keyword cssGeneratedContentAttr contained footnote line open closed -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(string\|running\|element\|leader\|target-\(counter\|counters\|text\)\)\s*(" end=")" oneline keepend -syn match cssPseudoClassId contained "\" diff --git a/.vim/after/syntax/css/css-grid-1.vim b/.vim/after/syntax/css/css-grid-1.vim deleted file mode 100644 index f8b0026..0000000 --- a/.vim/after/syntax/css/css-grid-1.vim +++ /dev/null @@ -1,9 +0,0 @@ -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained grid subgrid dense span -syn match cssFontAttr contained "\" -syn match cssValueNumber contained "[01]\(.\d\+\)\=fr" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(minmax\|repeat\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/css-inline-3.vim b/.vim/after/syntax/css/css-inline-3.vim deleted file mode 100644 index c80a5ff..0000000 --- a/.vim/after/syntax/css/css-inline-3.vim +++ /dev/null @@ -1,4 +0,0 @@ -syn match cssFontProp contained "\<\(dominant\|alignment\)-baseline\>" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained create -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\<\(first\|last\)-baseline\>" diff --git a/.vim/after/syntax/css/css-lists-3.vim b/.vim/after/syntax/css/css-lists-3.vim deleted file mode 100644 index 8471b5b..0000000 --- a/.vim/after/syntax/css/css-lists-3.vim +++ /dev/null @@ -1,6 +0,0 @@ -syn match cssGeneratedContentProp contained "\" -syn match cssGeneratedContentProp contained "\" -syn keyword cssGeneratedContentAttr contained marker -syn match cssGeneratedContentAttr contained "\" -syn keyword cssPseudoClassId contained marker -syn region cssFunction contained matchgroup=cssFunctionName start="\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained nonzero evenodd alpha luminance add subtract intersect exclude -syn match cssFontAttr contained "\<\(fill\|stroke\|view\)-box\>" -syn match cssFontAttr contained "\" - -" http://www.w3.org/TR/css-masking/#MaskElement -syn keyword cssTagName mask diff --git a/.vim/after/syntax/css/css-overflow-3.vim b/.vim/after/syntax/css/css-overflow-3.vim deleted file mode 100644 index 7c126d5..0000000 --- a/.vim/after/syntax/css/css-overflow-3.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssOverflowProp group and cssOverflowAttr group -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained fragments -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-page-floats-3.vim b/.vim/after/syntax/css/css-page-floats-3.vim deleted file mode 100644 index 3473672..0000000 --- a/.vim/after/syntax/css/css-page-floats-3.vim +++ /dev/null @@ -1,4 +0,0 @@ -syn match cssPositioningProp contained "\" -syn match cssPositioningAttr contained "\" -syn match cssPositioningAttr contained "\" -syn region cssURL contained matchgroup=cssFunctionName start="\" diff --git a/.vim/after/syntax/css/css-round-display-1.vim b/.vim/after/syntax/css/css-round-display-1.vim deleted file mode 100644 index 73c93b0..0000000 --- a/.vim/after/syntax/css/css-round-display-1.vim +++ /dev/null @@ -1,7 +0,0 @@ -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained parent polar -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" -syn match cssMediaProp contained /device-radius/ diff --git a/.vim/after/syntax/css/css-ruby-1.vim b/.vim/after/syntax/css/css-ruby-1.vim deleted file mode 100644 index 52f4dd5..0000000 --- a/.vim/after/syntax/css/css-ruby-1.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssRubyProp group and cssRubyAttr group -syn match cssFontProp contained "\" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-scoping-1.vim b/.vim/after/syntax/css/css-scoping-1.vim deleted file mode 100644 index c8676e7..0000000 --- a/.vim/after/syntax/css/css-scoping-1.vim +++ /dev/null @@ -1,5 +0,0 @@ -syn region cssInclude start=/@scope\>/ end=/\ze{/ skipwhite skipnl nextgroup=cssMediaBlock -syn keyword cssPseudoClassId contained host shadow content -syn match cssPseudoClassId contained "\<\(scope\|host\)-context\>" -syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(host\)(" end=")" oneline -syn match cssSelectorOp2 "/deep/" diff --git a/.vim/after/syntax/css/css-shapes-1.vim b/.vim/after/syntax/css/css-shapes-1.vim deleted file mode 100644 index 1b7eef1..0000000 --- a/.vim/after/syntax/css/css-shapes-1.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssShapesProp group and cssShapesAttr group -syn match cssFontProp contained "\" -syn match cssFontAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(inset\|circle\|ellipse\|polygon\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/css-snappoints-1.vim b/.vim/after/syntax/css/css-snappoints-1.vim deleted file mode 100644 index 8357097..0000000 --- a/.vim/after/syntax/css/css-snappoints-1.vim +++ /dev/null @@ -1,2 +0,0 @@ -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained mandatory proximity diff --git a/.vim/after/syntax/css/css-text-3.vim b/.vim/after/syntax/css/css-text-3.vim deleted file mode 100644 index d775e1e..0000000 --- a/.vim/after/syntax/css/css-text-3.vim +++ /dev/null @@ -1,8 +0,0 @@ -syn keyword cssTextProp contained hyphens -syn match cssTextProp contained "\" -syn match cssTextProp contained "\" -syn match cssTextProp contained "\" -syn keyword cssTextAttr contained manual loose strict hanging -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" diff --git a/.vim/after/syntax/css/css-text-4.vim b/.vim/after/syntax/css/css-text-4.vim deleted file mode 100644 index e5ea3f5..0000000 --- a/.vim/after/syntax/css/css-text-4.vim +++ /dev/null @@ -1,14 +0,0 @@ -syn match cssTextProp contained "\" -syn match cssTextProp contained "\" -syn match cssTextProp contained "\" -syn match cssTextProp contained "\" -syn keyword cssTextAttr contained spread punctuation -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\<\(trim\|space\)-\(start\|end\|adjacent\)\>" -syn match cssTextAttr contained "\" -syn match cssTextAttr contained "\" diff --git a/.vim/after/syntax/css/css-text-decor-3.vim b/.vim/after/syntax/css/css-text-decor-3.vim deleted file mode 100644 index 94af3a5..0000000 --- a/.vim/after/syntax/css/css-text-decor-3.vim +++ /dev/null @@ -1,3 +0,0 @@ -syn match cssTextProp contained "\" -syn keyword cssTextAttr contained wavy objects alphabetic spaces edges ink under filled dot triangle sesame over -syn match cssTextAttr contained "\" diff --git a/.vim/after/syntax/css/css-ui-3.vim b/.vim/after/syntax/css/css-ui-3.vim deleted file mode 100644 index 7f966d2..0000000 --- a/.vim/after/syntax/css/css-ui-3.vim +++ /dev/null @@ -1,2 +0,0 @@ -syn match cssUIProp contained "\" -syn keyword cssUIAttr contained grab grabbing diff --git a/.vim/after/syntax/css/css-ui-4.vim b/.vim/after/syntax/css/css-ui-4.vim deleted file mode 100644 index 8b661b3..0000000 --- a/.vim/after/syntax/css/css-ui-4.vim +++ /dev/null @@ -1,3 +0,0 @@ -syn match cssUIProp contained "\" -syn keyword cssUIAttr contained fade underscore -syn region cssFunction contained matchgroup=cssFunctionName start="\" -syn region cssFunction contained matchgroup=cssFunctionName start="\" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css-writing-modes-3.vim b/.vim/after/syntax/css/css-writing-modes-3.vim deleted file mode 100644 index f129fa9..0000000 --- a/.vim/after/syntax/css/css-writing-modes-3.vim +++ /dev/null @@ -1,7 +0,0 @@ -" TODO: create cssWritingModesProp group and cssWritingModesAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained before after mixed isolate plaintext -syn match cssFontAttr contained "\<\(upright\|sideways\(-right\|-left\)\=\|use-glyph-orientation\)\>" -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\<\(horizontal-tb\|vertical-\(rl\|lr\)\)\>" diff --git a/.vim/after/syntax/css/css3-animations.vim b/.vim/after/syntax/css/css3-animations.vim deleted file mode 100644 index 0002bd4..0000000 --- a/.vim/after/syntax/css/css3-animations.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssAnimationsProp group and cssAnimationsAttr group -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained forwards backwards running paused -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css3-background.vim b/.vim/after/syntax/css/css3-background.vim deleted file mode 100644 index 84fb81b..0000000 --- a/.vim/after/syntax/css/css3-background.vim +++ /dev/null @@ -1,7 +0,0 @@ -" TODO: create cssBackgroundProp group and cssBackgroundAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained space round local fill stretch clone slice -syn match cssFontAttr contained "\<\(padding\|border\|content\)-box\>" diff --git a/.vim/after/syntax/css/css3-box.vim b/.vim/after/syntax/css/css3-box.vim deleted file mode 100644 index 56ddbb2..0000000 --- a/.vim/after/syntax/css/css3-box.vim +++ /dev/null @@ -1,5 +0,0 @@ -syn match cssBoxProp contained "\" -syn match cssBoxProp contained "\" -syn keyword cssBoxAttr contained scrollbar panner marquee -syn match cssBoxAttr contained "\" -syn match cssBoxAttr contained "\" diff --git a/.vim/after/syntax/css/css3-break.vim b/.vim/after/syntax/css/css3-break.vim deleted file mode 100644 index d59fd02..0000000 --- a/.vim/after/syntax/css/css3-break.vim +++ /dev/null @@ -1,4 +0,0 @@ -" TODO: create cssBreakProp group and cssBreakAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained any diff --git a/.vim/after/syntax/css/css3-colors.vim b/.vim/after/syntax/css/css3-colors.vim deleted file mode 100644 index fcb55de..0000000 --- a/.vim/after/syntax/css/css3-colors.vim +++ /dev/null @@ -1,3 +0,0 @@ -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsla\=\)\s*(" end=")" oneline keepend -syn keyword cssColorProp contained opacity -syn match cssColor contained "\" diff --git a/.vim/after/syntax/css/css3-conditional.vim b/.vim/after/syntax/css/css3-conditional.vim deleted file mode 100644 index 9bb5c3e..0000000 --- a/.vim/after/syntax/css/css3-conditional.vim +++ /dev/null @@ -1 +0,0 @@ -syn region cssInclude start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock diff --git a/.vim/after/syntax/css/css3-content.vim b/.vim/after/syntax/css/css3-content.vim deleted file mode 100644 index b6e6d23..0000000 --- a/.vim/after/syntax/css/css3-content.vim +++ /dev/null @@ -1,3 +0,0 @@ -syn match cssGeneratedContentProp contained "\" -syn match cssGeneratedContentProp contained "\" -syn keyword cssGeneratedContentAttr contained inhibit here first last diff --git a/.vim/after/syntax/css/css3-exclusions.vim b/.vim/after/syntax/css/css3-exclusions.vim deleted file mode 100644 index aa76079..0000000 --- a/.vim/after/syntax/css/css3-exclusions.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: create cssExclusionsProp group and cssExclusionsAttr group -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained minimum maximum diff --git a/.vim/after/syntax/css/css3-fonts.vim b/.vim/after/syntax/css/css3-fonts.vim deleted file mode 100644 index 72ab100..0000000 --- a/.vim/after/syntax/css/css3-fonts.vim +++ /dev/null @@ -1,17 +0,0 @@ -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained unicase ordinal jis78 jis83 jis90 jis04 simplified traditional -syn match cssFontAttr contained "\<\(no-\)\=\(common\|discretionary\|historical\)-ligatures\>" -syn match cssFontAttr contained "\<\(no-\)\=contextual\>" -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\<\(all-\)\=petite-caps\>" -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\<\(lining\|oldstyle\|proportional\|tabular\)-nums\>" -syn match cssFontAttr contained "\<\(diagonal\|stacked\)-fractions\>" -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(stylistic\|styleset\|character-variant\|swash\|ornaments\|annotation\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/css3-images.vim b/.vim/after/syntax/css/css3-images.vim deleted file mode 100644 index cc1ffd4..0000000 --- a/.vim/after/syntax/css/css3-images.vim +++ /dev/null @@ -1,7 +0,0 @@ -" TODO: create cssImagesProp group and cssImagesAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained contain cover snap -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(image\|\(repeating-\)\=\(linear\|radial\)-gradient\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/css3-multicol.vim b/.vim/after/syntax/css/css3-multicol.vim deleted file mode 100644 index 9d04029..0000000 --- a/.vim/after/syntax/css/css3-multicol.vim +++ /dev/null @@ -1,5 +0,0 @@ -" TODO: create cssMulticolProp group and cssMulticolAttr group -syn keyword cssFontProp contained columns -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained balance -syn match cssFontAttr contained "\<\(avoid-\)\=column\>" diff --git a/.vim/after/syntax/css/css3-page.vim b/.vim/after/syntax/css/css3-page.vim deleted file mode 100644 index 162807c..0000000 --- a/.vim/after/syntax/css/css3-page.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: Create cssPageAttr group -syn keyword cssFontAttr contained recto verso -syn match cssFontAttr contained "\<\(avoid-\)\=page\>" diff --git a/.vim/after/syntax/css/css3-positioning.vim b/.vim/after/syntax/css/css3-positioning.vim deleted file mode 100644 index 3acbe4c..0000000 --- a/.vim/after/syntax/css/css3-positioning.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: create cssPositioningProp and cssPositioningAttr -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained sticky diff --git a/.vim/after/syntax/css/css3-regions.vim b/.vim/after/syntax/css/css3-regions.vim deleted file mode 100644 index 5d7791e..0000000 --- a/.vim/after/syntax/css/css3-regions.vim +++ /dev/null @@ -1,6 +0,0 @@ -" TODO: create cssRegionsProp group and cssRegionsAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained element content break -syn match cssFontAttr contained "\<\(avoid-\)\=region\>" -syn keyword cssPseudoClassId contained region diff --git a/.vim/after/syntax/css/css3-selectors.vim b/.vim/after/syntax/css/css3-selectors.vim deleted file mode 100644 index 4b6429c..0000000 --- a/.vim/after/syntax/css/css3-selectors.vim +++ /dev/null @@ -1,5 +0,0 @@ -syn keyword cssPseudoClassId contained target enabled disabled checked indeterminate root empty -syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\" -syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(nth\(-last\)\=-\(child\|of-type\)\|not\)(" end=")" oneline diff --git a/.vim/after/syntax/css/css3-sizing.vim b/.vim/after/syntax/css/css3-sizing.vim deleted file mode 100644 index 2eb29c9..0000000 --- a/.vim/after/syntax/css/css3-sizing.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: create cssSizingAttr group -syn match cssFontAttr contained "\<\(\(min\|max\|fit\)-content\|fill-available\|repudiate-floats\)\>" -syn match cssFontAttr contained "\" diff --git a/.vim/after/syntax/css/css3-speech.vim b/.vim/after/syntax/css/css3-speech.vim deleted file mode 100644 index 0de3014..0000000 --- a/.vim/after/syntax/css/css3-speech.vim +++ /dev/null @@ -1,6 +0,0 @@ -syn match cssAuralProp contained "\" -syn match cssAuralProp contained "\" -syn keyword cssAuralAttr contained young old neutral preserve moderate reduced -syn match cssAuralAttr contained "\<\(literal\|no\)-punctuation\>" -syn match cssAuralAttr contained "\<\(x-\)\=\(weak\|strong\)\>" -syn match cssValueNumber contained "[-+]\=\d\+\(dB\|st\)" diff --git a/.vim/after/syntax/css/css3-transforms.vim b/.vim/after/syntax/css/css3-transforms.vim deleted file mode 100644 index e7642ac..0000000 --- a/.vim/after/syntax/css/css3-transforms.vim +++ /dev/null @@ -1,7 +0,0 @@ -" TODO: create cssTransformsProp group and cssTransformsAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained flat -syn match cssFontAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|translate\(3d\|X\|Y\|Z\)\=\|scale\(3d\|X\|Y\|Z\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|perspective\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/css3-transitions.vim b/.vim/after/syntax/css/css3-transitions.vim deleted file mode 100644 index 1cd93cb..0000000 --- a/.vim/after/syntax/css/css3-transitions.vim +++ /dev/null @@ -1,6 +0,0 @@ -" TODO: create cssTransitionsProp group and cssTransitionsAttr group -syn match cssFontProp contained "\" -syn keyword cssFontAttr contained linear -syn match cssFontAttr contained "\" -syn match cssFontAttr contained "\" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(steps\|cubic-bezier\)\s*(" end=")" oneline keepend diff --git a/.vim/after/syntax/css/html5-elements.vim b/.vim/after/syntax/css/html5-elements.vim deleted file mode 100644 index 6ccfc9d..0000000 --- a/.vim/after/syntax/css/html5-elements.vim +++ /dev/null @@ -1,19 +0,0 @@ -" HTML5 new elements - -" Sections -syn keyword cssTagName article section nav aside header footer - -" Grouping content -syn keyword cssTagName figure figcaption main - -" Text-level semantics -syn keyword cssTagName data time mark ruby rb rt rtc rp bdi wbr - -" Embedded content -syn keyword cssTagName embed video audio source track - -" Forms -syn keyword cssTagName datalist keygen output progress meter - -" Scripting -syn keyword cssTagName template canvas diff --git a/.vim/after/syntax/css/selectors4.vim b/.vim/after/syntax/css/selectors4.vim deleted file mode 100644 index 3b9df9f..0000000 --- a/.vim/after/syntax/css/selectors4.vim +++ /dev/null @@ -1,9 +0,0 @@ -syn match cssSelectorOp "[|]" -syn keyword cssPseudoClassId contained scope current past future default valid invalid required optional blank -syn match cssPseudoClassId contained "\<\(any\|local\)-link\>" -syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\<\(in\|out-of\)-range\>" -syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\<\(active\|valid\|invalid\)-drop-target\>" -syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(matches\|dir\|local-link\|current\|nth\(-last\)\=-\(match\|column\)\|column\)(" end=")" oneline diff --git a/.vim/after/syntax/html.vim b/.vim/after/syntax/html.vim deleted file mode 100644 index 2e76055..0000000 --- a/.vim/after/syntax/html.vim +++ /dev/null @@ -1,62 +0,0 @@ -syn include @htmlCss syntax/css/html5-elements.vim -syn include @htmlCss syntax/css/compositing-1.vim -syn include @htmlCss syntax/css/css3-animations.vim -syn include @htmlCss syntax/css/css3-background.vim -syn include @htmlCss syntax/css/css3-box.vim -syn include @htmlCss syntax/css/css3-break.vim -syn include @htmlCss syntax/css/css3-colors.vim -syn include @htmlCss syntax/css/css3-conditional.vim -syn include @htmlCss syntax/css/css3-content.vim -syn include @htmlCss syntax/css/css3-exclusions.vim -syn include @htmlCss syntax/css/css3-fonts.vim -syn include @htmlCss syntax/css/css3-images.vim -syn include @htmlCss syntax/css/css3-multicol.vim -syn include @htmlCss syntax/css/css3-page.vim -syn include @htmlCss syntax/css/css3-positioning.vim -syn include @htmlCss syntax/css/css3-regions.vim -syn include @htmlCss syntax/css/css3-selectors.vim -syn include @htmlCss syntax/css/css3-sizing.vim -syn include @htmlCss syntax/css/css3-speech.vim -syn include @htmlCss syntax/css/css3-transforms.vim -syn include @htmlCss syntax/css/css3-transitions.vim -syn include @htmlCss syntax/css/css-align-3.vim -syn include @htmlCss syntax/css/css-cascade-3.vim -syn include @htmlCss syntax/css/css-cascade-4.vim -syn include @htmlCss syntax/css/css-counter-styles-3.vim -syn include @htmlCss syntax/css/css-display-3.vim -syn include @htmlCss syntax/css/css-flexbox-1.vim -syn include @htmlCss syntax/css/css-gcpm-3.vim -syn include @htmlCss syntax/css/css-grid-1.vim -syn include @htmlCss syntax/css/css-inline-3.vim -syn include @htmlCss syntax/css/css-line-grid-1.vim -syn include @htmlCss syntax/css/css-lists-3.vim -syn include @htmlCss syntax/css/css-masking-1.vim -syn include @htmlCss syntax/css/css-overflow-3.vim -syn include @htmlCss syntax/css/css-pseudo-4.vim -syn include @htmlCss syntax/css/css-page-floats-3.vim -syn include @htmlCss syntax/css/css-round-display-1.vim -syn include @htmlCss syntax/css/css-ruby-1.vim -syn include @htmlCss syntax/css/css-scoping-1.vim -syn include @htmlCss syntax/css/css-shapes-1.vim -syn include @htmlCss syntax/css/css-snappoints-1.vim -syn include @htmlCss syntax/css/css-text-3.vim -syn include @htmlCss syntax/css/css-text-4.vim -syn include @htmlCss syntax/css/css-text-decor-3.vim -syn include @htmlCss syntax/css/css-ui-3.vim -syn include @htmlCss syntax/css/css-ui-4.vim -syn include @htmlCss syntax/css/css-values.vim -syn include @htmlCss syntax/css/css-variables.vim -syn include @htmlCss syntax/css/css-will-change-1.vim -syn include @htmlCss syntax/css/css-writing-modes-3.vim -syn include @htmlCss syntax/css/selectors4.vim - -"HTML5 - -syn keyword htmlTagName contained article aside audio bb canvas command datagrid -syn keyword htmlTagName contained datalist details dialog embed figure footer -syn keyword htmlTagName contained header hgroup keygen main mark meter nav -syn keyword htmlTagName contained output progress time ruby rt rp section time -syn keyword htmlTagName contained video -syn keyword htmlArg contained autofocus placeholder min max step -syn keyword htmlArg contained contenteditable contextmenu draggable hidden item -syn keyword htmlArg contained itemprop list subject spellcheck diff --git a/.vim/after/syntax/scss.vim b/.vim/after/syntax/scss.vim deleted file mode 100644 index 7d59328..0000000 --- a/.vim/after/syntax/scss.vim +++ /dev/null @@ -1 +0,0 @@ -runtime! syntax/css/*.vim diff --git a/.vim/ftplugin/html.vim b/.vim/ftplugin/html.vim deleted file mode 100644 index 21c2276..0000000 --- a/.vim/ftplugin/html.vim +++ /dev/null @@ -1,3 +0,0 @@ -set tabstop=2 -set shiftwidth=2 -set softtabstop=2 diff --git a/.vim/ftplugin/markdown.vim b/.vim/ftplugin/markdown.vim deleted file mode 100644 index 9e8312d..0000000 --- a/.vim/ftplugin/markdown.vim +++ /dev/null @@ -1,4 +0,0 @@ -set tabstop=4 -set shiftwidth=4 -set softtabstop=4 -set tw=80 diff --git a/.vim/ftplugin/php.vim b/.vim/ftplugin/php.vim deleted file mode 100644 index deb39f5..0000000 --- a/.vim/ftplugin/php.vim +++ /dev/null @@ -1,6 +0,0 @@ -set shiftwidth=4 -set softtabstop=4 -set tabstop=4 -"Pear says spaces, WP says tabs, since WP is what I'll be writing mostly with -"PHP, it wins. -set noexpandtab diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim deleted file mode 100644 index b47f8f2..0000000 --- a/.vim/ftplugin/python.vim +++ /dev/null @@ -1,4 +0,0 @@ -set tabstop=4 -set shiftwidth=4 -set softtabstop=4 - diff --git a/.vimrc b/.vimrc index 7f0a013..fbd7952 100644 --- a/.vimrc +++ b/.vimrc @@ -1,19 +1,35 @@ -execute pathogen#infect() -"Turn on syntax highlighting -syntax on +set nocompatible +filetype off +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +Plugin 'VundleVim/Vundle.vim' +Plugin 'bling/vim-airline' +Plugin 'pangloss/vim-javascript' +Plugin 'tpope/vim-markdown' +Plugin 'othree/html5.vim' +Plugin 'elzr/vim-json' +Plugin 'hail2u/vim-css3-syntax' +Plugin 'cakebaker/scss-syntax.vim' +Plugin 'wting/rust.vim' +Plugin 'hynek/vim-python-pep8-indent' +Plugin 'StanAngeloff/php.vim' +Plugin 'altercation/vim-colors-solarized' +Plugin 'tpope/vim-fugitive' +Plugin 'vim-airline/vim-airline-themes' +call vundle#end() " Colors +set t_Co=256 +syntax enable set background=dark colorscheme solarized hi Search cterm=NONE ctermfg=white ctermbg=red let g:airline_theme='solarized' let g:airline_powerline_fonts=1 - "Disable vi-compatible backspace behavior set backspace=indent,eol,start -"Disable vi compatibility (may be redundant with above) -set nocompatible "Default character encoding set encoding=utf-8 @@ -114,9 +130,6 @@ noremap x "_x "Paste in visual mode without updating the default register vnoremap p "_dP -"Enable 256-color mode -set t_Co=256 - "Jump five lines when scrolling at edge of screen set scrolljump=1 @@ -128,7 +141,6 @@ set sidescrolloff=5 set foldmethod=indent set nofoldenable -"Tell vim to interpret our .vim/after/ftplugin files filetype plugin indent on let loaded_matchparen = 1 diff --git a/README.md b/README.md index 87a5715..73d504c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # dotfiles -My dotfiles, unlicensed so anyone can use them + +This branch is what I use for any normal desktop/server setup. the `mail` branch +is what I use on any mail server I have, and `work` is what I use for work, +since we have different standards there wrt code syntax. diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..1b1da51 --- /dev/null +++ b/install.sh @@ -0,0 +1,15 @@ +apt-get update && \ +apt-get -y upgrade && \ +apt-get -y -q install sudo nano vim tmux htop git zsh curl && \ +git clone https://github.com/emersonveenstra/dotfiles + +ln -s dotfiles/.vimrc +ln -s dotfiles/.tmux.conf +ln -s dotfiles/.vim + +wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - +rm .zshrc +ln -s dotfiles/.zshrc + +git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim +vim +PluginInstall +qall diff --git a/mail/dovecot/10-auth.conf b/mail/dovecot/10-auth.conf deleted file mode 100644 index 61d7a0e..0000000 --- a/mail/dovecot/10-auth.conf +++ /dev/null @@ -1,128 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -# See also ssl=required setting. -disable_plaintext_auth = yes - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = %Lu - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -#!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/mail/dovecot/10-mail.conf b/mail/dovecot/10-mail.conf deleted file mode 100644 index 2b73c7c..0000000 --- a/mail/dovecot/10-mail.conf +++ /dev/null @@ -1,371 +0,0 @@ -## -## Mailbox locations and namespaces -## - -# Location for users' mailboxes. The default is empty, which means that Dovecot -# tries to find the mailboxes automatically. This won't work if the user -# doesn't yet have any mail, so you should explicitly tell Dovecot the full -# location. -# -# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u) -# isn't enough. You'll also need to tell Dovecot where the other mailboxes are -# kept. This is called the "root mail directory", and it must be the first -# path given in the mail_location setting. -# -# There are a few special variables you can use, eg.: -# -# %u - username -# %n - user part in user@domain, same as %u if there's no domain -# %d - domain part in user@domain, empty if there's no domain -# %h - home directory -# -# See doc/wiki/Variables.txt for full list. Some examples: -# -# mail_location = maildir:~/Maildir -# mail_location = mbox:~/mail:INBOX=/var/mail/%u -# mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n -# -# -# -mail_location = maildir:/var/mail/%d/%n - -# If you need to set multiple mailbox locations or want to change default -# namespace settings, you can do it by defining namespace sections. -# -# You can have private, shared and public namespaces. Private namespaces -# are for user's personal mails. Shared namespaces are for accessing other -# users' mailboxes that have been shared. Public namespaces are for shared -# mailboxes that are managed by sysadmin. If you create any shared or public -# namespaces you'll typically want to enable ACL plugin also, otherwise all -# users can access all the shared mailboxes, assuming they have permissions -# on filesystem level to do so. -namespace inbox { - # Namespace type: private, shared or public - #type = private - - # Hierarchy separator to use. You should use the same separator for all - # namespaces or some clients get confused. '/' is usually a good one. - # The default however depends on the underlying mail storage format. - #separator = - - # Prefix required to access this namespace. This needs to be different for - # all namespaces. For example "Public/". - #prefix = - - # Physical location of the mailbox. This is in same format as - # mail_location, which is also the default for it. - #location = - - # There can be only one INBOX, and this setting defines which namespace - # has it. - inbox = yes - - # If namespace is hidden, it's not advertised to clients via NAMESPACE - # extension. You'll most likely also want to set list=no. This is mostly - # useful when converting from another server with different namespaces which - # you want to deprecate but still keep working. For example you can create - # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/". - #hidden = no - - # Show the mailboxes under this namespace with LIST command. This makes the - # namespace visible for clients that don't support NAMESPACE extension. - # "children" value lists child mailboxes, but hides the namespace prefix. - #list = yes - - # Namespace handles its own subscriptions. If set to "no", the parent - # namespace handles them (empty prefix should always have this as "yes") - #subscriptions = yes -} - -# Example shared namespace configuration -#namespace { - #type = shared - #separator = / - - # Mailboxes are visible under "shared/user@domain/" - # %%n, %%d and %%u are expanded to the destination user. - #prefix = shared/%%u/ - - # Mail location for other users' mailboxes. Note that %variables and ~/ - # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the - # destination user's data. - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u - - # Use the default namespace for saving subscriptions. - #subscriptions = no - - # List the shared/ namespace only if there are visible shared mailboxes. - #list = children -#} -# Should shared INBOX be visible as "shared/user" or "shared/user/INBOX"? -#mail_shared_explicit_inbox = no - -# System user and group used to access mails. If you use multiple, userdb -# can override these by returning uid or gid fields. You can use either numbers -# or names. -#mail_uid = -#mail_gid = - -# Group to enable temporarily for privileged operations. Currently this is -# used only with INBOX when either its initial creation or dotlocking fails. -# Typically this is set to "mail" to give access to /var/mail. -mail_privileged_group = mail - -# Grant access to these supplementary groups for mail processes. Typically -# these are used to set up access to shared mailboxes. Note that it may be -# dangerous to set these if users can create symlinks (e.g. if "mail" group is -# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' -# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). -#mail_access_groups = - -# Allow full filesystem access to clients. There's no access checks other than -# what the operating system does for the active UID/GID. It works with both -# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ -# or ~user/. -#mail_full_filesystem_access = no - -# Dictionary for key=value mailbox attributes. Currently used by URLAUTH, but -# soon intended to be used by METADATA as well. -#mail_attribute_dict = - -## -## Mail processes -## - -# Don't use mmap() at all. This is required if you store indexes to shared -# filesystems (NFS or clustered filesystem). -#mmap_disable = no - -# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL -# since version 3, so this should be safe to use nowadays by default. -#dotlock_use_excl = yes - -# When to use fsync() or fdatasync() calls: -# optimized (default): Whenever necessary to avoid losing important data -# always: Useful with e.g. NFS when write()s are delayed -# never: Never use it (best performance, but crashes can lose data) -#mail_fsync = optimized - -# Locking method for index files. Alternatives are fcntl, flock and dotlock. -# Dotlocking uses some tricks which may create more disk I/O than other locking -# methods. NFS users: flock doesn't work, remember to change mmap_disable. -#lock_method = fcntl - -# Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. -#mail_temp_dir = /tmp - -# Valid UID range for users, defaults to 500 and above. This is mostly -# to make sure that users can't log in as daemons or other system users. -# Note that denying root logins is hardcoded to dovecot binary and can't -# be done even if first_valid_uid is set to 0. -first_valid_uid = 8 -#last_valid_uid = 0 - -# Valid GID range for users, defaults to non-root/wheel. Users having -# non-valid GID as primary group ID aren't allowed to log in. If user -# belongs to supplementary groups with non-valid GIDs, those groups are -# not set. -#first_valid_gid = 1 -#last_valid_gid = 0 - -# Maximum allowed length for mail keyword name. It's only forced when trying -# to create new keywords. -#mail_max_keyword_length = 50 - -# ':' separated list of directories under which chrooting is allowed for mail -# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). -# This setting doesn't affect login_chroot, mail_chroot or auth chroot -# settings. If this setting is empty, "/./" in home dirs are ignored. -# WARNING: Never add directories here which local users can modify, that -# may lead to root exploit. Usually this should be done only if you don't -# allow shell access for users. -#valid_chroot_dirs = - -# Default chroot directory for mail processes. This can be overridden for -# specific users in user database by giving /./ in user's home directory -# (eg. /home/./user chroots into /home). Note that usually there is no real -# need to do chrooting, Dovecot doesn't allow users to access files outside -# their mail directory anyway. If your home directories are prefixed with -# the chroot directory, append "/." to mail_chroot. -#mail_chroot = - -# UNIX socket path to master authentication server to find users. -# This is used by imap (for shared users) and lda. -#auth_socket_path = /var/run/dovecot/auth-userdb - -# Directory where to look up mail plugins. -#mail_plugin_dir = /usr/lib/dovecot/modules - -# Space separated list of plugins to load for all services. Plugins specific to -# IMAP, LDA, etc. are added to this list in their own .conf files. -#mail_plugins = - -## -## Mailbox handling optimizations -## - -# Mailbox list indexes can be used to optimize IMAP STATUS commands. They are -# also required for IMAP NOTIFY extension to be enabled. -#mailbox_list_index = no - -# The minimum number of mails in a mailbox before updates are done to cache -# file. This allows optimizing Dovecot's behavior to do less disk writes at -# the cost of more disk reads. -#mail_cache_min_mail_count = 0 - -# When IDLE command is running, mailbox is checked once in a while to see if -# there are any new mails or other changes. This setting defines the minimum -# time to wait between those checks. Dovecot can also use dnotify, inotify and -# kqueue to find out immediately when changes occur. -#mailbox_idle_check_interval = 30 secs - -# Save mails with CR+LF instead of plain LF. This makes sending those mails -# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. -# But it also creates a bit more disk I/O which may just make it slower. -# Also note that if other software reads the mboxes/maildirs, they may handle -# the extra CRs wrong and cause problems. -#mail_save_crlf = no - -# Max number of mails to keep open and prefetch to memory. This only works with -# some mailbox formats and/or operating systems. -#mail_prefetch_count = 0 - -# How often to scan for stale temporary files and delete them (0 = never). -# These should exist only after Dovecot dies in the middle of saving mails. -#mail_temp_scan_interval = 1w - -## -## Maildir-specific settings -## - -# By default LIST command returns all entries in maildir beginning with a dot. -# Enabling this option makes Dovecot return only entries which are directories. -# This is done by stat()ing each entry, so it causes more disk I/O. -# (For systems setting struct dirent->d_type, this check is free and it's -# done always regardless of this setting) -#maildir_stat_dirs = no - -# When copying a message, do it with hard links whenever possible. This makes -# the performance much better, and it's unlikely to have any side effects. -#maildir_copy_with_hardlinks = yes - -# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only -# when its mtime changes unexpectedly or when we can't find the mail otherwise. -#maildir_very_dirty_syncs = no - -# If enabled, Dovecot doesn't use the S= in the Maildir filenames for -# getting the mail's physical size, except when recalculating Maildir++ quota. -# This can be useful in systems where a lot of the Maildir filenames have a -# broken size. The performance hit for enabling this is very small. -#maildir_broken_filename_sizes = no - -# Always move mails from new/ directory to cur/, even when the \Recent flags -# aren't being reset. -#maildir_empty_new = no - -## -## mbox-specific settings -## - -# Which locking methods to use for locking mbox. There are four available: -# dotlock: Create .lock file. This is the oldest and most NFS-safe -# solution. If you want to use /var/mail/ like directory, the users -# will need write access to that directory. -# dotlock_try: Same as dotlock, but if it fails because of permissions or -# because there isn't enough disk space, just skip it. -# fcntl : Use this if possible. Works with NFS too if lockd is used. -# flock : May not exist in all systems. Doesn't work with NFS. -# lockf : May not exist in all systems. Doesn't work with NFS. -# -# You can use multiple locking methods; if you do the order they're declared -# in is important to avoid deadlocks if other MTAs/MUAs are using multiple -# locking methods as well. Some operating systems don't allow using some of -# them simultaneously. -# -# The Debian value for mbox_write_locks differs from upstream Dovecot. It is -# changed to be compliant with Debian Policy (section 11.6) for NFS safety. -# Dovecot: mbox_write_locks = dotlock fcntl -# Debian: mbox_write_locks = fcntl dotlock -# -#mbox_read_locks = fcntl -#mbox_write_locks = fcntl dotlock - -# Maximum time to wait for lock (all of them) before aborting. -#mbox_lock_timeout = 5 mins - -# If dotlock exists but the mailbox isn't modified in any way, override the -# lock file after this much time. -#mbox_dotlock_change_timeout = 2 mins - -# When mbox changes unexpectedly we have to fully read it to find out what -# changed. If the mbox is large this can take a long time. Since the change -# is usually just a newly appended mail, it'd be faster to simply read the -# new mails. If this setting is enabled, Dovecot does this but still safely -# fallbacks to re-reading the whole mbox file whenever something in mbox isn't -# how it's expected to be. The only real downside to this setting is that if -# some other MUA changes message flags, Dovecot doesn't notice it immediately. -# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK -# commands. -#mbox_dirty_syncs = yes - -# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, -# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. -#mbox_very_dirty_syncs = no - -# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK -# commands and when closing the mailbox). This is especially useful for POP3 -# where clients often delete all mails. The downside is that our changes -# aren't immediately visible to other MUAs. -#mbox_lazy_writes = yes - -# If mbox size is smaller than this (e.g. 100k), don't write index files. -# If an index file already exists it's still read, just not updated. -#mbox_min_index_size = 0 - -# Mail header selection algorithm to use for MD5 POP3 UIDLs when -# pop3_uidl_format=%m. For backwards compatibility we use apop3d inspired -# algorithm, but it fails if the first Received: header isn't unique in all -# mails. An alternative algorithm is "all" that selects all headers. -#mbox_md5 = apop3d - -## -## mdbox-specific settings -## - -# Maximum dbox file size until it's rotated. -#mdbox_rotate_size = 2M - -# Maximum dbox file age until it's rotated. Typically in days. Day begins -# from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. -#mdbox_rotate_interval = 0 - -# When creating new mdbox files, immediately preallocate their size to -# mdbox_rotate_size. This setting currently works only in Linux with some -# filesystems (ext4, xfs). -#mdbox_preallocate_space = no - -## -## Mail attachments -## - -# sdbox and mdbox support saving mail attachments to external files, which -# also allows single instance storage for them. Other backends don't support -# this for now. - -# Directory root where to store mail attachments. Disabled, if empty. -#mail_attachment_dir = - -# Attachments smaller than this aren't saved externally. It's also possible to -# write a plugin to disable saving specific attachments externally. -#mail_attachment_min_size = 128k - -# Filesystem backend to use for saving attachments: -# posix : No SiS done by Dovecot (but this might help FS's own deduplication) -# sis posix : SiS with immediate byte-by-byte comparison during saving -# sis-queue posix : SiS with delayed comparison and deduplication -#mail_attachment_fs = sis posix - -# Hash format to use in attachment filenames. You can add any text and -# variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. -# Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits -#mail_attachment_hash = %{sha1} diff --git a/mail/dovecot/10-master.conf b/mail/dovecot/10-master.conf deleted file mode 100644 index 45f9c64..0000000 --- a/mail/dovecot/10-master.conf +++ /dev/null @@ -1,123 +0,0 @@ -#default_process_limit = 100 -#default_client_limit = 1000 - -# Default VSZ (virtual memory size) limit for service processes. This is mainly -# intended to catch and kill processes that leak memory before they eat up -# everything. -#default_vsz_limit = 256M - -# Login user is internally used by login processes. This is the most untrusted -# user in Dovecot system. It shouldn't have access to anything at all. -#default_login_user = dovenull - -# Internal user is used by unprivileged processes. It should be separate from -# login user, so that login processes can't disturb other processes. -#default_internal_user = dovecot - -service imap-login { - inet_listener imap { - #port = 143 - } - inet_listener imaps { - #port = 993 - #ssl = yes - } - - # Number of connections to handle before starting a new process. Typically - # the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 - # is faster. - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = $default_vsz_limit -} - -service pop3-login { - inet_listener pop3 { - #port = 110 - } - inet_listener pop3s { - #port = 995 - #ssl = yes - } -} - -service lmtp { - unix_listener /var/spool/postfix/private/dovecot-lmtp { - mode = 0666 - group = postfix - user = postfix - } - - # Create inet listener only if you can't use the above UNIX socket - #inet_listener lmtp { - # Avoid making LMTP visible for the entire internet - #address = - #port = - #} -} - -service imap { - # Most of the memory goes to mmap()ing files. You may need to increase this - # limit if you have huge mailboxes. - #vsz_limit = $default_vsz_limit - - # Max. number of IMAP processes (connections) - #process_limit = 1024 -} - -service pop3 { - # Max. number of POP3 processes (connections) - #process_limit = 1024 -} - -service auth { - # auth_socket_path points to this userdb socket by default. It's typically - # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have - # full permissions to this socket are able to get a list of all usernames and - # get the results of everyone's userdb lookups. - # - # The default 0666 mode allows anyone to connect to the socket, but the - # userdb lookups will succeed only if the userdb returns an "uid" field that - # matches the caller process's UID. Also if caller's uid or gid matches the - # socket's uid or gid the lookup succeeds. Anything else causes a failure. - # - # To give the caller full permissions to lookup all users, set the mode to - # something else than 0666 and Dovecot lets the kernel enforce the - # permissions (e.g. 0777 allows everyone full permissions). - unix_listener auth-userdb { - mode = 0600 - user = mail - #group = - } - - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/auth { - mode = 0666 - user = postfix - group = postfix - } - - # Auth process is run as this user. - user = dovecot -} - -service auth-worker { - # Auth worker process is run as root by default, so that it can access - # /etc/shadow. If this isn't necessary, the user should be changed to - # $default_internal_user. - user = mail -} - -service dict { - # If dict proxy is used, mail processes should have access to its socket. - # For example: mode=0660, group=vmail and global mail_access_groups=vmail - unix_listener dict { - #mode = 0600 - #user = - #group = - } -} diff --git a/mail/dovecot/10-ssl.conf b/mail/dovecot/10-ssl.conf deleted file mode 100644 index c23d195..0000000 --- a/mail/dovecot/10-ssl.conf +++ /dev/null @@ -1,58 +0,0 @@ -## -## SSL settings -## - -# SSL/TLS support: yes, no, required. -ssl = required - -# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before -# dropping root privileges, so keep the key file unreadable by anyone but -# root. Included doc/mkcert.sh can be used to easily generate self-signed -# certificate, just make sure to update the domains in dovecot-openssl.cnf -ssl_cert = . %d expands to recipient domain. -postmaster_address = postmaster@emersonveenstra.net - -# Hostname to use in various parts of sent mails (e.g. in Message-Id) and -# in LMTP replies. Default is the system's real hostname@domain. -#hostname = - -# If user is over quota, return with temporary failure instead of -# bouncing the mail. -#quota_full_tempfail = no - -# Binary to use for sending mails. -#sendmail_path = /usr/sbin/sendmail - -# If non-empty, send mails via this SMTP host[:port] instead of sendmail. -#submission_host = - -# Subject: header to use for rejection mails. You can use the same variables -# as for rejection_reason below. -#rejection_subject = Rejected: %s - -# Human readable error message for rejection mails. You can use variables: -# %n = CRLF, %r = reason, %s = original subject, %t = recipient -#rejection_reason = Your message to <%t> was automatically rejected:%n%r - -# Delimiter character between local-part and detail in email address. -#recipient_delimiter = + - -# Header where the original recipient address (SMTP's RCPT TO: address) is taken -# from if not available elsewhere. With dovecot-lda -a parameter overrides this. -# A commonly used header for this is X-Original-To. -#lda_original_recipient_header = - -# Should saving a mail to a nonexistent mailbox automatically create it? -#lda_mailbox_autocreate = no - -# Should automatically created mailboxes be also automatically subscribed? -#lda_mailbox_autosubscribe = no - -protocol lda { - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins -} diff --git a/mail/dovecot/20-imap.conf b/mail/dovecot/20-imap.conf deleted file mode 100644 index 8e19f02..0000000 --- a/mail/dovecot/20-imap.conf +++ /dev/null @@ -1,65 +0,0 @@ -## -## IMAP specific settings -## - -# Maximum IMAP command line length. Some clients generate very long command -# lines with huge mailboxes, so you may need to raise this if you get -# "Too long argument" or "IMAP command line too large" errors often. -#imap_max_line_length = 64k - -# IMAP logout format string: -# %i - total number of bytes read from client -# %o - total number of bytes sent to client -#imap_logout_format = in=%i out=%o - -# Override the IMAP CAPABILITY response. If the value begins with '+', -# add the given capabilities on top of the defaults (e.g. +XFOO XBAR). -#imap_capability = - -# How long to wait between "OK Still here" notifications when client is -# IDLEing. -#imap_idle_notify_interval = 2 mins - -# ID field names and values to send to clients. Using * as the value makes -# Dovecot use the default value. The following fields have default values -# currently: name, version, os, os-version, support-url, support-email. -#imap_id_send = - -# ID fields sent by client to log. * means everything. -#imap_id_log = - -# Workarounds for various client bugs: -# delay-newmail: -# Send EXISTS/RECENT new mail notifications only when replying to NOOP -# and CHECK commands. Some clients ignore them otherwise, for example OSX -# Mail ( - -passdb { - driver = passwd-file - args = scheme=CRYPT username_format=%n /etc/dovecot/users -} - -userdb { - driver = static - args = uid=mail gid=mail home=/var/mail/%d/%n -} - diff --git a/mail/dovecot/dovecot.conf b/mail/dovecot/dovecot.conf deleted file mode 100755 index bb0fa5c..0000000 --- a/mail/dovecot/dovecot.conf +++ /dev/null @@ -1,104 +0,0 @@ -## Dovecot configuration file - -# If you're in a hurry, see http://wiki2.dovecot.org/QuickConfiguration - -# "doveconf -n" command gives a clean output of the changed settings. Use it -# instead of copy&pasting files when posting to the Dovecot mailing list. - -# '#' character and everything after it is treated as comments. Extra spaces -# and tabs are ignored. If you want to use either of these explicitly, put the -# value inside quotes, eg.: key = "# char and trailing whitespace " - -# Most (but not all) settings can be overridden by different protocols and/or -# source/destination IPs by placing the settings inside sections, for example: -# protocol imap { }, local 127.0.0.1 { }, remote 10.0.0.0/8 { } - -# Default values are shown for each setting, it's not required to uncomment -# those. These are exceptions to this though: No sections (e.g. namespace {}) -# or plugin settings are added by default, they're listed only as examples. -# Paths are also just examples with the real defaults being based on configure -# options. The paths listed here are for configure --prefix=/usr -# --sysconfdir=/etc --localstatedir=/var - -# Enable installed protocols -!include_try /usr/share/dovecot/protocols.d/*.protocol - -# A comma separated list of IPs or hosts where to listen in for connections. -# "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces. -# If you want to specify non-default ports or anything more complex, -# edit conf.d/master.conf. -#listen = *, :: - -# Base directory where to store runtime data. -#base_dir = /var/run/dovecot/ - -# Name of this instance. In multi-instance setup doveadm and other commands -# can use -i to select which instance is used (an alternative -# to -c ). The instance name is also added to Dovecot processes -# in ps output. -#instance_name = dovecot - -# Greeting message for clients. -#login_greeting = Dovecot ready. - -# Space separated list of trusted network ranges. Connections from these -# IPs are allowed to override their IP addresses and ports (for logging and -# for authentication checks). disable_plaintext_auth is also ignored for -# these networks. Typically you'd specify your IMAP proxy servers here. -#login_trusted_networks = - -# Space separated list of login access check sockets (e.g. tcpwrap) -#login_access_sockets = - -# With proxy_maybe=yes if proxy destination matches any of these IPs, don't do -# proxying. This isn't necessary normally, but may be useful if the destination -# IP is e.g. a load balancer's IP. -#auth_proxy_self = - -# Show more verbose process titles (in ps). Currently shows user name and -# IP address. Useful for seeing who are actually using the IMAP processes -# (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no - -# Should all processes be killed when Dovecot master process shuts down. -# Setting this to "no" means that Dovecot can be upgraded without -# forcing existing client connections to close (although that could also be -# a problem if the upgrade is e.g. because of a security fix). -#shutdown_clients = yes - -# If non-zero, run mail commands via this many connections to doveadm server, -# instead of running them directly in the same process. -#doveadm_worker_count = 0 -# UNIX socket or host:port used for connecting to doveadm server -#doveadm_socket_path = doveadm-server - -# Space separated list of environment variables that are preserved on Dovecot -# startup and passed down to all of its child processes. You can also give -# key=value pairs to always set specific settings. -#import_environment = TZ - -## -## Dictionary server settings -## - -# Dictionary can be used to store key=value lists. This is used by several -# plugins. The dictionary can be accessed either directly or though a -# dictionary server. The following dict block maps dictionary names to URIs -# when the server is used. These can then be referenced using URIs in format -# "proxy::". - -dict { - #quota = mysql:/etc/dovecot/dovecot-dict-sql.conf.ext - #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext -} - -# Most of the actual configuration gets included below. The filenames are -# first sorted by their ASCII value and parsed in that order. The 00-prefixes -# in filenames are intended to make it easier to understand the ordering. -!include conf.d/*.conf - -# A config file can also tried to be included without giving an error if -# it's not found: -!include_try local.conf - -protocols = imap lmtp diff --git a/mail/opendkim/KeyTable b/mail/opendkim/KeyTable deleted file mode 100644 index 2170054..0000000 --- a/mail/opendkim/KeyTable +++ /dev/null @@ -1,2 +0,0 @@ -nodevine.net nodevine.net:nodevine:/etc/opendkim/nodevine.net.private -emersonveenstra.net emersonveenstra.net:mail:/etc/opendkim/emersonveenstra.net.private diff --git a/mail/opendkim/SigningTable b/mail/opendkim/SigningTable deleted file mode 100644 index b44c240..0000000 --- a/mail/opendkim/SigningTable +++ /dev/null @@ -1,2 +0,0 @@ -*@nodevine.net nodevine.net -*@emersonveenstra.net emersonveenstra.net diff --git a/mail/opendkim/TrustedHosts b/mail/opendkim/TrustedHosts deleted file mode 100644 index 251d6d1..0000000 --- a/mail/opendkim/TrustedHosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 -mail.nodevine.net diff --git a/mail/opendkim/opendkim.conf b/mail/opendkim/opendkim.conf deleted file mode 100644 index ab05101..0000000 --- a/mail/opendkim/opendkim.conf +++ /dev/null @@ -1,18 +0,0 @@ -Syslog yes - -UMask 002 - -ExternalIgnoreList refile:/etc/opendkim/TrustedHosts -InternalHosts refile:/etc/opendkim/TrustedHosts -KeyTable refile:/etc/opendkim/KeyTable -LogWhy Yes -SigningTable refile:/etc/opendkim/SigningTable -SyslogSuccess yes - -Canonicalization relaxed/relaxed -Mode sv - -OversignHeaders From - -Socket inet:8891@localhost -AlwaysAddARHeader y diff --git a/mail/postfix/aliasen b/mail/postfix/aliasen deleted file mode 100644 index ff56b59..0000000 --- a/mail/postfix/aliasen +++ /dev/null @@ -1,2 +0,0 @@ -@emersonveenstra.net emerson@emersonveenstra.net -@nodevine.net emerson@emersonveenstra.net diff --git a/mail/postfix/client_checks b/mail/postfix/client_checks deleted file mode 100644 index bf0a0f5..0000000 --- a/mail/postfix/client_checks +++ /dev/null @@ -1,19 +0,0 @@ -# The qualifications for making it on this list of shame aren't really -# objective, if I notice a lot of attempts, I'll look up the AS and see who owns -# it, so it depends on what hosting provider it is (some are obvious spam fronts -# or just don't care). Single IP addresses only make it on here if they attempt -# to use me as a relay or bruteforce me. -107.173.4.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -112.90.183.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -82.196.20.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -112.90.183.139 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -23.108.243.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -23.244.190.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -23.247.14.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -23.228.107.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -185.128.64.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -96.9.247.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -104.128.234.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -72.9.96.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -185.57.81.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. -172.93.143.0/24 REJECT Rejected due to excessive spam from your ISP. If in error, email abuse@nodevine.net from a commonly used email service such as Gmail with details. diff --git a/mail/postfix/mailboxen b/mail/postfix/mailboxen deleted file mode 100644 index b884834..0000000 --- a/mail/postfix/mailboxen +++ /dev/null @@ -1 +0,0 @@ -emerson@emersonveenstra.net whatever diff --git a/mail/postfix/main.cf b/mail/postfix/main.cf deleted file mode 100644 index c392e51..0000000 --- a/mail/postfix/main.cf +++ /dev/null @@ -1,78 +0,0 @@ -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -biff = no - -# appending .domain is the MUA's job. -append_dot_mydomain = no - -# Uncomment the next line to generate "delayed mail" warnings -#delay_warning_time = 4h - -readme_directory = no - -# TLS parameters -smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache -smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache -smtpd_tls_cert_file = /home/emerson/tls/mail-cert.crt -smtpd_tls_key_file = /home/emerson/tls/mail-cert.key - -smtpd_use_tls = yes -smtpd_tls_auth_only = yes -smtp_tls_security_level=may -smtp_tls_loglevel=2 -smtpd_tls_loglevel=2 -smtpd_tls_received_header=yes - -smtpd_delay_reject = yes -smtpd_helo_required = yes -smtpd_helo_restrictions = - permit_mynetworks, - reject_non_fqdn_helo_hostname, - reject_invalid_helo_hostname, - reject_unknown_helo_hostname, - permit - -smtpd_sender_restrictions = - permit_sasl_authenticated, - permit_mynetworks, - reject_non_fqdn_sender, - reject_unknown_sender_domain, - permit - -smtpd_sasl_type = dovecot -smtpd_sasl_path = private/auth -smtpd_sasl_auth_enable = yes - -# port 10023 is postgrey -smtpd_recipient_restrictions= - permit_sasl_authenticated, - permit_mynetworks, - reject_unauth_destination, - reject_non_fqdn_recipient, - reject_rbl_client zen.spamhaus.org, - check_client_access cidr:/etc/postfix/client_checks, - check_policy_service inet:127.0.0.1:10023 - -smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination -myhostname = mail.nodevine.net -alias_maps = hash:/etc/aliases -alias_database = hash:/etc/aliases -myorigin = /etc/mailname -mydestination = localhost -relayhost = -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 -mailbox_size_limit = 0 -message_size_limit = 20480000 -recipient_delimiter = + -inet_interfaces = all - -virtual_transport = lmtp:unix:private/dovecot-lmtp -virtual_mailbox_domains = emersonveenstra.net, nodevine.net -virtual_mailbox_maps = texthash:/etc/postfix/mailboxen -virtual_alias_maps = texthash:/etc/postfix/aliasen -local_recipient_maps = $virtual_mailbox_maps - -#OpenDKIM -smtpd_milters=inet:localhost:8891 -non_smtpd_milters=$smtpd_milters -milter_default_action=accept -smtpd_client_restrictions = permit_sasl_authenticated diff --git a/mail/postfix/master.cf b/mail/postfix/master.cf deleted file mode 100644 index 5b4d76a..0000000 --- a/mail/postfix/master.cf +++ /dev/null @@ -1,126 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master" or -# on-line: http://www.postfix.org/master.5.html). -# -# Do not forget to execute "postfix reload" after editing this file. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) -# ========================================================================== -smtp inet n - - - - smtpd -#smtp inet n - - - 1 postscreen -#smtpd pass - - - - - smtpd -#dnsblog unix - - - - 0 dnsblog -#tlsproxy unix - - - - 0 tlsproxy -submission inet n - - - - smtpd - -o syslog_name=postfix/submission - -o smtpd_tls_security_level=encrypt - -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no - -o smtpd_client_restrictions=permit_sasl_authenticated,reject -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -smtps inet n - - - - smtpd -# -o syslog_name=postfix/smtps - -o smtpd_tls_wrappermode=yes - -o smtpd_sasl_auth_enable=yes -# -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= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#628 inet n - - - - qmqpd -pickup unix n - - 60 1 pickup -cleanup unix n - - - 0 cleanup -qmgr unix n - n 300 1 qmgr -#qmgr unix n - n 300 1 oqmgr -tlsmgr unix - - - 1000? 1 tlsmgr -rewrite unix - - - - - trivial-rewrite -bounce unix - - - - 0 bounce -defer unix - - - - 0 bounce -trace unix - - - - 0 bounce -verify unix - - - - 1 verify -flush unix n - - 1000? 0 flush -proxymap unix - - n - - proxymap -proxywrite unix - - n - 1 proxymap -smtp unix - - - - - smtp -relay unix - - - - - smtp -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - - - - showq -error unix - - - - - error -retry unix - - - - - error -discard unix - - - - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - - - - lmtp -anvil unix - - - - 1 anvil -scache unix - - - - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} -# -# ==================================================================== -# -# Recent Cyrus versions can use the existing "lmtp" master.cf entry. -# -# Specify in cyrus.conf: -# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 -# -# Specify in main.cf one or more of the following: -# mailbox_transport = lmtp:inet:localhost -# virtual_transport = lmtp:inet:localhost -# -# ==================================================================== -# -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -# -#cyrus unix - n n - - pipe -# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -# -# ==================================================================== -# Old example of delivery via Cyrus. -# -#old-cyrus unix - n n - - pipe -# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} -# -# ==================================================================== -# -# See the Postfix UUCP_README file for configuration details. -# -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# Other external delivery methods. -# -ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -bsmtp unix - n n - - pipe - flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient -scalemail-backend unix - n n - 2 pipe - flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} -mailman unix - n n - - pipe - flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py - ${nexthop} ${user} - -dovecot unix - n n - - pipe - flags=DRhu user=mail:mail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} diff --git a/mail/postgrey/whitelist_clients b/mail/postgrey/whitelist_clients deleted file mode 100644 index 4daa34c..0000000 --- a/mail/postgrey/whitelist_clients +++ /dev/null @@ -1,19 +0,0 @@ -# These are quite broad, but the chance of getting a false positive is quite -# low, and I'd rather not have to mess around with regexing a bunch of times. -outlook.com -google.com -facebook.com -slack.com -amazonses.com -republicwireless.com -jivesoftware.com -zdsys.com -mandrillapp.com -directly.com -customeriomail.com -microsoftemail.com -sendgrid.net -stripe.com -amazonses.com -cloudatcost.com -bankofamerica.com