diff --git a/.bash_logout b/.bash_logout
deleted file mode 120000
index 0a9b92a3..00000000
--- a/.bash_logout
+++ /dev/null
@@ -1 +0,0 @@
-bash_logout
\ No newline at end of file
diff --git a/.bash_profile b/.bash_profile
deleted file mode 120000
index 2329555f..00000000
--- a/.bash_profile
+++ /dev/null
@@ -1 +0,0 @@
-bash_profile
\ No newline at end of file
diff --git a/.bashrc b/.bashrc
deleted file mode 120000
index cee304e6..00000000
--- a/.bashrc
+++ /dev/null
@@ -1 +0,0 @@
-bashrc
\ No newline at end of file
diff --git a/.bin b/.bin
deleted file mode 120000
index c5e82d74..00000000
--- a/.bin
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 29ce5d1d..4d854e8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
[submodule "config/vim"]
- path = config/vim
+ path = vim
url = git@github.com:Jab2870/vim.git
[submodule "custom-oh-my-zsh/themes/powerlevel9k"]
path = custom-oh-my-zsh/themes/powerlevel9k
diff --git a/.local b/.local
deleted file mode 120000
index c2c027fe..00000000
--- a/.local
+++ /dev/null
@@ -1 +0,0 @@
-local
\ No newline at end of file
diff --git a/.xinitrc b/.xinitrc
deleted file mode 120000
index 9b9ab970..00000000
--- a/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-./xinitrc
\ No newline at end of file
diff --git a/bash_logout b/bash_logout
deleted file mode 100644
index 0e4e4f18..00000000
--- a/bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# ~/.bash_logout
-#
diff --git a/config/inkscape/preferences.xml b/config/inkscape/preferences.xml
deleted file mode 100644
index b0d3b118..00000000
--- a/config/inkscape/preferences.xml
+++ /dev/null
@@ -1,1351 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/config/mutt/accounts/.gitignore b/config/mutt/accounts/.gitignore
deleted file mode 100644
index 9b562bed..00000000
--- a/config/mutt/accounts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.creds
diff --git a/config/mutt/accounts/account.hosting.conf b/config/mutt/accounts/account.hosting.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/mutt/accounts/account.jonathan.conf b/config/mutt/accounts/account.jonathan.conf
deleted file mode 100644
index 4ca452a6..00000000
--- a/config/mutt/accounts/account.jonathan.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# Source the credentials file (Not in git repo)
-source ./account.jonathan.creds
-
-#IMAP
-set imap_user=$my_user
-set imap_pass=$my_pass
-set folder=imaps://$my_user@imap.1and1.co.uk:993
-
-#SMTP
-set realname = 'Jonathan Hodgson'
-set from = jonathan@lunarweb.co.uk
-set use_from = yes
-
-set smtp_url=smtps://$my_user:$my_pass@auth.smtp.1and1.co.uk
-set ssl_force_tls = yes
-
-# The main folder
-set spoolfile = "+INBOX"
-
-# Check all mail boxes
-set imap_check_subscribed
-
-# Store message headers locally to speed things up.
-# If hcache is a folder, Mutt will create sub cache folders for each account which may speeds things up even more.
-set header_cache = ~/.cache/mutt/jonathan.fellowshipproductions/headers
-
-# Store messages locally to speed things up, like searching message bodies.
-# Can be the same folder as header_cache.
-# This will cost important disk usage according to your e-mail amount.
-set message_cachedir = ~/.cache/mutt/jonathan.fellowshipproductions/bodies
-
-# Specify where to save and/or look for postponed messages.
-set postponed = +Drafts
-
-# Allow Mutt to open a new IMAP connection automatically.
-unset imap_passive
-
-# Keep the IMAP connection alive by polling intermittently (time in seconds).
-set imap_keepalive = 300
-
-# How often to check for new mail (time in seconds).
-set mail_check = 120
-
-set record = +Sent%20Items
diff --git a/config/mutt/accounts/account.support.conf b/config/mutt/accounts/account.support.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/mutt/accounts/account.wordpress.conf b/config/mutt/accounts/account.wordpress.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/mutt/mailcap b/config/mutt/mailcap
deleted file mode 100755
index acdc2882..00000000
--- a/config/mutt/mailcap
+++ /dev/null
@@ -1,7 +0,0 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput;
-
-text/html; mv %s %s.html && qutebrowser %s.html > /dev/null; needsterminal;
-
-image/*; ~/.config/mutt/muttimage.sh %s ; copiousoutput
-
-application/*; xdg-open %s & ; copiousoutput
diff --git a/config/mutt/muttcol b/config/mutt/muttcol
deleted file mode 100755
index e9d6defb..00000000
--- a/config/mutt/muttcol
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body yellow default "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index yellow default "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream brightwhite "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index yellow cyan "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index yellow J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent default "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent brightwhite "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent cyan "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent red "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal brightyellow default
-color error red default
-color tilde black default
-color message cyan default
-color markers red white
-color attachment white default
-color search brightmagenta default
-#color status J_black J_status
-color status brightyellow black
-color indicator brightblack yellow
-color tree yellow default # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index red default "~D(!~p|~p)" # deleted
-#color index black default ~F # flagged
-#color index brightred default ~= # duplicate messages
-#color index brightgreen default "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base default "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index red default "~A" # all messages
-color index brightred default "~E" # expired messages
-color index blue default "~N" # new messages
-color index blue default "~O" # old messages
-color index brightmagenta default "~Q" # messages that have been replied to
-color index brightgreen default "~R" # read messages
-color index blue default "~U" # unread messages
-color index blue default "~U~$" # unread, unreferenced messages
-color index brightyellow default "~v" # messages part of a collapsed thread
-color index brightyellow default "~P" # messages from me
-color index cyan default "~p!~F" # messages to me
-color index cyan default "~N~p!~F" # new messages to me
-color index cyan default "~U~p!~F" # unread messages to me
-color index brightgreen default "~R~p!~F" # messages to me
-color index red default "~F" # flagged messages
-color index red default "~F~p" # flagged messages to me
-color index red default "~N~F" # new flagged messages
-color index red default "~N~F~p" # new flagged messages to me
-color index red default "~U~F~p" # new flagged messages to me
-color index black red "~D" # deleted messages
-color index brightcyan default "~v~(!~N)" # collapsed thread with no unread
-color index yellow default "~v~(~N)" # collapsed thread with some unread
-color index green default "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index red black "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index yellow black "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index green black "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index green black "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index cyan black "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index yellow red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index yellow default "~(~N)" # messages in threads with some unread
-#color index green default "~S" # superseded messages
-#color index red default "~T" # tagged messages
-#color index brightred red "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header brightgreen default "^"
-color hdrdefault brightgreen default
-color header brightyellow default "^(From)"
-color header blue default "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted blue default
-color quoted1 cyan default
-color quoted2 yellow default
-color quoted3 red default
-color quoted4 brightred default
-
-color signature brightgreen default
-color bold black default
-color underline black default
-color normal default default
-#
-color body brightcyan default "[;:][-o][)/(|]" # emoticons
-color body brightcyan default "[;:][)(|]" # emoticons
-color body brightcyan default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body red default "(BAD signature)"
-color body cyan default "(Good signature)"
-color body brightblack default "^gpg: Good signature .*"
-color body brightyellow default "^gpg: "
-color body brightyellow red "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body brightwhite default "<[Gg]>" #
-#color body brightwhite default "<[Bb][Gg]>" #
-#color body yellow default " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body blue default "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body blue default "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body blue default "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body blue default "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black yellow "
-#folder-hook gmail/important "color status J_black yellow "
-
diff --git a/config/mutt/muttimage.sh b/config/mutt/muttimage.sh
deleted file mode 100755
index b67de83b..00000000
--- a/config/mutt/muttimage.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-#### Determine size of Terminal
-height=`stty size | awk 'BEGIN {FS = " "} {print $1;}'`
-width=`stty size | awk 'BEGIN {FS = " "} {print $2;}'`
-
-### Display Image / offset with mutt bar
-echo -e "2;3;\n0;1;210;20;$((width*7-250));$((height*14-100));0;0;0;0;$1\n4;\n3;" | /usr/lib/w3m/w3mimgdisplay &
diff --git a/config/mutt/muttrc b/config/mutt/muttrc
deleted file mode 100644
index f733924a..00000000
--- a/config/mutt/muttrc
+++ /dev/null
@@ -1,61 +0,0 @@
-# Folder hooks
-folder-hook 'account.jonathan' 'source ~/.mutt/accounts/account.jonathan.conf'
- #I will put other accounts here
-
-# Default account
-source ~/.mutt/accounts/account.jonathan.conf
-
-#Default Editor
-set editor = "$EDITOR"
-
-set ssl_starttls = yes
-set ssl_force_tls = yes
-set imap_check_subscribed
-set mail_check = 120
-set mailcap_path = ~/.mutt/mailcap
-set timeout = 300
-set imap_keepalive = 300
-set move = no
-set include
-set sort = 'threads'
-set sort_aux = 'reverse-last-date-received'
-set auto_tag = yes
-
-set date_format="%m/%d %I:%M"
-set index_format="%2C %Z %d %-15.15F %s (%-4.4c)"
-
-#ignore "Authentication-Results:"
-#ignore "DomainKey-Signature:"
-#ignore "DKIM-Signature:"
-hdr_order Date From To Cc
-
-alternative_order text/plain text/html *
-auto_view text/html
-
-mono bold bold
-mono underline underline
-mono indicator reverse
-color index yellow default '.*'
-color index_author red default '.*'
-color index_number blue default
-color index_subject cyan default '.s'
-color index_size green default
-color normal default default
-color body brightred default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
-color body brightblue default (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+
-
-source ~/.mutt/muttcol
-
-bind editor complete-query
-bind editor ^T complete
-bind editor noop
-bind index G last-entry
-bind index g noop
-bind index gg first-entry
-bind index d half-down
-bind index u half-up
-bind index D delete-message
-bind index U undelete-message
-bind index F search
-bind index R group-reply
-# }}}
diff --git a/gitconfig b/git/gitconfig
similarity index 94%
rename from gitconfig
rename to git/gitconfig
index 7175bd0d..80892d73 100644
--- a/gitconfig
+++ b/git/gitconfig
@@ -3,7 +3,7 @@
name = Jonathan Hodgson
[core]
editor = vim
- excludesfile = ~/.gitignore
+ excludesfile = ~/.dotfiles/git/global_gitignore
[status]
submoduleSummary = true
[alias]
diff --git a/global_gitignore b/git/global_gitignore
similarity index 100%
rename from global_gitignore
rename to git/global_gitignore
diff --git a/config/i3/config b/i3/config
similarity index 95%
rename from config/i3/config
rename to i3/config
index fe11f46c..c7fe3381 100644
--- a/config/i3/config
+++ b/i3/config
@@ -58,7 +58,7 @@ bindsym $mod+q kill
bindsym $mod+d exec rofi -show drun
#Start Rofi as emoji finder
-bindsym $mod+u exec ~/.dotfiles/config/rofi/scripts/rofi-emoji
+bindsym $mod+u exec ~/.dotfiles/rofi/scripts/rofi-emoji
#kill i3
@@ -268,17 +268,17 @@ bindsym ctrl+Print exec xfce4-screenshooter -w
bindsym Shift+Print exec xfce4-screenshooter -r
-bindsym $mod+x exec --no-startup-id ~/.config/i3/i3exit logout
+bindsym $mod+x exec --no-startup-id ~/.dotfiles/i3/i3exit logout
set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
mode "$mode_system" {
- bindsym l exec --no-startup-id ~/.config/i3/i3exit lock, mode "default"
- bindsym e exec --no-startup-id ~/.config/i3/i3exit logout, mode "default"
- bindsym s exec --no-startup-id ~/.config/i3/i3exit suspend, mode "default"
- bindsym h exec --no-startup-id ~/.config/i3/i3exit hibernate, mode "default"
- bindsym r exec --no-startup-id~/.config/i3/i3exit reboot, mode "default"
- bindsym Shift+s exec --no-startup-id ~/.config/i3/i3exit shutdown, mode "default"
+ bindsym l exec --no-startup-id ~/.dotfiles/i3/i3exit lock, mode "default"
+ bindsym e exec --no-startup-id ~/.dotfiles/i3/i3exit logout, mode "default"
+ bindsym s exec --no-startup-id ~/.dotfiles/i3/i3exit suspend, mode "default"
+ bindsym h exec --no-startup-id ~/.dotfiles/i3/i3exit hibernate, mode "default"
+ bindsym r exec --no-startup-id ~/.dotfiles/i3/i3exit reboot, mode "default"
+ bindsym Shift+s exec --no-startup-id ~/.dotfiles/i3/i3exit shutdown, mode "default"
# back to normal: Enter or Escape
bindsym Return mode "default"
diff --git a/config/i3/configWork b/i3/configWork
similarity index 100%
rename from config/i3/configWork
rename to i3/configWork
diff --git a/config/i3/fadeLockScreen b/i3/fadeLockScreen
similarity index 100%
rename from config/i3/fadeLockScreen
rename to i3/fadeLockScreen
diff --git a/config/i3/i3exit b/i3/i3exit
similarity index 93%
rename from config/i3/i3exit
rename to i3/i3exit
index 40556178..e8ee4d98 100755
--- a/config/i3/i3exit
+++ b/i3/i3exit
@@ -1,6 +1,6 @@
#!/bin/sh
lock() {
- ~/.config/i3/fadeLockScreen
+ ~/.dotfiles/i3/fadeLockScreen
#i3lock
}
diff --git a/config/rofi/config b/rofi/config
similarity index 100%
rename from config/rofi/config
rename to rofi/config
diff --git a/config/rofi/scripts/rofi-emoji b/rofi/scripts/rofi-emoji
similarity index 100%
rename from config/rofi/scripts/rofi-emoji
rename to rofi/scripts/rofi-emoji
diff --git a/config/rofi/scripts/rofi-shutdown b/rofi/scripts/rofi-shutdown
similarity index 100%
rename from config/rofi/scripts/rofi-shutdown
rename to rofi/scripts/rofi-shutdown
diff --git a/config/rofi/scripts/unicode.txt b/rofi/scripts/unicode.txt
similarity index 100%
rename from config/rofi/scripts/unicode.txt
rename to rofi/scripts/unicode.txt
diff --git a/bash_profile b/shells/bash/bash_profile
similarity index 100%
rename from bash_profile
rename to shells/bash/bash_profile
diff --git a/bashrc b/shells/bash/bashrc
similarity index 98%
rename from bashrc
rename to shells/bash/bashrc
index fec177aa..c6cb4ae9 100644
--- a/bashrc
+++ b/shells/bash/bashrc
@@ -230,7 +230,7 @@ export GIT_PS1_SHOWUPSTREAM="auto"
source /usr/share/git/completion/git-completion.bash
source /usr/share/git/completion/git-prompt.sh
-source $HOME/.dotfiles/t-completion.sh
+source $HOME/.dotfiles/shells/bash/t-completion.sh
############################################
@@ -343,7 +343,7 @@ fi)'$Color_Off'\$ '
# fi)"; \
# fi)\[\033[0m\]\$ '
function _update_ps1() {
- export PS1="$(~/.config/powerline-shell/powerline-shell.py $? 2> /dev/null)"
+ export PS1="$(~/.dotfiles/shells/bash/powerline-shell/powerline-shell.py $? 2> /dev/null)"
}
if [ "$TERM" != "linux" ]; then
diff --git a/config/powerline-shell/CHANGELOG.md b/shells/bash/powerline-shell/CHANGELOG.md
similarity index 100%
rename from config/powerline-shell/CHANGELOG.md
rename to shells/bash/powerline-shell/CHANGELOG.md
diff --git a/config/powerline-shell/LICENSE b/shells/bash/powerline-shell/LICENSE
similarity index 100%
rename from config/powerline-shell/LICENSE
rename to shells/bash/powerline-shell/LICENSE
diff --git a/config/powerline-shell/README.md b/shells/bash/powerline-shell/README.md
similarity index 100%
rename from config/powerline-shell/README.md
rename to shells/bash/powerline-shell/README.md
diff --git a/config/powerline-shell/bob b/shells/bash/powerline-shell/bob
similarity index 100%
rename from config/powerline-shell/bob
rename to shells/bash/powerline-shell/bob
diff --git a/config/powerline-shell/circle.yml b/shells/bash/powerline-shell/circle.yml
similarity index 100%
rename from config/powerline-shell/circle.yml
rename to shells/bash/powerline-shell/circle.yml
diff --git a/config/powerline-shell/config.py b/shells/bash/powerline-shell/config.py
similarity index 100%
rename from config/powerline-shell/config.py
rename to shells/bash/powerline-shell/config.py
diff --git a/config/powerline-shell/config.py.dist b/shells/bash/powerline-shell/config.py.dist
similarity index 100%
rename from config/powerline-shell/config.py.dist
rename to shells/bash/powerline-shell/config.py.dist
diff --git a/config/powerline-shell/dev_requirements.txt b/shells/bash/powerline-shell/dev_requirements.txt
similarity index 100%
rename from config/powerline-shell/dev_requirements.txt
rename to shells/bash/powerline-shell/dev_requirements.txt
diff --git a/config/powerline-shell/install.py b/shells/bash/powerline-shell/install.py
similarity index 100%
rename from config/powerline-shell/install.py
rename to shells/bash/powerline-shell/install.py
diff --git a/config/powerline-shell/powerline-shell.py b/shells/bash/powerline-shell/powerline-shell.py
similarity index 100%
rename from config/powerline-shell/powerline-shell.py
rename to shells/bash/powerline-shell/powerline-shell.py
diff --git a/config/powerline-shell/powerline_shell_base.py b/shells/bash/powerline-shell/powerline_shell_base.py
similarity index 100%
rename from config/powerline-shell/powerline_shell_base.py
rename to shells/bash/powerline-shell/powerline_shell_base.py
diff --git a/t-completion.sh b/shells/bash/t-completion.sh
similarity index 100%
rename from t-completion.sh
rename to shells/bash/t-completion.sh
diff --git a/config/oh-my-zsh/aliases.zsh b/shells/zsh/oh-my-zsh/aliases.zsh
similarity index 100%
rename from config/oh-my-zsh/aliases.zsh
rename to shells/zsh/oh-my-zsh/aliases.zsh
diff --git a/config/oh-my-zsh/completion.zsh b/shells/zsh/oh-my-zsh/completion.zsh
similarity index 100%
rename from config/oh-my-zsh/completion.zsh
rename to shells/zsh/oh-my-zsh/completion.zsh
diff --git a/config/oh-my-zsh/functions.zsh b/shells/zsh/oh-my-zsh/functions.zsh
similarity index 100%
rename from config/oh-my-zsh/functions.zsh
rename to shells/zsh/oh-my-zsh/functions.zsh
diff --git a/config/oh-my-zsh/promptconfig.zsh b/shells/zsh/oh-my-zsh/promptconfig.zsh
similarity index 100%
rename from config/oh-my-zsh/promptconfig.zsh
rename to shells/zsh/oh-my-zsh/promptconfig.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/.gitignore b/shells/zsh/oh-my-zsh/themes/powerlevel9k/.gitignore
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/.gitignore
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/.gitignore
diff --git a/config/oh-my-zsh/themes/powerlevel9k/.gitmodules b/shells/zsh/oh-my-zsh/themes/powerlevel9k/.gitmodules
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/.gitmodules
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/.gitmodules
diff --git a/config/oh-my-zsh/themes/powerlevel9k/.travis.yml b/shells/zsh/oh-my-zsh/themes/powerlevel9k/.travis.yml
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/.travis.yml
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/.travis.yml
diff --git a/config/oh-my-zsh/themes/powerlevel9k/CHANGELOG.md b/shells/zsh/oh-my-zsh/themes/powerlevel9k/CHANGELOG.md
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/CHANGELOG.md
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/CHANGELOG.md
diff --git a/config/oh-my-zsh/themes/powerlevel9k/LICENSE b/shells/zsh/oh-my-zsh/themes/powerlevel9k/LICENSE
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/LICENSE
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/LICENSE
diff --git a/config/oh-my-zsh/themes/powerlevel9k/README.md b/shells/zsh/oh-my-zsh/themes/powerlevel9k/README.md
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/README.md
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/README.md
diff --git a/config/oh-my-zsh/themes/powerlevel9k/TESTS.md b/shells/zsh/oh-my-zsh/themes/powerlevel9k/TESTS.md
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/TESTS.md
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/TESTS.md
diff --git a/config/oh-my-zsh/themes/powerlevel9k/debug/font-issues.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/debug/font-issues.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/debug/font-issues.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/debug/font-issues.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/debug/iterm.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/debug/iterm.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/debug/iterm.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/debug/iterm.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/functions/colors.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/colors.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/functions/colors.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/colors.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/functions/icons.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/icons.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/functions/icons.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/icons.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/functions/utilities.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/utilities.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/functions/utilities.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/utilities.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/functions/vcs.zsh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/vcs.zsh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/functions/vcs.zsh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/functions/vcs.zsh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/powerlevel9k.zsh-theme b/shells/zsh/oh-my-zsh/themes/powerlevel9k/powerlevel9k.zsh-theme
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/powerlevel9k.zsh-theme
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/powerlevel9k.zsh-theme
diff --git a/config/oh-my-zsh/themes/powerlevel9k/prompt_powerlevel9k_setup b/shells/zsh/oh-my-zsh/themes/powerlevel9k/prompt_powerlevel9k_setup
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/prompt_powerlevel9k_setup
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/prompt_powerlevel9k_setup
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/Vagrantfile b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/Vagrantfile
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/Vagrantfile
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/Vagrantfile
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap-zero.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap-zero.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap-zero.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap-zero.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-bsd-vm/bootstrap.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm-providers/plain.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm-providers/plain.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm-providers/plain.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm-providers/plain.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm-providers/setup-environment.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm-providers/setup-environment.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm-providers/setup-environment.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm-providers/setup-environment.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/README.md b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/README.md
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/README.md
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/README.md
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/Vagrantfile b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/Vagrantfile
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/Vagrantfile
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/Vagrantfile
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/antigen.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/antigen.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/antigen.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/antigen.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/bootstrap.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/bootstrap.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/bootstrap.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/bootstrap.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/omz.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/omz.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/omz.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/omz.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test-vm/prezto.sh b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/prezto.sh
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test-vm/prezto.sh
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test-vm/prezto.sh
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/functions/colors.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/colors.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/functions/colors.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/colors.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/functions/icons.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/icons.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/functions/icons.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/icons.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/functions/utilities.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/utilities.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/functions/utilities.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/functions/utilities.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/powerlevel9k.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/powerlevel9k.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/powerlevel9k.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/powerlevel9k.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/segments/command_execution_time.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/command_execution_time.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/segments/command_execution_time.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/command_execution_time.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/segments/dir.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/dir.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/segments/dir.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/dir.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/segments/go_version.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/go_version.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/segments/go_version.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/go_version.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/segments/rust_version.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/rust_version.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/segments/rust_version.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/rust_version.spec
diff --git a/config/oh-my-zsh/themes/powerlevel9k/test/segments/vcs.spec b/shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/vcs.spec
similarity index 100%
rename from config/oh-my-zsh/themes/powerlevel9k/test/segments/vcs.spec
rename to shells/zsh/oh-my-zsh/themes/powerlevel9k/test/segments/vcs.spec
diff --git a/zprofile b/shells/zsh/zprofile
similarity index 100%
rename from zprofile
rename to shells/zsh/zprofile
diff --git a/zsh-pre-oh-my-zsh b/shells/zsh/zsh-pre-oh-my-zsh
similarity index 100%
rename from zsh-pre-oh-my-zsh
rename to shells/zsh/zsh-pre-oh-my-zsh
diff --git a/zshrc b/shells/zsh/zshrc
similarity index 98%
rename from zshrc
rename to shells/zsh/zshrc
index 12cb127b..fc0a56a1 100644
--- a/zshrc
+++ b/shells/zsh/zshrc
@@ -45,7 +45,7 @@ ZSH_THEME="powerlevel9k/powerlevel9k"
# HIST_STAMPS="dd.mm.yyyy"
# Would you like to use another custom folder than $ZSH/custom?
-ZSH_CUSTOM=$HOME/.dotfiles/config/oh-my-zsh
+ZSH_CUSTOM=$HOME/.dotfiles/shells/zsh/oh-my-zsh
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
diff --git a/symlinks.sh b/symlinks.sh
new file mode 100644
index 00000000..37eb13c6
--- /dev/null
+++ b/symlinks.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/sh
+
+#ZSH
+ln -s ~/.dotfiles/shells/zsh/zprofile ~/.zprofile
+ln -s ~/.dotfiles/shells/zsh/zshrc ~/.zshrc
+ln -s ~/.dotfiles/shells/zsh/zshrc ~/.zshrc.pre-oh-my-zsh
+
+#bash
+ln -s ~/.dotfiles/shells/bash/bash_profile ~/.bash_profile
+ln -s ~/.dotfiles/shells/bash/bashrc ~/.bashrc
+
+#X
+ln -s ~/.dotfiles/x/xinitrc ~/.xinitrc
+
+#Git
+ln -s ~/.dotfiles/git/gitconfig ~/.gitconfig
+
+#i3
+mkdir -p ~/.config/i3
+ln -s ~/.dotfiles/i3/config ~/.config/i3/config
+
+#vim
+ln -s ~/.dotfiles/vim ~/.vim
+ln -s ~/.dotfiles/vim/.vimrc ~/.vimrc
+
+
diff --git a/config/vim b/vim
similarity index 100%
rename from config/vim
rename to vim
diff --git a/xinitrc b/x/xinitrc
similarity index 100%
rename from xinitrc
rename to x/xinitrc
diff --git a/xampp/extra/httpd-autoindex.conf b/xampp/extra/httpd-autoindex.conf
deleted file mode 100644
index a516aa8b..00000000
--- a/xampp/extra/httpd-autoindex.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Directives controlling the display of server-generated directory listings.
-#
-# Required modules: mod_authz_core, mod_authz_host,
-# mod_autoindex, mod_alias
-#
-# To see the listing of a directory, the Options directive for the
-# directory must include "Indexes", and the directory must not contain
-# a file matching those listed in the DirectoryIndex directive.
-#
-
-#
-# IndexOptions: Controls the appearance of server-generated directory
-# listings.
-#
-IndexOptions FancyIndexing HTMLTable VersionSort
-
-# We include the /icons/ alias for FancyIndexed directory listings. If
-# you do not use FancyIndexing, you may comment this out.
-#
-Alias /icons/ "/opt/lampp/icons/"
-
-
- Options Indexes MultiViews
- AllowOverride None
- Require all granted
-
-
-#
-# AddIcon* directives tell the server which icon to show for different
-# files or filename extensions. These are only displayed for
-# FancyIndexed directories.
-#
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
-
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif core
-
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
-
-#
-# DefaultIcon is which icon to show for files which do not have an icon
-# explicitly set.
-#
-DefaultIcon /icons/unknown.gif
-
-#
-# AddDescription allows you to place a short description after a file in
-# server-generated indexes. These are only displayed for FancyIndexed
-# directories.
-# Format: AddDescription "description" filename
-#
-#AddDescription "GZIP compressed document" .gz
-#AddDescription "tar archive" .tar
-#AddDescription "GZIP compressed tar archive" .tgz
-
-#
-# ReadmeName is the name of the README file the server will look for by
-# default, and append to directory listings.
-#
-# HeaderName is the name of a file which should be prepended to
-# directory indexes.
-ReadmeName README.html
-HeaderName HEADER.html
-
-#
-# IndexIgnore is a set of filenames which directory indexing should ignore
-# and not include in the listing. Shell-style wildcarding is permitted.
-#
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-
diff --git a/xampp/extra/httpd-dav.conf b/xampp/extra/httpd-dav.conf
deleted file mode 100644
index a2a56ee3..00000000
--- a/xampp/extra/httpd-dav.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Distributed authoring and versioning (WebDAV)
-#
-# Required modules: mod_alias, mod_auth_digest, mod_authn_core, mod_authn_file,
-# mod_authz_core, mod_authz_user, mod_dav, mod_dav_fs,
-# mod_setenvif
-
-# The following example gives DAV write access to a directory called
-# "uploads" under the ServerRoot directory.
-#
-# The User/Group specified in httpd.conf needs to have write permissions
-# on the directory where the DavLockDB is placed and on any directory where
-# "Dav On" is specified.
-
-DavLockDB "/opt/lampp/var/DavLock"
-
-Alias /uploads "/opt/lampp/uploads"
-
-
- Dav On
-
- AuthType Digest
- AuthName DAV-upload
- # You can use the htdigest program to create the password database:
- # htdigest -c "/opt/lampp/user.passwd" DAV-upload admin
- AuthUserFile "/opt/lampp/user.passwd"
- AuthDigestProvider file
-
- # Allow universal read-access, but writes are restricted
- # to the admin user.
-
- Require method GET POST OPTIONS
- Require user admin
-
-
-
-#
-# The following directives disable redirects on non-GET requests for
-# a directory that does not include the trailing slash. This fixes a
-# problem with several clients that do not appropriately handle
-# redirects for folders with DAV methods.
-#
-BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
-BrowserMatch "MS FrontPage" redirect-carefully
-BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[01234]" redirect-carefully
-BrowserMatch "^gnome-vfs/1.0" redirect-carefully
-BrowserMatch "^XML Spy" redirect-carefully
-BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-BrowserMatch " Konqueror/4" redirect-carefully
diff --git a/xampp/extra/httpd-default.conf b/xampp/extra/httpd-default.conf
deleted file mode 100644
index f1e7bc82..00000000
--- a/xampp/extra/httpd-default.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# This configuration file reflects default settings for Apache HTTP Server.
-#
-# You may change these, but chances are that you may not need to.
-#
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-#
-# UseCanonicalName: Determines how Apache constructs self-referencing
-# URLs and the SERVER_NAME and SERVER_PORT variables.
-# When set "Off", Apache will use the Hostname and Port supplied
-# by the client. When set "On", Apache will use the value of the
-# ServerName directive.
-#
-UseCanonicalName Off
-
-#
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives. See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# ServerTokens
-# This directive configures what you return as the Server HTTP response
-# Header. The default is 'Full' which sends information about the OS-Type
-# and compiled in modules.
-# Set to one of: Full | OS | Minor | Minimal | Major | Prod
-# where Full conveys the most information, and Prod the least.
-#
-ServerTokens Full
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (internal error documents, FTP directory
-# listings, mod_status and mod_info output etc., but not CGI generated
-# documents or custom error documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of: On | Off | EMail
-#
-ServerSignature Off
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-#
-# Set a timeout for how long the client may take to send the request header
-# and body.
-# The default for the headers is header=20-40,MinRate=500, which means wait
-# for the first byte of headers for 20 seconds. If some data arrives,
-# increase the timeout corresponding to a data rate of 500 bytes/s, but not
-# above 40 seconds.
-# The default for the request body is body=20,MinRate=500, which is the same
-# but has no upper limit for the timeout.
-# To disable, set to header=0 body=0
-#
-
- RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
-
diff --git a/xampp/extra/httpd-info.conf b/xampp/extra/httpd-info.conf
deleted file mode 100644
index 5cfdf69b..00000000
--- a/xampp/extra/httpd-info.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Get information about the requests being processed by the server
-# and the configuration of the server.
-#
-# Required modules: mod_authz_core, mod_authz_host,
-# mod_info (for the server-info handler),
-# mod_status (for the server-status handler)
-
-#
-# Allow server status reports generated by mod_status,
-# with the URL of http://servername/server-status
-# Change the ".example.com" to match your domain to enable.
-
-
- SetHandler server-status
- Require host .example.com
- Require ip 127
-
-
-#
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
-#
-#ExtendedStatus On
-
-#
-# Allow remote server configuration reports, with the URL of
-# http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".example.com" to match your domain to enable.
-#
-
- SetHandler server-info
- Require host .example.com
- Require ip 127
-
diff --git a/xampp/extra/httpd-languages.conf b/xampp/extra/httpd-languages.conf
deleted file mode 100644
index 7f664614..00000000
--- a/xampp/extra/httpd-languages.conf
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Settings for hosting different languages.
-#
-# Required modules: mod_mime, mod_negotiation
-
-# DefaultLanguage and AddLanguage allows you to specify the language of
-# a document. You can then use content negotiation to give a browser a
-# file in a language the user can understand.
-#
-# Specify a default language. This means that all data
-# going out without a specific language tag (see below) will
-# be marked with this one. You probably do NOT want to set
-# this unless you are sure it is correct for all cases.
-#
-# * It is generally better to not mark a page as
-# * being a certain language than marking it with the wrong
-# * language!
-#
-# DefaultLanguage nl
-#
-# Note 1: The suffix does not have to be the same as the language
-# keyword --- those with documents in Polish (whose net-standard
-# language code is pl) may wish to use "AddLanguage pl .po" to
-# avoid the ambiguity with the common suffix for perl scripts.
-#
-# Note 2: The example entries below illustrate that in some cases
-# the two character 'Language' abbreviation is not identical to
-# the two character 'Country' code for its country,
-# E.g. 'Danmark/dk' versus 'Danish/da'.
-#
-# Note 3: In the case of 'ltz' we violate the RFC by using a three char
-# specifier. There is 'work in progress' to fix this and get
-# the reference data for rfc1766 cleaned up.
-#
-# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
-# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
-# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
-# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
-# Norwegian (no) - Polish (pl) - Portugese (pt)
-# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
-# Turkish (tr) - Simplified Chinese (zh-CN) - Spanish (es)
-# Traditional Chinese (zh-TW)
-#
-AddLanguage ca .ca
-AddLanguage cs .cz .cs
-AddLanguage da .dk
-AddLanguage de .de
-AddLanguage el .el
-AddLanguage en .en
-AddLanguage eo .eo
-AddLanguage es .es
-AddLanguage et .et
-AddLanguage fr .fr
-AddLanguage he .he
-AddLanguage hr .hr
-AddLanguage it .it
-AddLanguage ja .ja
-AddLanguage ko .ko
-AddLanguage ltz .ltz
-AddLanguage nl .nl
-AddLanguage nn .nn
-AddLanguage no .no
-AddLanguage pl .po
-AddLanguage pt .pt
-AddLanguage pt-BR .pt-br
-AddLanguage ru .ru
-AddLanguage sv .sv
-AddLanguage tr .tr
-AddLanguage zh-CN .zh-cn
-AddLanguage zh-TW .zh-tw
-
-# LanguagePriority allows you to give precedence to some languages
-# in case of a tie during content negotiation.
-#
-# Just list the languages in decreasing order of preference. We have
-# more or less alphabetized them here. You probably want to change this.
-#
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv tr zh-CN zh-TW
-
-#
-# ForceLanguagePriority allows you to serve a result page rather than
-# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
-# [in case no accepted languages matched the available variants]
-#
-ForceLanguagePriority Prefer Fallback
-
-#
-# Commonly used filename extensions to character sets. You probably
-# want to avoid clashes with the language extensions, unless you
-# are good at carefully testing your setup after each change.
-# See http://www.iana.org/assignments/character-sets for the
-# official list of charset names and their respective RFCs.
-#
-AddCharset us-ascii.ascii .us-ascii
-AddCharset ISO-8859-1 .iso8859-1 .latin1
-AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen
-AddCharset ISO-8859-3 .iso8859-3 .latin3
-AddCharset ISO-8859-4 .iso8859-4 .latin4
-AddCharset ISO-8859-5 .iso8859-5 .cyr .iso-ru
-AddCharset ISO-8859-6 .iso8859-6 .arb .arabic
-AddCharset ISO-8859-7 .iso8859-7 .grk .greek
-AddCharset ISO-8859-8 .iso8859-8 .heb .hebrew
-AddCharset ISO-8859-9 .iso8859-9 .latin5 .trk
-AddCharset ISO-8859-10 .iso8859-10 .latin6
-AddCharset ISO-8859-13 .iso8859-13
-AddCharset ISO-8859-14 .iso8859-14 .latin8
-AddCharset ISO-8859-15 .iso8859-15 .latin9
-AddCharset ISO-8859-16 .iso8859-16 .latin10
-AddCharset ISO-2022-JP .iso2022-jp .jis
-AddCharset ISO-2022-KR .iso2022-kr .kis
-AddCharset ISO-2022-CN .iso2022-cn .cis
-AddCharset Big5.Big5 .big5 .b5
-AddCharset cn-Big5 .cn-big5
-# For russian, more than one charset is used (depends on client, mostly):
-AddCharset WINDOWS-1251 .cp-1251 .win-1251
-AddCharset CP866 .cp866
-AddCharset KOI8 .koi8
-AddCharset KOI8-E .koi8-e
-AddCharset KOI8-r .koi8-r .koi8-ru
-AddCharset KOI8-U .koi8-u
-AddCharset KOI8-ru .koi8-uk .ua
-AddCharset ISO-10646-UCS-2 .ucs2
-AddCharset ISO-10646-UCS-4 .ucs4
-AddCharset UTF-7 .utf7
-AddCharset UTF-8 .utf8
-AddCharset UTF-16 .utf16
-AddCharset UTF-16BE .utf16be
-AddCharset UTF-16LE .utf16le
-AddCharset UTF-32 .utf32
-AddCharset UTF-32BE .utf32be
-AddCharset UTF-32LE .utf32le
-AddCharset euc-cn .euc-cn
-AddCharset euc-gb .euc-gb
-AddCharset euc-jp .euc-jp
-AddCharset euc-kr .euc-kr
-#Not sure how euc-tw got in - IANA doesn't list it???
-AddCharset EUC-TW .euc-tw
-AddCharset gb2312 .gb2312 .gb
-AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
-AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
-AddCharset shift_jis .shift_jis .sjis
diff --git a/xampp/extra/httpd-manual.conf b/xampp/extra/httpd-manual.conf
deleted file mode 100644
index 985a59f1..00000000
--- a/xampp/extra/httpd-manual.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Provide access to the documentation on your server as
-# http://yourserver.example.com/manual/
-# The documentation is always available at
-# http://httpd.apache.org/docs/2.4/
-#
-# Required modules: mod_alias, mod_authz_core, mod_authz_host,
-# mod_setenvif, mod_negotiation
-#
-
-AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/opt/lampp/manual$1"
-
-
- Options Indexes
- AllowOverride None
- Require all granted
-
-
- SetHandler type-map
-
- # .tr is text/troff in mime.types!
-
- ForceType "text/html; charset=utf-8"
-
-
- AddLanguage da .da
-
- SetEnvIf Request_URI ^/manual/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)/ prefer-language=$1
- RedirectMatch 301 ^/manual(?:/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)){2,}(/.*)?$ /manual/$1$2
-
- LanguagePriority en da de es fr ja ko pt-br ru tr
- ForceLanguagePriority Prefer Fallback
-
diff --git a/xampp/extra/httpd-mpm.conf b/xampp/extra/httpd-mpm.conf
deleted file mode 100644
index 57b86acf..00000000
--- a/xampp/extra/httpd-mpm.conf
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Server-Pool Management (MPM specific)
-#
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-#
-# Note that this is the default PidFile for most MPMs.
-#
-
- PidFile "logs/httpd.pid"
-
-
-#
-# Only one of the below sections will be relevant on your
-# installed httpd. Use "apachectl -l" to find out the
-# active mpm.
-#
-
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxRequestWorkers: maximum number of server processes allowed to start
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-# before terminating
-
- StartServers 5
- MinSpareServers 5
- MaxSpareServers 10
- MaxRequestWorkers 150
- MaxConnectionsPerChild 0
-
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestWorkers: maximum number of worker threads
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-# before terminating
-
- StartServers 2
- MinSpareThreads 25
- MaxSpareThreads 75
- ThreadsPerChild 25
- MaxRequestWorkers 150
- MaxConnectionsPerChild 0
-
-
-# event MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestWorkers: maximum number of worker threads
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-# before terminating
-
- StartServers 2
- MinSpareThreads 25
- MaxSpareThreads 75
- ThreadsPerChild 25
- MaxRequestWorkers 150
- MaxConnectionsPerChild 0
-
-
-# NetWare MPM
-# ThreadStackSize: Stack size allocated for each worker thread
-# StartThreads: Number of worker threads launched at server startup
-# MinSpareThreads: Minimum number of idle threads, to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads
-# MaxThreads: Maximum number of worker threads alive at the same time
-# MaxConnectionsPerChild: Maximum number of connections a thread serves. It
-# is recommended that the default value of 0 be set
-# for this directive on NetWare. This will allow the
-# thread to continue to service requests indefinitely.
-
- ThreadStackSize 65536
- StartThreads 250
- MinSpareThreads 25
- MaxSpareThreads 250
- MaxThreads 1000
- MaxConnectionsPerChild 0
-
-
-# OS/2 MPM
-# StartServers: Number of server processes to maintain
-# MinSpareThreads: Minimum number of idle threads per process,
-# to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads per process
-# MaxConnectionsPerChild: Maximum number of connections per server process
-
- StartServers 2
- MinSpareThreads 5
- MaxSpareThreads 10
- MaxConnectionsPerChild 0
-
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-
- ThreadsPerChild 150
- MaxConnectionsPerChild 0
-
-
-# The maximum number of free Kbytes that every allocator is allowed
-# to hold without calling free(). In threaded MPMs, every thread has its own
-# allocator. When not set, or when set to zero, the threshold will be set to
-# unlimited.
-
- MaxMemFree 2048
-
-
- MaxMemFree 100
-
diff --git a/xampp/extra/httpd-multilang-errordoc.conf b/xampp/extra/httpd-multilang-errordoc.conf
deleted file mode 100644
index 32ac3287..00000000
--- a/xampp/extra/httpd-multilang-errordoc.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# The configuration below implements multi-language error documents through
-# content-negotiation.
-#
-# Required modules: mod_alias, mod_authz_core, mod_authz_host,
-# mod_include, mod_negotiation
-#
-# We use Alias to redirect any /error/HTTP_.html.var response to
-# our collection of by-error message multi-language collections. We use
-# includes to substitute the appropriate text.
-#
-# You can modify the messages' appearance without changing any of the
-# default HTTP_.html.var files by adding the line:
-#
-# Alias /error/include/ "/your/include/path/"
-#
-# which allows you to create your own set of files by starting with the
-# /opt/lampp/error/include/ files and copying them to /your/include/path/,
-# even on a per-VirtualHost basis. The default include files will display
-# your Apache version number and your ServerAdmin email address regardless
-# of the setting of ServerSignature.
-
-Alias /error/ "/opt/lampp/error/"
-
-
- AllowOverride None
- Options IncludesNoExec
- AddOutputFilter Includes html
- AddHandler type-map var
- Require all granted
- LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
- ForceLanguagePriority Prefer Fallback
-
-
-ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-ErrorDocument 410 /error/HTTP_GONE.html.var
-ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-
diff --git a/xampp/extra/httpd-ssl.conf b/xampp/extra/httpd-ssl.conf
deleted file mode 100644
index 2061e454..00000000
--- a/xampp/extra/httpd-ssl.conf
+++ /dev/null
@@ -1,244 +0,0 @@
-#
-# This is the Apache server configuration file providing SSL support.
-# It contains the configuration directives to instruct the server how to
-# serve pages over an https connection. For detailed information about these
-# directives see
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do. They're here only as hints or reminders. If you are unsure
-# consult the online docs. You have been warned.
-#
-# Required modules: mod_log_config, mod_setenvif, mod_ssl,
-# socache_shmcb_module (for default value of SSLSessionCache)
-
-#
-# Pseudo Random Number Generator (PRNG):
-# Configure one or more sources to seed the PRNG of the SSL library.
-# The seed data should be of good random quality.
-# WARNING! On some platforms /dev/random blocks if not enough entropy
-# is available. This means you then cannot use the /dev/random device
-# because it would lead to very long connection times (as long as
-# it requires to make more entropy available). But usually those
-# platforms additionally provide a /dev/urandom device which doesn't
-# block. So, if available, use this one instead. Read the mod_ssl User
-# Manual for more details.
-#
-#SSLRandomSeed startup file:/dev/random 512
-#SSLRandomSeed startup file:/dev/urandom 512
-#SSLRandomSeed connect file:/dev/random 512
-#SSLRandomSeed connect file:/dev/urandom 512
-
-
-#
-# When we also provide SSL we have to listen to the
-# standard HTTP port (see above) and to the HTTPS port
-#
-# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
-#
-Listen 443
-
-##
-## SSL Global Context
-##
-## All SSL configuration in this context applies both to
-## the main server and all SSL-enabled virtual hosts.
-##
-
-# SSL Cipher Suite:
-# List the ciphers that the client is permitted to negotiate.
-# See the mod_ssl documentation for a complete list.
-SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
-
-# Speed-optimized SSL Cipher configuration:
-# If speed is your main concern (on busy HTTPS servers e.g.),
-# you might want to force clients to specific, performance
-# optimized ciphers. In this case, prepend those ciphers
-# to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
-# Caveat: by giving precedence to RC4-SHA and AES128-SHA
-# (as in the example below), most connections will no longer
-# have perfect forward secrecy - if the server's key is
-# compromised, captures of past or future traffic must be
-# considered compromised, too.
-#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
-#SSLHonorCipherOrder on
-
-# Pass Phrase Dialog:
-# Configure the pass phrase gathering process.
-# The filtering dialog program (`builtin' is an internal
-# terminal dialog) has to provide the pass phrase on stdout.
-SSLPassPhraseDialog builtin
-
-# Inter-Process Session Cache:
-# Configure the SSL Session Cache: First the mechanism
-# to use and second the expiring timeout (in seconds).
-#SSLSessionCache "dbm:/opt/lampp/logs/ssl_scache"
-SSLSessionCache "shmcb:/opt/lampp/logs/ssl_scache(512000)"
-SSLSessionCacheTimeout 300
-
-##
-## SSL Virtual Host Context
-##
-
-
-
-# General setup for the virtual host
-DocumentRoot "/opt/lampp/htdocs"
-ServerName www.example.com:443
-ServerAdmin you@example.com
-ErrorLog "/opt/lampp/logs/error_log"
-TransferLog "/opt/lampp/logs/access_log"
-
-# SSL Engine Switch:
-# Enable/Disable SSL for this virtual host.
-SSLEngine on
-
-# Server Certificate:
-# Point SSLCertificateFile at a PEM encoded certificate. If
-# the certificate is encrypted, then you will be prompted for a
-# pass phrase. Note that a kill -HUP will prompt again. Keep
-# in mind that if you have both an RSA and a DSA certificate you
-# can configure both in parallel (to also allow the use of DSA
-# ciphers, etc.)
-# Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt)
-# require an ECC certificate which can also be configured in
-# parallel.
-SSLCertificateFile "/opt/lampp/etc/ssl.crt/server.crt"
-#SSLCertificateFile "/opt/lampp/etc/server-dsa.crt"
-#SSLCertificateFile "/opt/lampp/etc/server-ecc.crt"
-
-# Server Private Key:
-# If the key is not combined with the certificate, use this
-# directive to point at the key file. Keep in mind that if
-# you've both a RSA and a DSA private key you can configure
-# both in parallel (to also allow the use of DSA ciphers, etc.)
-# ECC keys, when in use, can also be configured in parallel
-SSLCertificateKeyFile "/opt/lampp/etc/ssl.key/server.key"
-#SSLCertificateKeyFile "/opt/lampp/etc/server-dsa.key"
-#SSLCertificateKeyFile "/opt/lampp/etc/server-ecc.key"
-
-# Server Certificate Chain:
-# Point SSLCertificateChainFile at a file containing the
-# concatenation of PEM encoded CA certificates which form the
-# certificate chain for the server certificate. Alternatively
-# the referenced file can be the same as SSLCertificateFile
-# when the CA certificates are directly appended to the server
-# certificate for convenience.
-#SSLCertificateChainFile "/opt/lampp/etc/server-ca.crt"
-
-# Certificate Authority (CA):
-# Set the CA certificate verification path where to find CA
-# certificates for client authentication or alternatively one
-# huge file containing all of them (file must be PEM encoded)
-# Note: Inside SSLCACertificatePath you need hash symlinks
-# to point to the certificate files. Use the provided
-# Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath "/opt/lampp/etc/ssl.crt"
-#SSLCACertificateFile "/opt/lampp/etc/ssl.crt/ca-bundle.crt"
-
-# Certificate Revocation Lists (CRL):
-# Set the CA revocation path where to find CA CRLs for client
-# authentication or alternatively one huge file containing all
-# of them (file must be PEM encoded).
-# The CRL checking mode needs to be configured explicitly
-# through SSLCARevocationCheck (defaults to "none" otherwise).
-# Note: Inside SSLCARevocationPath you need hash symlinks
-# to point to the certificate files. Use the provided
-# Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath "/opt/lampp/etc/ssl.crl"
-#SSLCARevocationFile "/opt/lampp/etc/ssl.crl/ca-bundle.crl"
-#SSLCARevocationCheck chain
-
-# Client Authentication (Type):
-# Client certificate verification type and depth. Types are
-# none, optional, require and optional_no_ca. Depth is a
-# number which specifies how deeply to verify the certificate
-# issuer chain before deciding the certificate is not valid.
-#SSLVerifyClient require
-#SSLVerifyDepth 10
-
-# Access Control:
-# With SSLRequire you can do per-directory access control based
-# on arbitrary complex boolean expressions containing server
-# variable checks and other lookup directives. The syntax is a
-# mixture between C and Perl. See the mod_ssl documentation
-# for more details.
-#
-#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
-# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
-#
-
-# SSL Engine Options:
-# Set various options for the SSL engine.
-# o FakeBasicAuth:
-# Translate the client X.509 into a Basic Authorisation. This means that
-# the standard Auth/DBMAuth methods can be used for access control. The
-# user name is the `one line' version of the client's X.509 certificate.
-# Note that no password is obtained from the user. Every entry in the user
-# file needs this password: `xxj31ZMTZzkVA'.
-# o ExportCertData:
-# This exports two additional environment variables: SSL_CLIENT_CERT and
-# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-# server (always existing) and the client (only existing when client
-# authentication is used). This can be used to import the certificates
-# into CGI scripts.
-# o StdEnvVars:
-# This exports the standard SSL/TLS related `SSL_*' environment variables.
-# Per default this exportation is switched off for performance reasons,
-# because the extraction step is an expensive operation and is usually
-# useless for serving static content. So one usually enables the
-# exportation for CGI and SSI requests only.
-# o StrictRequire:
-# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
-# under a "Satisfy any" situation, i.e. when it applies access is denied
-# and no other module can change it.
-# o OptRenegotiate:
-# This enables optimized SSL connection renegotiation handling when SSL
-# directives are used in per-directory context.
-#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
-# SSL Protocol Adjustments:
-# The safe and default but still SSL/TLS standard compliant shutdown
-# approach is that mod_ssl sends the close notify alert but doesn't wait for
-# the close notify alert from client. When you need a different shutdown
-# approach you can use one of the following variables:
-# o ssl-unclean-shutdown:
-# This forces an unclean shutdown when the connection is closed, i.e. no
-# SSL close notify alert is sent or allowed to be received. This violates
-# the SSL/TLS standard but is needed for some brain-dead browsers. Use
-# this when you receive I/O errors because of the standard approach where
-# mod_ssl sends the close notify alert.
-# o ssl-accurate-shutdown:
-# This forces an accurate shutdown when the connection is closed, i.e. a
-# SSL close notify alert is send and mod_ssl waits for the close notify
-# alert of the client. This is 100% SSL/TLS standard compliant, but in
-# practice often causes hanging connections with brain-dead browsers. Use
-# this only for browsers where you know that their SSL implementation
-# works correctly.
-# Notice: Most problems of broken clients are also related to the HTTP
-# keep-alive facility, so you usually additionally want to disable
-# keep-alive for those clients, too. Use variable "nokeepalive" for this.
-# Similarly, one has to force some clients to use HTTP/1.0 to workaround
-# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-# "force-response-1.0" for this.
-BrowserMatch "MSIE [2-5]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
-
-# Per-Server Logging:
-# The home of a custom SSL log file. Use this when you want a
-# compact non-error SSL logfile on a virtual host basis.
-CustomLog "/opt/lampp/logs/ssl_request_log" \
- "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-
diff --git a/xampp/extra/httpd-userdir.conf b/xampp/extra/httpd-userdir.conf
deleted file mode 100644
index 40de3b27..00000000
--- a/xampp/extra/httpd-userdir.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Settings for user home directories
-#
-# Required module: mod_authz_core, mod_authz_host, mod_userdir
-
-#
-# UserDir: The name of the directory that is appended onto a user's home
-# directory if a ~user request is received. Note that you must also set
-# the default access control for these directories, as in the example below.
-#
-#UserDir Sites
-
-#
-# Control access to UserDir directories. The following is an example
-# for a site where these directories are restricted to read-only.
-#
-
- AllowOverride FileInfo AuthConfig Limit Indexes
- Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
- Require method GET POST OPTIONS
-
-
diff --git a/xampp/extra/httpd-vhosts.conf b/xampp/extra/httpd-vhosts.conf
deleted file mode 100644
index 055bff1c..00000000
--- a/xampp/extra/httpd-vhosts.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Virtual Hosts
-#
-# Required modules: mod_log_config
-
-# If you want to maintain multiple domains/hostnames on your
-# machine you can setup VirtualHost containers for them. Most configurations
-# use only name-based virtual hosts so the server doesn't need to worry about
-# IP addresses. This is indicated by the asterisks in the directives below.
-#
-# Please see the documentation at
-#
-# for further details before you try to setup virtual hosts.
-#
-# You may use the command line option '-S' to verify your virtual host
-# configuration.
-
-#
-# VirtualHost example:
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for all requests that do not
-# match a ServerName or ServerAlias in any block.
-#
-
- ServerName test.local
- ServerAlias *.local
- VirtualDocumentRoot /home/jonathan/Sites/%-2/public_html
- CustomLog /home/jonathan/Sites/access.log vhost_combined
- ErrorLog /home/jonathan/Sites/error.log
-
-
diff --git a/xampp/extra/httpd-xampp.conf b/xampp/extra/httpd-xampp.conf
deleted file mode 100644
index 643f3a35..00000000
--- a/xampp/extra/httpd-xampp.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#LoadModule php4_module modules/libphp4.so
-#
-#
-#LoadModule php7_module modules/libphp7.so
-#
-
-# We will enable it by default
-#
- LoadModule php7_module modules/libphp7.so
-#
-
-LoadModule perl_module modules/mod_perl.so
-
-Alias /phpmyadmin "/opt/lampp/phpmyadmin"
-Alias /phpsqliteadmin "/opt/lampp/phpsqliteadmin"
-
-# since XAMPP 1.4.3
-
- AllowOverride AuthConfig Limit
- Require local
- ErrorDocument 403 /error/XAMPP_FORBIDDEN.html.var
-
-
-
- AllowOverride AuthConfig Limit
- Require local
- ErrorDocument 403 /error/XAMPP_FORBIDDEN.html.var
-
-
-# since LAMPP 1.0RC1
-AddType application/x-httpd-php .php .php3 .php4
-
-XBitHack on
-
-# since 0.9.8 we've mod_perl
-
- AddHandler perl-script .pl
- PerlHandler ModPerl::PerlRunPrefork
- PerlOptions +ParseHeaders
- PerlSendHeader On
-
-
-# demo for mod_perl responsehandler
-#PerlModule Apache::CurrentTime
-#
-# SetHandler modperl
-# PerlResponseHandler Apache::CurrentTime
-#
-
-# AcceptMutex sysvsem is default but on some systems we need this
-# thanks to jeff ort for this hint
-#AcceptMutex flock
-#LockFile /opt/lampp/logs/accept.lock
-
-# this makes mod_dbd happy - oswald, 02aug06
-# mod_dbd doesn't work in Apache 2.2.3: getting always heaps of "glibc detected *** corrupted double-linked list" on shutdown - oswald, 10sep06
-#DBDriver sqlite3
diff --git a/xampp/extra/proxy-html.conf b/xampp/extra/proxy-html.conf
deleted file mode 100644
index 683a0911..00000000
--- a/xampp/extra/proxy-html.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-# Configuration example.
-#
-# For detailed information about these directives see
-#
-# and for mod_xml2enc see
-#
-#
-# First, to load the module with its prerequisites. Note: mod_xml2enc
-# is not always necessary, but without it mod_proxy_html is likely to
-# mangle pages in encodings other than ASCII or Unicode (utf-8).
-#
-# For Unix-family systems:
-# LoadFile /usr/lib/libxml2.so
-# LoadModule proxy_html_module modules/mod_proxy_html.so
-# LoadModule xml2enc_module modules/mod_xml2enc.so
-#
-# For Windows (I don't know if there's a standard path for the libraries)
-# LoadFile C:/path/zlib.dll
-# LoadFile C:/path/iconv.dll
-# LoadFile C:/path/libxml2.dll
-# LoadModule proxy_html_module modules/mod_proxy_html.so
-# LoadModule xml2enc_module modules/mod_xml2enc.so
-#
-# All knowledge of HTML links has been removed from the mod_proxy_html
-# code itself, and is instead read from httpd.conf (or included file)
-# at server startup. So you MUST declare it. This will normally be
-# at top level, but can also be used in a .
-#
-# Here's the declaration for W3C HTML 4.01 and XHTML 1.0
-
-ProxyHTMLLinks a href
-ProxyHTMLLinks area href
-ProxyHTMLLinks link href
-ProxyHTMLLinks img src longdesc usemap
-ProxyHTMLLinks object classid codebase data usemap
-ProxyHTMLLinks q cite
-ProxyHTMLLinks blockquote cite
-ProxyHTMLLinks ins cite
-ProxyHTMLLinks del cite
-ProxyHTMLLinks form action
-ProxyHTMLLinks input src usemap
-ProxyHTMLLinks head profile
-ProxyHTMLLinks base href
-ProxyHTMLLinks script src for
-
-# To support scripting events (with ProxyHTMLExtended On),
-# you'll need to declare them too.
-
-ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
- onmouseover onmousemove onmouseout onkeypress \
- onkeydown onkeyup onfocus onblur onload \
- onunload onsubmit onreset onselect onchange
-
-# If you need to support legacy (pre-1998, aka "transitional") HTML or XHTML,
-# you'll need to uncomment the following deprecated link attributes.
-# Note that these are enabled in earlier mod_proxy_html versions
-#
-# ProxyHTMLLinks frame src longdesc
-# ProxyHTMLLinks iframe src longdesc
-# ProxyHTMLLinks body background
-# ProxyHTMLLinks applet codebase
-#
-# If you're dealing with proprietary HTML variants,
-# declare your own URL attributes here as required.
-#
-# ProxyHTMLLinks myelement myattr otherattr
-#
-###########
-# EXAMPLE #
-###########
-#
-# To define the URL /my-gateway/ as a gateway to an appserver with address
-# http://some.app.intranet/ on a private network, after loading the
-# modules and including this configuration file:
-#
-# ProxyRequests Off <-- this is an important security setting
-# ProxyPass /my-gateway/ http://some.app.intranet/
-#
-# ProxyPassReverse /
-# ProxyHTMLEnable On
-# ProxyHTMLURLMap http://some.app.intranet/ /my-gateway/
-# ProxyHTMLURLMap / /my-gateway/
-#
-#
-# Many (though not all) real-life setups are more complex.
-#
-# See the documentation at
-# http://apache.webthing.com/mod_proxy_html/
-# and the tutorial at
-# http://www.apachetutor.org/admin/reverseproxies
diff --git a/xampp/httpd.conf b/xampp/httpd.conf
deleted file mode 100644
index 1de4648b..00000000
--- a/xampp/httpd.conf
+++ /dev/null
@@ -1,525 +0,0 @@
-#
-# This is the main Apache HTTP server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See for detailed information.
-# In particular, see
-#
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do. They're here only as hints or reminders. If you are unsure
-# consult the online docs. You have been warned.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so 'log/access_log'
-# with ServerRoot set to '/www' will be interpreted by the
-# server as '/www/log/access_log', where as '/log/access_log' will be
-# interpreted as '/log/access_log'.
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path. If you point
-# ServerRoot at a non-local disk, be sure to specify a local disk on the
-# Mutex directive, if file-based mutexes are used. If you wish to share the
-# same ServerRoot for multiple httpd daemons, you will need to change at
-# least PidFile.
-#
-ServerRoot "/opt/lampp"
-
-#
-# Mutex: Allows you to set the mutex mechanism and mutex file directory
-# for individual mutexes, or change the global defaults
-#
-# Uncomment and change the directory if mutexes are file-based and the default
-# mutex file directory is not on a local disk or is not appropriate for some
-# other reason.
-#
-# Mutex default:logs
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbd_module modules/mod_authn_dbd.so
-LoadModule authn_socache_module modules/mod_authn_socache.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authz_dbd_module modules/mod_authz_dbd.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule auth_form_module modules/mod_auth_form.so
-LoadModule auth_digest_module modules/mod_auth_digest.so
-LoadModule allowmethods_module modules/mod_allowmethods.so
-LoadModule file_cache_module modules/mod_file_cache.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule cache_disk_module modules/mod_cache_disk.so
-LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
-LoadModule socache_dbm_module modules/mod_socache_dbm.so
-LoadModule socache_memcache_module modules/mod_socache_memcache.so
-LoadModule dbd_module modules/mod_dbd.so
-LoadModule bucketeer_module modules/mod_bucketeer.so
-LoadModule dumpio_module modules/mod_dumpio.so
-LoadModule echo_module modules/mod_echo.so
-LoadModule case_filter_module modules/mod_case_filter.so
-LoadModule case_filter_in_module modules/mod_case_filter_in.so
-LoadModule buffer_module modules/mod_buffer.so
-LoadModule ratelimit_module modules/mod_ratelimit.so
-LoadModule reqtimeout_module modules/mod_reqtimeout.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule request_module modules/mod_request.so
-LoadModule include_module modules/mod_include.so
-LoadModule filter_module modules/mod_filter.so
-LoadModule substitute_module modules/mod_substitute.so
-LoadModule sed_module modules/mod_sed.so
-LoadModule charset_lite_module modules/mod_charset_lite.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule ldap_module modules/mod_ldap.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule log_debug_module modules/mod_log_debug.so
-LoadModule logio_module modules/mod_logio.so
-LoadModule env_module modules/mod_env.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule cern_meta_module modules/mod_cern_meta.so
-LoadModule expires_module modules/mod_expires.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule usertrack_module modules/mod_usertrack.so
-LoadModule unique_id_module modules/mod_unique_id.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule remoteip_module modules/mod_remoteip.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
-LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
-LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-LoadModule proxy_express_module modules/mod_proxy_express.so
-LoadModule session_module modules/mod_session.so
-LoadModule session_cookie_module modules/mod_session_cookie.so
-LoadModule session_dbd_module modules/mod_session_dbd.so
-LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
-LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
-LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
-LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule status_module modules/mod_status.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule info_module modules/mod_info.so
-LoadModule suexec_module modules/mod_suexec.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule cgid_module modules/mod_cgid.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule actions_module modules/mod_actions.so
-LoadModule speling_module modules/mod_speling.so
-LoadModule userdir_module modules/mod_userdir.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-
-LoadModule php4_module modules/libphp4.so
-LoadModule php5_module modules/libphp5.so
-
-
-
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User http
-Group http
-
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# definition. These values also provide defaults for
-# any containers you may define later in the file.
-#
-# All of these directives may appear inside containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed. This address appears on some server-generated pages, such
-# as error documents. e.g. admin@your-domain.com
-#
-ServerAdmin you@example.com
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:@@Port@@
-# XAMPP
-ServerName localhost
-
-#
-# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other
-# blocks below.
-#
-
- AllowOverride none
- Require all denied
-
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/opt/lampp/htdocs"
-
- #
- # Possible values for the Options directive are "None", "All",
- # or any combination of:
- # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
- #
- # Note that "MultiViews" must be named *explicitly* --- "Options All"
- # doesn't give it to you.
- #
- # The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs/trunk/mod/core.html#options
- # for more information.
- #
- #Options Indexes FollowSymLinks
- # XAMPP
- Options Indexes FollowSymLinks ExecCGI Includes
-
- #
- # AllowOverride controls what directives may be placed in .htaccess files.
- # It can be "All", "None", or any combination of the keywords:
- # Options FileInfo AuthConfig Limit
- #
- #AllowOverride None
- # since XAMPP 1.4:
- AllowOverride All
-
- #
- # Controls who can get stuff from this server.
- #
- Require all granted
-
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-
- #DirectoryIndex index.html
- # XAMPP
- DirectoryIndex index.html index.html.var index.php index.php3 index.php4
-
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-
- Require all denied
-
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a
-# container, error messages relating to that virtual host will be
-# logged here. If you *do* define an error logfile for a
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "logs/error_log"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-
- #
- # The following directives define some format nicknames for use with
- # a CustomLog directive (see below).
- #
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
-
- # You need to enable mod_logio.c to use %I and %O
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-
-
- #
- # The location and format of the access logfile (Common Logfile Format).
- # If you do not define any access logfiles within a
- # container, they will be logged here. Contrariwise, if you *do*
- # define per- access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
- CustomLog "logs/access_log" common
-
- #
- # If you prefer a logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
- #CustomLog "logs/access_log" combined
-
-
-
- #
- # Redirect: Allows you to tell clients about documents that used to
- # exist in your server's namespace, but do not anymore. The client
- # will make a new request for the document at its new location.
- # Example:
- # Redirect permanent /foo http://www.example.com/bar
-
- #
- # Alias: Maps web paths into filesystem paths and is used to
- # access content that does not live under the DocumentRoot.
- # Example:
- # Alias /webpath /full/filesystem/path
- #
- # If you include a trailing / on /webpath then the server will
- # require it to be present in the URL. You will also likely
- # need to provide a section to allow access to
- # the filesystem path.
-
- #
- # ScriptAlias: This controls which directories contain server scripts.
- # ScriptAliases are essentially the same as Aliases, except that
- # documents in the target directory are treated as applications and
- # run by the server when requested rather than as documents sent to the
- # client. The same rules about trailing "/" apply to ScriptAlias
- # directives as to Alias.
- #
- ScriptAlias /cgi-bin/ "/opt/lampp/cgi-bin/"
-
- Alias /Sites /home/jonathan/Sites
-
-
-
- #
- # ScriptSock: On threaded servers, designate the path to the UNIX
- # socket used to communicate with the CGI daemon of mod_cgid.
- #
- #Scriptsock logs/cgisock
-
-
-#
-# "/opt/lampp/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-
- AllowOverride None
- Options None
- Require all granted
-
-
-
- #
- # TypesConfig points to the file containing the list of mappings from
- # filename extension to MIME-type.
- #
- TypesConfig etc/mime.types
-
- #
- # AddType allows you to add to or override the MIME configuration
- # file specified in TypesConfig for specific file types.
- #
- #AddType application/x-gzip .tgz
- #
- # AddEncoding allows you to have certain browsers uncompress
- # information on the fly. Note: Not all browsers support this.
- #
- #AddEncoding x-compress .Z
- #AddEncoding x-gzip .gz .tgz
- #
- # If the AddEncoding directives above are commented-out, then you
- # probably should define those extensions to indicate media types:
- #
- AddType application/x-compress .Z
- AddType application/x-gzip .gz .tgz
-
- #
- # AddHandler allows you to map certain file extensions to "handlers":
- # actions unrelated to filetype. These can be either built into the server
- # or added with the Action directive (see below)
- #
- # To use CGI scripts outside of ScriptAliased directories:
- # (You will also need to add "ExecCGI" to the "Options" directive.)
- #
- #AddHandler cgi-script .cgi
- # XAMPP, since LAMPP 0.9.8:
- AddHandler cgi-script .cgi .pl
-
- # For type maps (negotiated resources):
- #AddHandler type-map var
-
- #
- # Filters allow you to process content before it is sent to the client.
- #
- # To parse .shtml files for server-side includes (SSI):
- # (You will also need to add "Includes" to the "Options" directive.)
- #
- # XAMPP
- AddType text/html .shtml
- AddOutputFilter INCLUDES .shtml
-
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type. The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-#MIMEMagicFile etc/magic
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# MaxRanges: Maximum number of Ranges in a request before
-# returning the entire resource, or one of the special
-# values 'default', 'none' or 'unlimited'.
-# Default setting is to accept 200 Ranges.
-#MaxRanges unlimited
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it,
-# memory-mapping or the sendfile syscall may be used to deliver
-# files. This usually improves server performance, but must
-# be turned off when serving from networked-mounted
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-# Defaults: EnableMMAP On, EnableSendfile Off
-#
-EnableMMAP off
-EnableSendfile off
-
-# Supplemental configuration
-#
-# The configuration files in the etc/extra/ directory can be
-# included to add extra features or to modify the default configuration of
-# the server, or you may simply copy their contents here and change as
-# necessary.
-
-# Server-pool management (MPM specific)
-#Include etc/extra/httpd-mpm.conf
-
-# Multi-language error messages
-Include etc/extra/httpd-multilang-errordoc.conf
-
-# Fancy directory listings
-Include etc/extra/httpd-autoindex.conf
-
-# Language settings
-#Include etc/extra/httpd-languages.conf
-
-# User home directories
-Include etc/extra/httpd-userdir.conf
-
-# Real-time info on requests and configuration
-#Include etc/extra/httpd-info.conf
-
-# Virtual hosts
-Include etc/extra/httpd-vhosts.conf
-
-# Local access to the Apache HTTP Server Manual
-#Include etc/extra/httpd-manual.conf
-
-# Distributed authoring and versioning (WebDAV)
-#Include etc/extra/httpd-dav.conf
-
-# Various default settings
-Include etc/extra/httpd-default.conf
-
-# Configure mod_proxy_html to understand HTML4/XHTML1
-
-Include etc/extra/proxy-html.conf
-
-
-# Secure (SSL/TLS) connections
-
-# XAMPP
-
-Include etc/extra/httpd-ssl.conf
-
-
-#
-# Note: The following must must be present to support
-# starting without SSL on platforms with no /dev/random equivalent
-# but a statically compiled-in mod_ssl.
-#
-
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-
-
-# XAMPP
-Include etc/extra/httpd-xampp.conf
-Include "/opt/lampp/apache2/conf/httpd.conf"
-