diff --git a/.gitignore b/.gitignore
index eb612d7..e7f5664 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,13 @@
.buildpath
.project
.settings
+
+# KDevelop project
+*.kdev4
+
+# Backup files
+*~
+
+# Site-dependent temporary files
+/log
+/temp
diff --git a/source/lib/Homepage/Main.class.php b/source/lib/Homepage/Main.class.php
index 43d891f..49f4626 100644
--- a/source/lib/Homepage/Main.class.php
+++ b/source/lib/Homepage/Main.class.php
@@ -32,7 +32,7 @@ class Homepage_Main extends SihnonFramework_Main {
$this->smarty->compile_dir = static::makeAbsolutePath($smarty_tmp . '/templates');
$this->smarty->cache_dir = static::makeAbsolutePath($smarty_tmp . '/cache');
$this->smarty->config_dir = static::makeAbsolutePath($smarty_tmp . '/config');
- $this->smarty->plugins_dir[]= static::makeAbsolutePath('../source/smarty/plugins');
+ $this->smarty->addPluginsDir(static::makeAbsolutePath('../source/smarty/plugins'));
$this->smarty->registerPlugin('modifier', 'formatDuration', array('Homepage_Main', 'formatDuration'));
$this->smarty->registerPlugin('modifier', 'formatFilesize', array('Homepage_Main', 'formatFilesize'));
@@ -43,6 +43,7 @@ class Homepage_Main extends SihnonFramework_Main {
$this->smarty->assign('base_uri', $this->base_uri);
$this->smarty->assign('base_url', static::absoluteUrl(''));
+ $this->smarty->assign('title', 'Homepage');
} break;
diff --git a/source/webui/templates/cv.tpl b/source/webui/templates/cv.tpl
index 5b90f2d..12e4cea 100644
--- a/source/webui/templates/cv.tpl
+++ b/source/webui/templates/cv.tpl
@@ -50,10 +50,21 @@
+ -
+
+ GSA Capital Partners LLP
+ November 2012 - Present
+
+ Systems Administrator
+
+ - Managing Unix, Linux and Windows systems, networking and datacentre deployment.
+ - IT Support.
+
+
-
Atos IT Services UK
- July 2010 - Present
+ July 2010 - November 2012
Network Technical Specialist - Major Projects
@@ -176,7 +187,7 @@
University of Southampton
October 2005 - June 2010
-
+
| Subject |
@@ -203,7 +214,7 @@
September 2003 - June 2005
-
+
| Subject |
@@ -279,10 +290,12 @@
Experience with:
- - Installation, configuration and operation of Operating Systems (Linux [many distributions], Windows, Mac OS X).
- - Writing and maintaining Linux software packages and package repositories (Gentoo Portage, Sabayon Entropy)
- - System automation (Puppet, Molecule, Kickstart).
+ - Installation, configuration and operation of Operating Systems (Linux [many distributions], Windows, Mac OS X)
+ - Writing and maintaining Linux software packages and package repositories (Gentoo Portage, Sabayon Entropy, RPM)
+ - System automation (Puppet, Molecule, Kickstart)
- Virtualisation (KVM, libvirt, Ganeti, VMWare/ESX)
+ - Monitoring (Nagios, Icinga, and automation of monitoring deployments)
+ - Backup systems (BackupPC, Bacula)
@@ -299,6 +312,9 @@
Many years' experience creating both simple and complex dynamic systems using
PHP. Emphasis on writing secure code.
+
+ More recently, experience with Python and Django.
+
- Application Programming
@@ -307,6 +323,8 @@
Proficient with C/C++, Qt. Basic experience with Perl. Able to read and write many
other languages, including Java, Ruby and UNIX Shell scripting.
+
+
- Databases
-
@@ -320,7 +338,7 @@
Experience with:
- - IDEs (Eclipse SDK, Microsoft Visual Studio)
+ - IDEs (KDevelop, Eclipse SDK, Microsoft Visual Studio)
- UNIX build environments (Vim, gcc/g++, make)
- Version Control systems (Git, Subversion)
diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl
index 01e976b..61be10c 100644
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -2,13 +2,17 @@
- I currently work as a Network Projects engineer for Atos
- in the Major Projects division. My role here includes design and implementation of LAN and WAN systems in Data Centre environments.
- I have recently completed the Atos graduate programme, and am currently involved in a major internal infrastructure overhaul spanning
- five sites for which I have been doing all the physical layer design and implementation.
+ I currently work as in the Infrastructure team for GSA Capital,
+ managing Unix, Linux and Windows systems and providing IT support.
- I previously worked for Netcraft in Bath,
+ I previously worked as a Network Projects engineer for Atos
+ in the Major Projects division. My role included design and implementation of LAN and WAN systems in Data Centre environments.
+ My last project involved working on a major internal infrastructure overhaul spanning five sites for which I produced all the
+ physical layer design and implementation.
+
+
+ Before that, I worked for Netcraft in Bath,
while taking a year out from my degree studies.
My roles included developing and running the SSL Server Survey,
reviewing Automated Vulnerability Scan results,
diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl
index 1a2b7b2..fa580ec 100644
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -37,7 +37,7 @@