diff --git a/README.md b/README.md
index b092ffe..ccd399e 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,5 @@ Furry Octo Sansa
Some configuration files:
-* blink(1) files suitable for the Blink1Control app in Windows
-* Jenkins server
-* Default varnish config
* Default vim config
-* Default postfix config (does this work?)
\ No newline at end of file
+* A handy example Uptime Robot heartbeat script
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/App.config b/blink1/OutlookNewMail/OutlookNewMail/App.config
deleted file mode 100644
index 8e15646..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.csproj b/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.csproj
deleted file mode 100644
index 748a3ad..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {C43F0F6F-9DF2-4698-9493-354CE1ED71BC}
- Exe
- Properties
- OutlookNewMail
- OutlookNewMail
- v4.5
- 512
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.sln b/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.sln
deleted file mode 100644
index 119fb1f..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutlookNewMail", "OutlookNewMail.csproj", "{C43F0F6F-9DF2-4698-9493-354CE1ED71BC}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C43F0F6F-9DF2-4698-9493-354CE1ED71BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C43F0F6F-9DF2-4698-9493-354CE1ED71BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C43F0F6F-9DF2-4698-9493-354CE1ED71BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C43F0F6F-9DF2-4698-9493-354CE1ED71BC}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.v12.suo b/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.v12.suo
deleted file mode 100644
index d0b1d86..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/OutlookNewMail.v12.suo and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/Program.cs b/blink1/OutlookNewMail/OutlookNewMail/Program.cs
deleted file mode 100644
index 92d9f0e..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/Program.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Office.Interop.Outlook;
-using System.Runtime.InteropServices;
-
-namespace OutlookNewMail
-{
- class Program
- {
- static void Main(string[] args)
- {
- Application outlookApp;
- System.Diagnostics.Process[] processes = System.Diagnostics.Process.GetProcessesByName("OUTLOOK");
- if (processes.Length > 0)
- {
- outlookApp = Marshal.GetActiveObject("Outlook.Application") as Application;
- }
- else
- {
- outlookApp = new Application();
- }
- var inbox = outlookApp.GetNamespace("mapi").GetDefaultFolder(OlDefaultFolders.olFolderInbox);
-
- if (inbox.UnReadItemCount == 0)
- {
- Console.Out.Write("\"#000000\"");
- return;
- }
-
- Console.Out.Write("\"pattern: \"NewMail\"\"");
- }
- }
-}
diff --git a/blink1/OutlookNewMail/OutlookNewMail/Properties/AssemblyInfo.cs b/blink1/OutlookNewMail/OutlookNewMail/Properties/AssemblyInfo.cs
deleted file mode 100644
index a8d2488..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OutlookNewMail")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("OutlookNewMail")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7ff13c81-e91d-4227-8660-38e91c6ccbbe")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe
deleted file mode 100644
index 4d0df43..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe.config b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe.config
deleted file mode 100644
index 8e15646..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.pdb b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.pdb
deleted file mode 100644
index 03a6753..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.pdb and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe
deleted file mode 100644
index c0dfecc..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.config b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.config
deleted file mode 100644
index 8e15646..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.manifest b/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Debug/OutlookNewMail.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe
deleted file mode 100644
index ab3fef7..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe.config b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe.config
deleted file mode 100644
index 8e15646..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.pdb b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.pdb
deleted file mode 100644
index 85de5af..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.pdb and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe
deleted file mode 100644
index c0dfecc..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.config b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.config
deleted file mode 100644
index 8e15646..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.manifest b/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/bin/Release/OutlookNewMail.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index b16890e..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csproj.FileListAbsolute.txt b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5301761..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Debug\OutlookNewMail.exe.config
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Debug\OutlookNewMail.exe
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Debug\OutlookNewMail.pdb
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\obj\Debug\OutlookNewMail.csprojResolveAssemblyReference.cache
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\obj\Debug\OutlookNewMail.exe
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\obj\Debug\OutlookNewMail.pdb
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csprojResolveAssemblyReference.cache b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csprojResolveAssemblyReference.cache
deleted file mode 100644
index efc21ac..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.csprojResolveAssemblyReference.cache and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.exe b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.exe
deleted file mode 100644
index 4d0df43..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.pdb b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.pdb
deleted file mode 100644
index 03a6753..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/OutlookNewMail.pdb and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index d18292f..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.csproj.FileListAbsolute.txt b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5cce861..0000000
--- a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Release\OutlookNewMail.exe.config
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Release\OutlookNewMail.exe
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\bin\Release\OutlookNewMail.pdb
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\obj\Release\OutlookNewMail.exe
-D:\GitHub\furry-octo-sansa\blink1\OutlookNewMail\OutlookNewMail\obj\Release\OutlookNewMail.pdb
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.exe b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.exe
deleted file mode 100644
index ab3fef7..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.exe and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.pdb b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.pdb
deleted file mode 100644
index 85de5af..0000000
Binary files a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/OutlookNewMail.pdb and /dev/null differ
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/blink1/OutlookNewMail/OutlookNewMail/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/blink1/user.config b/blink1/user.config
deleted file mode 100644
index 9b3672b..0000000
--- a/blink1/user.config
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
- {
- "New Comic": {
- "iname": "New Comic",
- "pname": "New Comic",
- "type": "ifttt",
- "arg1": "GR: New Comic",
- "lastVal": "[couldn't connect]",
- "possibleVals": [],
- "lastTime": "1386700363"
- },
- "New Dev Article": {
- "iname": "New Dev Article",
- "pname": "New Dev Article",
- "type": "ifttt",
- "arg1": "GR:New Dev Item",
- "lastVal": "[couldn't connect]",
- "possibleVals": [],
- "lastTime": "1386700363"
- },
- "NewMail": {
- "iname": "NewMail",
- "pname": "NewMail",
- "type": "script",
- "arg1": "C:\\Users\\maweir\\Documents\\blink1-scripts\\OutlookNewMail.exe",
- "lastVal": "NewMail",
- "possibleVals": [],
- "lastTime": "1386700363"
- },
- "FPG New Mail": {
- "iname": "FPG New Mail",
- "pname": "FPG New Mail",
- "type": "ifttt",
- "arg1": "FPGNewMail",
- "lastVal": "[couldn't connect]",
- "possibleVals": [],
- "lastTime": "1386700363"
- }
-}
-
-
- {
- "New Comic": {
- "name": "New Comic",
- "repeats": 1,
- "playcount": 0,
- "playpos": 0,
- "playing": false,
- "pattern": "1,#D3FFBE,30.00"
- },
- "New Dev Article": {
- "name": "New Dev Article",
- "repeats": 1,
- "playcount": 0,
- "playpos": 0,
- "playing": false,
- "pattern": "1,#3CFF1D,30.00"
- },
- "NewMail": {
- "name": "NewMail",
- "repeats": 3,
- "playcount": 0,
- "playpos": 0,
- "playing": false,
- "pattern": "3,#FF7B8B,1.00,#000000,0.50,#EB60FF,1.00,#000000,0.50"
- },
- "FPG New Mail": {
- "name": "FPG New Mail",
- "repeats": 10,
- "playcount": 0,
- "playpos": 0,
- "playing": false,
- "pattern": "10,#20DBFF,2.00,#EEEEEE,0.50,#1FE0FF,2.00,#EEEEEE,0.50"
- }
-}
-
-
- True
-
-
- 1A0012FA
-
-
- False
-
-
-
-
\ No newline at end of file
diff --git a/install-prefs.sh b/install-prefs.sh
new file mode 100644
index 0000000..8096729
--- /dev/null
+++ b/install-prefs.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+# link all files to the home directory, asking about overwrites
+cd `dirname $0`
+SCRIPT_DIR=`pwd`
+
+cd $HOME
+ln --symbolic --interactive $SCRIPT_DIR/vim/.vimrc
diff --git a/jenkins/default-vhost b/jenkins/default-vhost
deleted file mode 100644
index 2fdac07..0000000
--- a/jenkins/default-vhost
+++ /dev/null
@@ -1,42 +0,0 @@
-
- ServerAdmin webmaster@localhost
- ServerName irrsinn.net
-
- DocumentRoot /var/www
-
- Options FollowSymLinks
- AllowOverride None
-
-
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
-
-
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-
- AllowOverride None
- Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
-
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-Alias /doc/ "/usr/share/doc/"
-
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
- Allow from 127.0.0.0/255.0.0.0 ::1/128
-
-
-
\ No newline at end of file
diff --git a/jenkins/default.vcl b/jenkins/default.vcl
deleted file mode 100644
index 2e0ee89..0000000
--- a/jenkins/default.vcl
+++ /dev/null
@@ -1 +0,0 @@
-include "/etc/varnish/projects.irrsinn.net.vcl";
\ No newline at end of file
diff --git a/jenkins/fabfile.py b/jenkins/fabfile.py
deleted file mode 100644
index 464f9bc..0000000
--- a/jenkins/fabfile.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from __future__ import with_statement
-from fabric.api import settings, abort, run, cd, env, put
-
-env.hosts = ['projects.irrsinn.net']
-env.user = 'root'
-
-def apache_config():
- with cd('/etc/apache2/sites-available'):
- put('projects.irrsinn.net-vhost', 'projects.irrsinn.net')
- put('default-vhost', 'default')
- run('apache2ctl -k restart')
-
-def base_installs():
- run('apt-get update')
- run('apt-get install -y tomcat7 default-jdk git gitweb vim nano php5 libapache2-mod-php5 php5-mcrypt varnish')
-
-def deploy_clean_jenkins():
- run('wget http://mirrors.jenkins-ci.org/war/latest/jenkins.war')
- run('cp jenkins.war /var/lib/tomcat7/webapps')
- run('chmod -R 0777 /usr/share/tomcat7')
-
-def gitlist_install():
- run('mkdir -r /var/www/projects.irrsinn.net/git')
- run('mkdir /root/repositories')
-
- with cd('/root/repositories'):
- #Get repos somehow
- run('chmod -R 0755 .')
-
- with cd('/var/www/projects.irrsinn.net/git'):
- run('chmod -R 0755 .')
- run('mkdir cache')
- run('chmod 0777 cache')
- put('gitlist-config.ini', 'config.ini', mode=0755)
-
- run('apache2ctl -k restart')
-
-def projects_install():
- gitlist_install()
- apache_config()
- varnish_config()
-
-def setup_server():
- base_installs()
- tomcat_install()
- projects_install()
-
-def tomcat_install():
- run('/etc/init.d/tomcat7 start')
-
-def varnish_config():
- with cd('/etc/varnish'):
- put('projects.irrsinn.net.vcl', 'projects.irrsinn.net.vcl', mode=0755)
- put('default.vcl', 'default.vcl', mode=0755)
- run('pkill varnishd', warn_only=True)
- run('apache2ctl -k restart')
- run('service varnish restart')
- run('varnishd -f /etc/varnish/default.vcl -s malloc,256M -a :80')
\ No newline at end of file
diff --git a/jenkins/gitlist-config.ini b/jenkins/gitlist-config.ini
deleted file mode 100644
index 3b3d152..0000000
--- a/jenkins/gitlist-config.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[git]
-client = '/usr/bin/git' ; Your git executable path
-repositories = '/root/repositories/' ; Path to your repositories (with ending slash)
-
-[app]
-baseurl = 'http://projects.irrsinn.net/git' ; Base URL of the application (without ending slash)
diff --git a/jenkins/jslint-files-to-exclude.txt b/jenkins/jslint-files-to-exclude.txt
deleted file mode 100644
index 77e0002..0000000
--- a/jenkins/jslint-files-to-exclude.txt
+++ /dev/null
@@ -1 +0,0 @@
-**/jasmine*.js,**/jquery*.js,**/angular*.js,**/bootstrap*.js,**/build/**/*.js,**/libs/**/*.js,**/publish/public/js/*.js,**/site/js/plugins.js
\ No newline at end of file
diff --git a/jenkins/projects.irrsinn.net-vhost b/jenkins/projects.irrsinn.net-vhost
deleted file mode 100644
index 7f70700..0000000
--- a/jenkins/projects.irrsinn.net-vhost
+++ /dev/null
@@ -1,22 +0,0 @@
-
- ServerAdmin averymd@irrsinn.net
-
- ServerName projects.irrsinn.net
- DocumentRoot /var/www/projects.irrsinn.net
-
-
- Options Indexes FollowSymLinks MultiViews
- AllowOverride All
- Order allow,deny
- allow from all
-
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-
\ No newline at end of file
diff --git a/jenkins/projects.irrsinn.net.vcl b/jenkins/projects.irrsinn.net.vcl
deleted file mode 100644
index 80909b7..0000000
--- a/jenkins/projects.irrsinn.net.vcl
+++ /dev/null
@@ -1,28 +0,0 @@
-backend jenkins {
- .host = "projects.irrsinn.net";
- .port = "8080";
- .connect_timeout = 300s;
- .first_byte_timeout = 120s;
- .between_bytes_timeout = 300s;
- .max_connections = 800;
-}
-
-backend git {
- .host = "projects.irrsinn.net";
- .port = "8088";
- .connect_timeout = 300s;
- .first_byte_timeout = 120s;
- .between_bytes_timeout = 300s;
- .max_connections = 800;
-}
-
-sub vcl_recv {
-
- if ((req.http.host ~ "projects.irrsinn.net") && (req.url ~ "jenkins"))
- {
- set req.backend = jenkins;
- } else {
- set req.backend = git;
- }
- return (pass);
-}
diff --git a/jenkins/pyflakes.sh b/jenkins/pyflakes.sh
deleted file mode 100644
index 977b827..0000000
--- a/jenkins/pyflakes.sh
+++ /dev/null
@@ -1 +0,0 @@
-find . -name '*.py'|egrep -v '^./tests/|^./build/'|xargs pyflakes > pyflakes.log || :
\ No newline at end of file
diff --git a/jenkins/pylint.sh b/jenkins/pylint.sh
deleted file mode 100644
index 5a7df10..0000000
--- a/jenkins/pylint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-rm -f pylint.log
-for f in `find . -name '*.py'|egrep -v '^./tests/|^./build/'`; do
-pylint --output-format=parseable --disable=W0311,W0403,W0232,E1101 --generated-members=objects,content,status_code --reports=y $f >> pylint.log
-done || :
\ No newline at end of file
diff --git a/jenkins/sloccount.sh b/jenkins/sloccount.sh
deleted file mode 100644
index 025dc12..0000000
--- a/jenkins/sloccount.sh
+++ /dev/null
@@ -1 +0,0 @@
-sloccount --duplicates --wide --details . | fgrep -v build > sloccount.sc || :
\ No newline at end of file
diff --git a/postfix/postfix.main.cf b/postfix/postfix.main.cf
deleted file mode 100644
index 8ab6056..0000000
--- a/postfix/postfix.main.cf
+++ /dev/null
@@ -1,40 +0,0 @@
-daemon_directory = /usr/lib/postfix
-
-#myorigin = local.irrsinn.net
-mydomain = local.irrsinn.net
-myhostname = irrsinn.net
-
-smtp_generic_maps = hash:/etc/postfix/generic
-header_checks = regexp:/etc/postfix/header_checks
-
-# appending .domain is the MUA's job.
-append_dot_mydomain = no
-
-# TLS parameters
-#smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-#smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-#smtpd_use_tls=yes
-#smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
-smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
-smtp_tls_security_level = may
-
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-mydestination = solitare, localhost.localdomain, , localhost
-relayhost = smtp.gmail.com:587
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
-mailbox_size_limit = 0
-recipient_delimiter = +
-inet_interfaces = all
-smtp_sasl_auth_enable = yes
-smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
-smtp_sasl_security_options =
-
-soft_bounce = yes
-
-disable_dns_lookups = yes
-
-message_size_limit = 35651584
-
-smtp_destination_rate_delay = 60
-relay_destination_rate_delay = 60
diff --git a/vagrant_linux_dev_env/.vagrant/machines/default/virtualbox/id b/vagrant_linux_dev_env/.vagrant/machines/default/virtualbox/id
deleted file mode 100644
index dd69a00..0000000
--- a/vagrant_linux_dev_env/.vagrant/machines/default/virtualbox/id
+++ /dev/null
@@ -1 +0,0 @@
-a5091bb7-b1c4-4279-8c61-166b7ecebd18
\ No newline at end of file
diff --git a/vagrant_linux_dev_env/Vagrantfile b/vagrant_linux_dev_env/Vagrantfile
deleted file mode 100644
index 3b0eeda..0000000
--- a/vagrant_linux_dev_env/Vagrantfile
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
- # All Vagrant configuration is done here. The most common configuration
- # options are documented and commented below. For a complete reference,
- # please see the online documentation at vagrantup.com.
-
- # Every Vagrant virtual environment requires a box to build off of.
- config.vm.box = "precise32"
- config.vm.provision :shell, :path => "bootstrap.sh"
- config.vm.network :forwarded_port, host: 8080, guest: 80
-
- # The url from where the 'config.vm.box' box will be fetched if it
- # doesn't already exist on the user's system.
- # config.vm.box_url = "http://domain.com/path/to/above.box"
-
- # Create a forwarded port mapping which allows access to a specific port
- # within the machine from a port on the host machine. In the example below,
- # accessing "localhost:8080" will access port 80 on the guest machine.
- # config.vm.network :forwarded_port, guest: 80, host: 8080
-
- # Create a private network, which allows host-only access to the machine
- # using a specific IP.
- # config.vm.network :private_network, ip: "192.168.33.10"
-
- # Create a public network, which generally matched to bridged network.
- # Bridged networks make the machine appear as another physical device on
- # your network.
- # config.vm.network :public_network
-
- # Share an additional folder to the guest VM. The first argument is
- # the path on the host to the actual folder. The second argument is
- # the path on the guest to mount the folder. And the optional third
- # argument is a set of non-required options.
- # config.vm.synced_folder "../data", "/vagrant_data"
-
- # Provider-specific configuration so you can fine-tune various
- # backing providers for Vagrant. These expose provider-specific options.
- # Example for VirtualBox:
- #
- # config.vm.provider :virtualbox do |vb|
- # # Don't boot with headless mode
- # vb.gui = true
- #
- # # Use VBoxManage to customize the VM. For example to change memory:
- # vb.customize ["modifyvm", :id, "--memory", "1024"]
- # end
- #
- # View the documentation for the provider you're using for more
- # information on available options.
-
- # Enable provisioning with Puppet stand alone. Puppet manifests
- # are contained in a directory path relative to this Vagrantfile.
- # You will need to create the manifests directory and a manifest in
- # the file base.pp in the manifests_path directory.
- #
- # An example Puppet manifest to provision the message of the day:
- #
- # # group { "puppet":
- # # ensure => "present",
- # # }
- # #
- # # File { owner => 0, group => 0, mode => 0644 }
- # #
- # # file { '/etc/motd':
- # # content => "Welcome to your Vagrant-built virtual machine!
- # # Managed by Puppet.\n"
- # # }
- #
- # config.vm.provision :puppet do |puppet|
- # puppet.manifests_path = "manifests"
- # puppet.manifest_file = "init.pp"
- # end
-
- # Enable provisioning with chef solo, specifying a cookbooks path, roles
- # path, and data_bags path (all relative to this Vagrantfile), and adding
- # some recipes and/or roles.
- #
- # config.vm.provision :chef_solo do |chef|
- # chef.cookbooks_path = "../my-recipes/cookbooks"
- # chef.roles_path = "../my-recipes/roles"
- # chef.data_bags_path = "../my-recipes/data_bags"
- # chef.add_recipe "mysql"
- # chef.add_role "web"
- #
- # # You may also specify custom JSON attributes:
- # chef.json = { :mysql_password => "foo" }
- # end
-
- # Enable provisioning with chef server, specifying the chef server URL,
- # and the path to the validation key (relative to this Vagrantfile).
- #
- # The Opscode Platform uses HTTPS. Substitute your organization for
- # ORGNAME in the URL and validation key.
- #
- # If you have your own Chef Server, use the appropriate URL, which may be
- # HTTP instead of HTTPS depending on your configuration. Also change the
- # validation key to validation.pem.
- #
- # config.vm.provision :chef_client do |chef|
- # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
- # chef.validation_key_path = "ORGNAME-validator.pem"
- # end
- #
- # If you're using the Opscode platform, your validator client is
- # ORGNAME-validator, replacing ORGNAME with your organization name.
- #
- # If you have your own Chef Server, the default validation client name is
- # chef-validator, unless you changed the configuration.
- #
- # chef.validation_client_name = "ORGNAME-validator"
-end
diff --git a/vagrant_linux_dev_env/bootstrap.sh b/vagrant_linux_dev_env/bootstrap.sh
deleted file mode 100644
index 14db57f..0000000
--- a/vagrant_linux_dev_env/bootstrap.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-apt-get update
-sudo debconf-set-selections <<< 'mysql-server-5.5 mysql-server/root_password password 0233235'
-sudo debconf-set-selections <<< 'mysql-server-5.5 mysql-server/root_password_again password 0233235'
-apt-get install -y apache2 python sqlite3 mysql-server git
-rm -rf /var/www
-ln -fs /vagrant /var/www
\ No newline at end of file
diff --git a/vim/.vimrc b/vim/.vimrc
index f5cd535..bdfe17a 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,177 +1,22 @@
-" http://vim.wikia.com/wiki/Example_vimrc
-" Authors: http://vim.wikia.com/wiki/Vim_on_Freenode
-" Description: A minimal, but feature rich, example .vimrc. If you are a
-" newbie, basing your first .vimrc on this file is a good
-" choice.
-" If you're a more advanced user, building your own .vimrc
-" based
-" on this file is still a good idea.
-"
-"------------------------------------------------------------
-" Features {{{1
-"
-" These options and commands enable some very useful features in Vim, that
-" no user should have to live without.
-"
-" Set 'nocompatible' to ward off unexpected things that your distro might
-" have made, as well as sanely reset options when re-sourcing .vimrc
-" set nocompatible
-"
-" Attempt to determine the type of a file based on its name and possibly its
-" contents. Use this to allow intelligent auto-indenting for each filetype,
-" and for plugins that are filetype specific.
-filetype indent plugin on
+" Install vim-plug automatically
-" Enable syntax highlighting
-syntax on
-"
-"
-"------------------------------------------------------------
-" Must have options {{{1
-"
-" These are highly recommended options.
-"
-" Vim with default settings does not allow easy switching between multiple
-" files
-" in the same editor window. Users can use multiple split windows or
-" multiple
-" tab pages to edit multiple files, but it is still best to enable an option
-" to
-" allow easier switching between files.
-"
-" One such option is the 'hidden' option, which allows you to re-use the
-" same
-" window and switch from an unsaved buffer without saving it first. Also
-" allows
-" you to keep an undo history for multiple files when re-using the same
-" window
-" in this way. Note that using persistent undo also lets you undo in
-" multiple
-" files even in the same window, but is less efficient and is actually
-" designed
-" for keeping undo history after closing Vim entirely. Vim will complain if
-" you
-" try to quit without saving, and swap files will keep you safe if your
-" computer
-" crashes.
-set hidden
-"
-" Note that not everyone likes working this way (with the hidden option).
-" Alternatives include using tabs or split windows instead of re-using the
-" same
-" window as mentioned above, and/or either of the following options:
-" set confirm
-" set autowriteall
+let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
+ silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+ autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
-" Better command-line completion
-set wildmenu
+" Run PlugInstall if there are missing plugins
+autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
+ \| PlugInstall --sync | source $MYVIMRC
+\| endif
-" Show partial commands in the last line of the screen
-set showcmd
+call plug#begin('~/.vim/plugged')
-" Highlight searches (use to temporarily turn off highlighting; see
-" the
-" mapping of below)
-set hlsearch
+Plug 'jcherven/jummidark.vim'
+Plug 'tpope/vim-sensible'
-" Modelines have historically been a source of security vulnerabilities. As
-" such, it may be a good idea to disable them and use the securemodelines
-" script, .
-" set nomodeline
-
-
-"------------------------------------------------------------
-" Usability options {{{1
-"
-" These are options that users frequently set in their .vimrc. Some of them
-" change Vim's behaviour in ways which deviate from the true Vi way, but
-" which are considered to add usability. Which, if any, of these options to
-" use is very much a personal preference, but they are harmless.
-
-" Use case insensitive search, except when using capital letters
-set ignorecase
-set smartcase
-
-" Allow backspacing over autoindent, line breaks and start of insert action
-set backspace=indent,eol,start
-
-" When opening a new line and no filetype-specific indenting is enabled,
-" keep
-" the same indent as the line you're currently on. Useful for READMEs, etc.
-set autoindent
-
-" Stop certain movements from always going to the first character of a line.
-" While this behaviour deviates from that of Vi, it does what most users
-" coming from other editors would expect.
-set nostartofline
-
-" " Display the cursor position on the last line of the screen or in the
-" status
-" line of a window
-set ruler
-
-" Always display the status line, even if only one window is displayed
-set laststatus=2
-
-" Instead of failing a command because of unsaved changes, instead raise a
-" dialogue asking if you wish to save changed files.
-set confirm
-
-" Use visual bell instead of beeping when doing something wrong
-set visualbell
-
-" And reset the terminal code for the visual bell. If visualbell is set, and
-" this line is also included, vim will neither flash nor beep. If visualbell
-" is unset, this does nothing.
-set t_vb=
-
-" Enable use of the mouse for all modes
-set mouse=a
-
-" Set the command window height to 2 lines, to avoid many cases of having to
-" "press to continue"
-set cmdheight=2
-
-" Display line numbers on the left
-set number
-
-" Quickly time out on keycodes, but never time out on mappings
-set notimeout ttimeout ttimeoutlen=200
-
-" Use to toggle between 'paste' and 'nopaste'
-set pastetoggle=
-
-
-"------------------------------------------------------------
-" Indentation options {{{1
-"
-" Indentation settings according to personal preference.
-
-" Indentation settings for using 2 spaces instead of tabs.
-" Do not change 'tabstop' from its default value of 8 with this setup.
-set shiftwidth=2
-set softtabstop=2
-set expandtab
-
-" Indentation settings for using hard tabs for indent. Display tabs as
-" two characters wide.
-"set shiftwidth=2
-"set tabstop=2
-
-
-"------------------------------------------------------------
-" Mappings {{{1
-"
-" Useful mappings
-
-" Map Y to act like D and C, i.e. to yank until EOL, rather than act as yy,
-" which is the default
-map Y y$
-
-" Map (redraw screen) to also turn off search highlighting until the
-" next search
-nnoremap :nohl
-
-
-"------------------------------------------------------------
+call plug#end()
+syntax enable
+colorscheme jummidark
\ No newline at end of file