diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4e4a2b9..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,82 +0,0 @@ ---- -version: 2 -jobs: - build: - working_directory: ~/static-site - docker: - - image: node:8 - steps: - - checkout - - restore_cache: - key: dependency-cache-{{ checksum "yarn.lock" }} - - run: - name: Install Dep - command: yarn - - save_cache: - key: dependency-cache-{{ checksum "yarn.lock" }} - paths: - - node_modules - - run: - name: Build Site - command: | - set -eo pipefail - yarn generate - - run: - name: Get Cache Checksum - command: ls -lnR source > deps_checksum - - save_cache: - key: build-cache-{{ .Branch }}-{{ checksum "deps_checksum" }} - paths: - - public - test: - docker: - - image: 18fgsa/html-proofer - environment: - ENV: CI - working_directory: ~/static-site - steps: - - checkout - - run: - name: Get Cache Checksum - command: ls -lnR source > deps_checksum - - restore_cache: - keys: - - build-cache-{{ .Branch }}-{{ checksum "deps_checksum" }} - - build-cache-{{ .Branch }} - - run: - name: Test Internal Links - command: | - set -eo pipefail - htmlproofer --allow-hash-href --check-html --empty-alt-ignore \ - --disable-external ~/static-site/public - - store_artifacts: - path: results.txt - prefix: tests - - store_test_results: - path: "results.txt" - deploy: - docker: - - image: alpine - steps: - - run: - name: Install Curl - command: apk add --no-cache curl - - run: - name: Trigger Regeneration - command: curl https://www.redbrick.dcu.ie/api/regenerate?token=$KEY - -workflows: - version: 2 - build-test-and-deploy: - jobs: - - build - - test: - requires: - - build - - deploy: - requires: - - build - filters: - branches: - only: - - master diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 1d4a828..0000000 --- a/.dockerignore +++ /dev/null @@ -1,23 +0,0 @@ -node_modules -db.json -.npm -scaffolds -.deploy_git -public -.DS_stores -docker-compose.yml -Dockerfile -production -*.md -.circleci -circle.yml -.env -.eslint* -.nvm* -.codeclimate.yml -.dockerignore -.markdown.style.rb -.mdlrc -logs -npm-shrinkwrap.json -themes diff --git a/.env.example b/.env.example deleted file mode 100644 index 018689d..0000000 --- a/.env.example +++ /dev/null @@ -1,3 +0,0 @@ -SECRET_API_TOKEN=somethingThatMustChange -RECAPTCHA_SECRET_KEY= -LOG_ROTATE=24h diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 183788e..0000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules/ -themes -public -source diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 79d4ab4..0000000 --- a/.eslintrc +++ /dev/null @@ -1,49 +0,0 @@ -{ - "extends": "standard", - "env": { - "es6": true, - "node": true, - "jest": true - }, - "rules": { - "no-multi-spaces": 0, - "comma-dangle": [ - "error", - "always-multiline" - ], - "key-spacing": [ - "error", - { - "multiLine": { - "beforeColon": false, - "afterColon": true - }, - "align": { - "beforeColon": false, - "afterColon": true, - "on": "colon", - "mode": "strict" - } - } - ], - "semi": [ - "error", - "always" - ], - "no-var": [ - "error" - ], - 'prefer-arrow-callback': [ - 'error', { - 'allowNamedFunctions': true, - }, - ], - "prefer-const": [ - "error", - { - "destructuring": "any", - "ignoreReadBeforeAssign": false - } - ] - } -} diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6478d95..147065d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,9 +4,9 @@ Closes # ### Checklist -*I confirm that before I submitted this pull request I did the following:* +_I confirm that before I submitted this pull request I did the following:_ - [ ] Confirmed that no other open PRs address this issue. - [ ] Checked out the latest version of the site. -- [ ] Ran `yarn start` and confirmed that there were no issues. +- [ ] Ran `hugo build` and confirmed that there were no issues. - [ ] Annotated my code with the relevant license information (if applicable). diff --git a/.github/workflows/build-validate.yml b/.github/workflows/build-validate.yml new file mode 100644 index 0000000..a7eb258 --- /dev/null +++ b/.github/workflows/build-validate.yml @@ -0,0 +1,40 @@ +name: Build and Validate + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Set up Ruby + uses: ruby/setup-ruby@v1.39.0 + with: + ruby-version: ruby + - name: Setup Hugo + uses: peaceiris/actions-hugo@v2 + with: + hugo-version: '0.74.2' + extended: true + - uses: actions/checkout@v2 + with: + submodules: true # Fetch Hugo themes (true OR recursive) + fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod + - name: Install dependencies + run: | + gem install html-proofer mdl + - name: Run markdownlint (mdl) + run: mdl -s .markdown.style.rb content/ + - name: Build site + run: make build + - name: Validate site's HTML + run: | + htmlproofer \ + --allow-hash-href \ + --check-html \ + --empty-alt-ignore \ + --disable-external \ + ./public diff --git a/.gitignore b/.gitignore index 2d44482..f06768b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,13 +8,6 @@ pids *.pid *.seed -# Environment variables -.env - -# email update related -mailing_list -email_update_log - # Directory for instrumented libs generated by jscoverage/JSCover lib-cov @@ -49,3 +42,13 @@ db.json _bower_components banner-* thumb-* + +### Hugo ### +# Generated files by hugo +/public/ +/resources/_gen/ + +# Executable may be added to repository +hugo.exe +hugo.darwin +hugo.linux diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3af4a40..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "themes/redbrick-theme"] - path = themes/redbrick-theme - url = https://github.com/redbrick/hexo-theme-icarus.git - branch = master diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index 6b35194..0000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -lts/boron diff --git a/.sass-lint.yaml b/.sass-lint.yaml new file mode 100644 index 0000000..5d8e394 --- /dev/null +++ b/.sass-lint.yaml @@ -0,0 +1,24 @@ +--- +options: + max-warnings: 100 +files: + include: 'assets/**/*.s+(a|c)ss' +rules: + leading-zero: 0 + no-url-domains: 0 + no-url-protocols: 0 + function-name-format: + - 2 + - allow-leading-underscore: false + convention: camelcase + mixin-name-format: + - 2 + - allow-leading-underscore: false + convention: camelcase + placeholder-name-format: + - 2 + - allow-leading-underscore: false + convention: camelcase + nesting-depth: + - 2 + - max-depth: 3 diff --git a/.yarnclean b/.yarnclean deleted file mode 100644 index 25bdd14..0000000 --- a/.yarnclean +++ /dev/null @@ -1,42 +0,0 @@ -# test directories -__tests__ -test -tests -powered-test - -# asset directories -docs -doc -website -images -assets - -# examples -example -examples - -# code coverage directories -coverage -.nyc_output - -# build scripts -Makefile -Gulpfile.js -Gruntfile.js - -# configs -.tern-project -.gitattributes -.editorconfig -.*ignore -.eslintrc -.jshintrc -.flowconfig -.documentup.json -.yarn-metadata.json -.*.yml -*.yml - -# misc -*.gz -*.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3034ae4..4152278 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -2,55 +2,60 @@ ## Our Pledge -In the interest of fostering an open and welcoming environment, we as contributors -and maintainers pledge to making participation in our project and our community -a harassment-free experience for everyone, regardless of age, body size, disability, -ethnicity, gender identity and expression, level of experience, nationality, personal -appearance, race, religion, or sexual identity and orientation. +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, nationality, personal appearance, race, religion, or sexual identity +and orientation. ## Our Standards -* Please avoid using overtly sexual nicknames or other nicknames that might +- Please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. -* Please be kind and courteous. There's no need to be mean or rude. -* Respect that people have differences of opinion and that every design or +- Please be kind and courteous. There's no need to be mean or rude. +- Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer. -* Please keep unstructured critique to a minimum. If you have solid ideas you +- Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. -* We will exclude you from interaction if you insult, demean or harass anyone. +- We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including - the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). - If you have any lack of clarity about what might be included in that concept, - please read their definition. In particular, we don't tolerate behavior that - excludes people in socially marginalized groups. -* Private harassment is also unacceptable. No matter who you are, if you feel + the definition in the + [Citizen Code of Conduct](http://citizencodeofconduct.org/). If you have any + lack of clarity about what might be included in that concept, please read + their definition. In particular, we don't tolerate behavior that excludes + people in socially marginalized groups. +- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the TC members immediately with a capture (log, photo, email) of the harassment if possible. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back. -* Likewise any spamming, trolling, flaming, baiting or other attention-stealing +- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. -* Avoid the use of personal pronouns in code comments or documentation. There - is no need to address persons when explaining code (e.g. "When the developer") +- Avoid the use of personal pronouns in code comments or documentation. There is + no need to address persons when explaining code (e.g. "When the developer") -Examples of behavior that contributes to creating a positive environment include: +Examples of behavior that contributes to creating a positive environment +include: -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +- Using welcoming and inclusive language +- Being respectful of differing viewpoints and experiences +- Gracefully accepting constructive criticism +- Focusing on what is best for the community +- Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, - without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting +- The use of sexualized language or imagery and unwelcome sexual attention or + advances +- Trolling, insulting/derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or electronic + address, without explicit permission +- Other conduct which could reasonably be considered inappropriate in a + professional setting ## Our Responsibilities @@ -59,26 +64,28 @@ behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are not -aligned to this Code of Conduct, or to ban temporarily or permanently any contributor -for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Moderation - -Remarks that violate the standards of conduct, including hateful, hurtful, oppressive, -or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting -another user, and never in a hateful manner.) Remarks that moderators find -inappropriate, whether listed in the code of conduct or not, are also not allowed. -Moderators will first respond to such remarks with a warning. If the warning is -unheeded, the user will be “kicked,” i.e., kicked out of the communication channel -to cool off. If the user comes back and continues to make trouble, they will be -banned, i.e., indefinitely excluded. Moderators may choose at their discretion -to un-ban the user if it was a first offense and they offer the offended party a -genuine apology. If a moderator bans someone and you think it was unjustified, -please take it up with that moderator, or with a different moderator, in private. -Complaints about bans in-channel are not allowed. Moderators are held to a higher -standard than other community members. If a moderator creates an inappropriate -situation, they should expect less leeway than others. +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Moderation + +Remarks that violate the standards of conduct, including hateful, hurtful, +oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but +never targeting another user, and never in a hateful manner.) Remarks that +moderators find inappropriate, whether listed in the code of conduct or not, are +also not allowed. Moderators will first respond to such remarks with a warning. +If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the +communication channel to cool off. If the user comes back and continues to make +trouble, they will be banned, i.e., indefinitely excluded. Moderators may choose +at their discretion to un-ban the user if it was a first offense and they offer +the offended party a genuine apology. If a moderator bans someone and you think +it was unjustified, please take it up with that moderator, or with a different +moderator, in private. Complaints about bans in-channel are not allowed. +Moderators are held to a higher standard than other community members. If a +moderator creates an inappropriate situation, they should expect less leeway +than others. And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even @@ -91,12 +98,13 @@ and forgive as long as you earn their trust. ### Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported -by contacting the project team at committee@redbrick.dcu.ie. The project team -will review and investigate all complaints, and will respond in a way that it -deems appropriate to the circumstances. The project team is obligated to maintain -confidentiality with regard to the reporter of an incident. Further details of -specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at committee@redbrick.dcu.ie. The +project team will review and investigate all complaints, and will respond in a +way that it deems appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an +incident. Further details of specific enforcement policies may be posted +separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other @@ -113,5 +121,6 @@ further defined and clarified by project maintainers. ## Attribution -This Code of Conduct is adapted from [Rust's wonderful CoC](http://www.rust-lang.org/conduct.html) -and the Contributor Covenant, (version 1.4)[http://contributor-covenant.org/version/1/4] +This Code of Conduct is adapted from +[Rust's wonderful CoC](http://www.rust-lang.org/conduct.html) and the +Contributor Covenant, (version 1.4)[http://contributor-covenant.org/version/1/4] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b86aaa..60ad2b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,12 +8,14 @@ This document will guide you through the contribution process. ### Step 1: Fork -Fork the project [on GitHub](https://github.com/redbrick/static-site) and check out your copy locally. +Fork the project [on GitHub](https://github.com/redbrick/static-site) and check +out your copy locally. #### Which branch? -For developing new features and bug fixes, the `master` branch needs to be pulled -and built upon. We follows a [Continuous Integration](https://en.wikipedia.org/wiki/Continuous_integration) +For developing new features and bug fixes, the `master` branch needs to be +pulled and built upon. We follows a +[Continuous Integration](https://en.wikipedia.org/wiki/Continuous_integration) model, where the master branch is always deployed to production. ### Step 2: Branch @@ -33,8 +35,8 @@ $ git config --global user.name "J. Random User" $ git config --global user.email "j.random.user@example.com" ``` -Writing good commit logs is important. A commit log needs to describe what -changed and why. Follow these guidelines when writing one: +Writing good commit logs is important. A commit log needs to describe what +changed and why. Follow these guidelines when writing one: 1. The first line ideally should be 50 characters or less and contain a short description of the change @@ -67,33 +69,32 @@ Use `git rebase` (not `git merge`) to sync your work from time to time. $ git fetch upstream $ git rebase upstream/master ``` + ### Step 5: Push ```text $ git push origin my-feature-branch ``` -Go to https://github.com/yourusername/static-site and select your feature branch. -Click the 'Pull Request' button and fill out the form. - -Pull requests are usually reviewed within a few days. If there are comments -to address, apply your changes in a separate commit and push that to your -feature branch. Post a comment in the pull request afterwards; GitHub does -not send out notifications when you add commits. +Go to https://github.com/yourusername/static-site and select your feature +branch. Click the 'Pull Request' button and fill out the form. +Pull requests are usually reviewed within a few days. If there are comments to +address, apply your changes in a separate commit and push that to your feature +branch. Post a comment in the pull request afterwards; GitHub does not send out +notifications when you add commits. ## Developer's Certificate of Origin 1.0 By making a contribution to this project, I certify that: -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license indicated - in the file; or -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source license - and I have the right under that license to submit that work with - modifications, whether created in whole or in part by me, under the - same open source license (unless I am permitted to submit under a - different license), as indicated in the file; or -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified it. +- (a) The contribution was created in whole or in part by me and I have the + right to submit it under the open source license indicated in the file; or +- (b) The contribution is based upon previous work that, to the best of my + knowledge, is covered under an appropriate open source license and I have the + right under that license to submit that work with modifications, whether + created in whole or in part by me, under the same open source license (unless + I am permitted to submit under a different license), as indicated in the file; + or +- (c) The contribution was provided directly to me by some other person who + certified (a), (b) or (c) and I have not modified it. diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ee1a6ca..0000000 --- a/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM node:boron-alpine -WORKDIR /usr/src/app -VOLUME /usr/src/app/public /usr/src/app/logs -EXPOSE 3000 -ADD . /usr/src/app/ -RUN apk add --no-cache git build-base file nasm autoconf libpng-dev openssl && yarn -ENV NODE_ENV=production -CMD yarn docker diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..710307f --- /dev/null +++ b/Makefile @@ -0,0 +1,76 @@ +SHELL := bash +.ONESHELL: +.SHELLFLAGS := -eu -o pipefail -c +.DELETE_ON_ERROR: +.DEFAULT_GOAL := help +MAKEFLAGS += --warn-undefined-variables +MAKEFLAGS += --no-builtin-rules + +VHOST := /webtree/redbrick/public +DESTDIR := public +HUGO_VERSION := 0.73.0 +HUGO := .cache/hugo_$(HUGO_VERSION) +PLATFORM := Linux-64bit + +THEME := $(shell awk -F\= '/theme/ {gsub(/"/,"",$$2);gsub(/ /, "", $$2);print $$2}' config.toml) +THEME_DIR := themes/$(THEME) + +OPTIMIZE = find $(DESTDIR) -not -path "*/static/*" \( -name '*.png' -o -name '*.jpg' -o -name '*.jpeg' \) -print0 | \ +xargs -0 -P8 -n2 mogrify -strip -thumbnail '1000>' + +$(THEME_DIR): + git submodule init + git submodule sync + git submodule update + +build: public ## Build Site +public: config.toml $(THEME_DIR) content $(HUGO) + @echo "🍳 Generating site" + $(HUGO) --gc --minify -d $(DESTDIR) + + @echo "🧂 Optimizing images" + $(OPTIMIZE) + +deploy: $(VHOST) ## Deploy site to blog vhost. This Should be run from a server on redbrick +$(VHOST): clean public + chown -R webgroup:webgroup $(word 2, $^) + rsync -avh $(word 2, $^)/* $@ + +.PHONY: update +update: ## Update themes + @echo "🛎 Updating Them" + git submodule update --remote --merge + +.PHONY: serve +serve: $(HUGO) ## Run development server in debug mode + $(HUGO) server -D -w + +.PHONY: clean +clean: ## Clean built site + @echo "🧹 Cleaning old build" + rm -rf public resources .cache + +.PHONY: lint lint-markdown lint-html format +lint: lint-markdown lint-html ## Run all linter +format: ## Format Markdown files + @docker run --rm -v $$(pwd):/hugo node:alpine npx prettier --parser=markdown --config /hugo/.prettierrc.toml --write '/hugo/content/**/*.md' +lint-markdown: format ## Run markdown linter + @echo "🍜 Testing Markdown" + @docker run --rm -v $$(pwd):/hugo ruby:2-alpine sh -c 'gem install mdl && mdl -i /hugo/content/ -s /hugo/.markdown.style.rb' +lint-html: build ## Run HTML linter + @echo "🍜 Testing HTML" + @docker run --rm -v $$(pwd):/hugo ruby:2 sh -c 'gem install html-proofer && htmlproofer --allow-hash-href --check-html --empty-alt-ignore --disable-external /hugo/public' + +$(HUGO): + @echo "🤵 Getting Hugo" + @wget -q -P tmp/ https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_extended_$(HUGO_VERSION)_$(PLATFORM).tar.gz + @tar xf tmp/hugo_extended_$(HUGO_VERSION)_$(PLATFORM).tar.gz -C tmp/ + @mkdir -p .cache + @mv -f tmp/hugo $(HUGO) + @rm -rf tmp/ + +.PHONY: help +help: ## Display this help screen + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ + | sort \ + | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-16s\033[0m %s\n", $$1, $$2}' diff --git a/README.md b/README.md index 1efe9c8..97ed104 100644 --- a/README.md +++ b/README.md @@ -6,111 +6,42 @@ [![](https://images.microbadger.com/badges/version/redbrick/site.svg)](https://microbadger.com/images/redbrick/site) [![](https://images.microbadger.com/badges/image/redbrick/site.svg)](https://microbadger.com/images/redbrick/site) -A Static Site for [redbrick](http://redbrick.dcu.ie) generated with [hexo](https://hexo.io/) using a theme -based off [icarus](https://github.com/redbrick/hexo-theme-icarus) - -## Requirements - -1. **Node** : v6.9(LTS) Download [Node](https://nodejs.org/download/) +A Static Site for [redbrick](http://redbrick.dcu.ie) generated with +[hugo](https://gohugo.io/) using a theme based off icarus ## Development -To set up the for development +To set up the for development you will need hugo installed -- `yarn` this will install all the dependencies -- copy `.env.example` to `.env` -- `yarn start` to create start the serve +- `hugo serve` to start the dev server - To generate new posts - - Run `yarn posts [title]` This will create a new post in `source/_post/[title].md` + - Run `hugo new -k posts [title]` This will create a new post in + `source/_post/[title].md` - To generate new pages: - - Run `yarn page [title]` this will create a new page in `source/[title]/index.md` + - Run `hugo new [title]` this will create a new page in + `content/[title]/index.md` - To edit the sidebar: - - Edit `themes/redbrick-theme/_config.yaml` - this is where all the theme configuration is controlled from. + - Edit `config.toml` - this is where all the configuration is controlled from. ### Docker -Theres a `docker-compose.yml` for development. - -- Copy `.env.example` to `.env` -- Run `docker-compose up` +There's a `docker-compose.yml` for development. -### Generate +Run `docker-compose up --build` rather then `yarn` commands -- To demo the site run `yarn start`. This will create a server that runs on `localhost:3000` -- To work on css and have it auto regenerate use `yarn hexo`. This will create a server that runs on `localhost:4000` +If you want to edit theme edit the `docker-compose.yml` and the theme folder as +a volume and clone the theme locally ### CSS and Templates -- You can edit the css for the theme in `themes/redbrick-theme/source/css` -- You can edit the templates in `themes/redbrick-theme/layout` +- You can edit the css for the theme in `assets/scss` +- You can edit the templates in `layout` ### Google analytics -Analytics can be enabled by adding your analytics key to `theme/redbrick/_config.yaml` - -## Production - -### Setup - -To deploy to a server run: - -- `yarn` this will install all the dependencies -- modify `_config.yml` as needed -- copy `production/website.service` to `/etc/systemd/system` -- `yarn generate` to create initial site -- `systemctl start website` to start the express server - -You will also need to create three files: - -- `mailing_list` a newline-separated list of email addresses -- `email_update_log` a newline-separated reverse-chronological list of times email updates were sent -- `.env` by copying `.env.example` and **modifying values (*important*)** -- Set any Environment Variables through the env file - -`mailing_list` and `email_update_log` can be left blank, though updates for every post in history -will be sent if no previous send date is specified. - -Then using apache or nginx proxy traffic to port 3000. - -And done. - -### Docker - -To use docker in production theres a `docker-compose.yml` in the production folder. -- Copy the `.env.example` to `.env` relative to the `docker-compose.yml`. -- Modify `.env` -- Create a file called `mailing_list` and add email addresses for announce -- run `docker-compose up -d` - -### Generate via API -- While the server is live, a visit to `http://[sitehost]/api/regenerate?token=your_secret_token` - will run `hexo generate` and send emails for any new posts so long as that process is not already underway. - -### Mail Options - -To use sendmail rather then SMTP in the `_config.yml` set `useSendMail` to `true`. - -To disable auth on SMTP leave `auth.user` and `auth.pass` as empty. - -Modify the host, and port options as needed for SMTP either in the config or using the env -variables. - -## Environment Variables - -| Variable | Example | Description | -| :--- | :---: | ---: | -| `SECRET_API_TOKEN` | | API key for regenerating the site | -| `RECAPTCHA_SECRET_KEY` | | Recaptcha server key from Google | -| `RECAPTCHA_SITE_KEY` | | Recaptcha site key same as the on in the theme | -| `LOG_ROTATE` | `24h` | When to rotate logs | -| `SMTP_HOST` | `mailhost.redbrick.dcu.ie` | SMTP host address | -| `SMTP_PORT` | `25` | SMTP port for server | -| `SMTP_SECURE` | `false` | if using SSL or not | -| `SMTP_USER` | `no-reply` | redbrick username for SMTP auth leave off the `@redbrick.dcu.ie` | -| `SMTP_PASS` | | account password | -| `SMTP_AUTH_METHOD` | `plain` | auth method to use with SMTP. Defaults to plain | -| `PORT` | `3000` | port to run the server on defaults to 3000 | +Analytics can be enabled by adding your analytics key to variable in +`config.toml` ## License @@ -125,8 +56,7 @@ version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. +PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program. If not, see . - +this program. If not, see . diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 7ded06c..0000000 --- a/_config.yml +++ /dev/null @@ -1,246 +0,0 @@ ---- -# Site -title: Redbrick -subtitle: DCU's Networking Society -description: Redbrick is DCU’s Computer Networking society. We host events for everything computing related this ranges from; how to setup your own website and storing your photos online to System Administration and Computer Programming Tutorials. We also host a number of services for our membership. -author: Redbrick -email: committee@redbrick.dcu.ie -language: en -timezone: Europe/Dublin - -# Menus -menu: - Home: - url: . - icon: home - Archives: - url: archives - icon: archive - About: - icon: info - The Society: - url: about - icon: info - Committee: - url: about/committee - icon: users - Minutes: - url: about/minutes - icon: clipboard - Constitution: - url: about/constitution - icon: book - Regulations: - url: about/regulations - icon: file-text-o - Contact: - url: about/contact - icon: reply - Past Committee: - url: about/past-committees - icon: users - Help: - icon: question - Helpdesk: - url: help - icon: question - Joining: - url: /help/joining - icon: sign-in - Tutorial: - url: /help/tutorials - icon: bank - Exams: - url: /help/exams - icon: graduation-cap - Services: - url: /help/services - icon: database - Services: - icon: linux - Mail: - url: https://webmail.redbrick.dcu.ie - icon: envelope - Wiki: - url: https://wiki.redbrick.dcu.ie - icon: university - Chat: - url: https://webchat.redbrick.dcu.ie - icon: wechat - Git: - url: https://git.redbrick.dcu.ie - icon: git - Mastodon: - url: https://mastodon.redbrick.dcu.ie - icon: retweet - Hackmd: - url: https://md.redbrick.dcu.ie - icon: file-code-o - Hastebin: - url: https://paste.redbrick.dcu.ie - icon: clipboard - Events: - url: /events - icon: calendar -footer: - - text: events - url: /events - - text: contact - url: /about/contact - - text: Call for Talks - url: /CFT - -# URL -url: http://redbrick.dcu.ie -root: / -permalink: :year/:month/:day/:title/ - -# Directory -source_dir: source -public_dir: public -tag_dir: tags -archive_dir: archives -category_dir: categories -code_dir: downloads/code - -# Writing -new_post_name: :title.md # File name of new posts -default_layout: post -titlecase: false # Transform title into titlecase -external_link: true # Open external links in new tab -filename_case: 0 -render_drafts: false -post_asset_folder: true -relative_link: false -future: true -highlight: - enable: true - line_number: true - auto_detect: false - tab_replace: - -# Markdown -marked: - gfm: true - pedantic: false - sanitize: false - tables: true - breaks: false - smartLists: true - smartypants: true - -# Category & Tag -default_category: Redbrick -category_map: -tag_map: - -# Date / Time format -## Hexo uses Moment.js to parse and display date -## You can customize the date format as defined in -## http://momentjs.com/docs/#/displaying/format/ -date_format: DD/MM/YYYY -time_format: HH:mm:ss - -# Pagination -## Set per_page to 0 to disable pagination -per_page: 10 -pagination_dir: page - -# RSS Feed -feed: - type: atom - path: atom.xml - limit: 20 - -# Api -toJson: - enablePagination: true # chunk the index.json array based on per_page in _config.yml - configs: false # donnot generate the global and theme config api. - pages: - selectors: - - title # string selector - - date - - updated - - permalink - - excerpt - - photos - - link - extracts: [content] - posts: - selectors: - - title - - date - - updated - - excerpt - - permalink - - photos - - {path: tags, childrenSelectors: ['name', 'slug', 'permalink']} # object selector - - {path: categories, childrenSelectors: ['name', 'slug', 'permalink']} - extracts: [content] - tags: true - categories: true - -# Extensions -## Plugins: https://hexo.io/plugins/ -hfc_html: - enable: true -hfc_css: - enable: true - exclude: - - '*.min.css' -hfc_js: - enable: false - mangle: true - exclude: - - '*.min.js' -hfc_favicons: - enable: true - src: assets/images/logo-small.png - target: / - icons: - android: true - appleIcon: true - appleStartup: false - coast: false - favicons: true - firefox: false - opengraph: false - windows: false - yandex: false -hfc_img: - enable: true - interlaced: false - multipass: false - optimizationLevel: 2 - pngquant: false - progressive: false - webp: true - webpQuality: 75 - gifslice: true - jpegtran: true - jpegrecompress: false - jpegrecompressQuality: 'medium' - optipng: true - svgo: false - -## Themes: https://hexo.io/themes/ -theme: redbrick-theme - -# Server Config -server: - useSendMail: false - email: - host: mailhost.redbrick.dcu.ie - port: 25 - secure: false - authMethod: plain - auth: - user: '' - pass: '' - mailsubject: Redbrick Update - siteroot: http://redbrick.dcu.ie - logDirectory: ./logs - logRotationFreqency: 168h # 1 week in hours - recaptcha: - siteKey: '6LfClyATAAAAAErMssL8Y2iCwGx2JfdcxQHD8biq' - secretKey: '' diff --git a/app.js b/app.js deleted file mode 100644 index d4565d8..0000000 --- a/app.js +++ /dev/null @@ -1,102 +0,0 @@ -require('dotenv-safe').load(); - -const express = require('express'); -const compression = require('compression'); -const path = require('path'); -const favicon = require('serve-favicon'); -const morgan = require('morgan'); -const cookieParser = require('cookie-parser'); -const bodyParser = require('body-parser'); -const yaml = require('js-yaml'); -const fs = require('fs'); -const protect = require('@risingstack/protect'); -const FileStreamRotator = require('file-stream-rotator'); -const logger = require('./lib/logger'); -const emailNewPosts = require('./lib/emailNewPosts'); - -const app = express(); - -const configFile = fs.readFileSync('./_config.yml', 'utf8'); -const config = yaml.safeLoad(configFile).server; -const baseUrl = '/api'; - -const logDirectory = path.join(__dirname, config.logDirectory); -fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory); - -const accessLogStream = FileStreamRotator.getStream({ - date_format: 'YYYYMMDD', - filename : path.join(logDirectory, 'access-%DATE%.log'), - frequency : process.env.LOG_ROTATE || config.logRotationFreqency, - verbose : false, -}); - -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', 'ejs'); - -// Serve Static files generate from hexo -app.use(express.static(path.join(__dirname, 'public'))); -app.use(favicon(path.join(__dirname, 'public', 'favicon.ico'))); -app.use( - morgan('combined', { - stream: accessLogStream, - }) -); -app.use(bodyParser.json()); -app.use(compression()); -app.use(bodyParser.urlencoded({ extended: false })); -app.use(cookieParser()); -app.use(protect.express.xss({ - body : true, - loggerFunction: logger.error, -})); - -// /api/posts returns latets blog posts as json -const postsRoute = require('./routes/posts'); -app.use(baseUrl, postsRoute); - -// /api/committee returns committee as json -const committeeRoute = require('./routes/committee'); -app.use(baseUrl, committeeRoute); - -// /api/regenerate regenerates content without restarting the server -const regenerateRoute = require('./routes/regenerate'); -app.use(baseUrl, regenerateRoute); - -// /api/fetchMeSomeTea 418 responce -app.get(path.join(baseUrl, 'fetchMeSomeTea'), (req, res) => { - res.status(418).json({ message: "I'm a teapot", image: 'https://httpstatusdogs.com/img/418.jpg' }); -}); - -// catch 404 and forward to error handler -app.use((req, res, next) => { - const err = new Error('Not Found'); - err.status = 404; - res.status(err.status).sendFile(path.join(__dirname, '/public/404.html')); -}); - -// error handlers -app.use((err, req, res, next) => { - if (app.get('env') === 'development') { - // development error handler - // will print stacktrace - res.status(err.status || 500); - res.render('error', { - message: err.message, - error : err, - }); - } else { - // production error handler - res.redirect('/500.html'); - } -}); - -// production error handler -// no stacktraces leaked to user -app.use(({ status }, req, res, next) => { - res.status(status || 500).sendFile(path.join(__dirname, '/public/404.html')); -}); - -emailNewPosts(); -logger.info('Server running on port', process.env.PORT || '3000'); - -module.exports = app; diff --git a/archetypes/default.md b/archetypes/default.md new file mode 100644 index 0000000..0897327 --- /dev/null +++ b/archetypes/default.md @@ -0,0 +1,10 @@ +--- +tags: [] +categories: [] +description: '' +menu: '' +banner: '' +images: [] +--- + + diff --git a/archetypes/exam.md b/archetypes/exam.md new file mode 100644 index 0000000..00165e4 --- /dev/null +++ b/archetypes/exam.md @@ -0,0 +1,4 @@ +--- +title: { { title } } +date: { { date } } +--- diff --git a/assets/js/menu.js b/assets/js/menu.js new file mode 100644 index 0000000..f587794 --- /dev/null +++ b/assets/js/menu.js @@ -0,0 +1,11 @@ +$(document).ready(() => { + $('body').on('click', () => { + $('.menu li').removeClass('active'); + }); + $('.menu .menu-list .dropdown-toggle').on('click', function dropdown(e) { + e.stopPropagation(); + $('.menu li').removeClass('active'); + const $parent = $(this).parent(); + $parent.addClass('active'); + }); +}); diff --git a/assets/js/script.js b/assets/js/script.js new file mode 100644 index 0000000..d6981e8 --- /dev/null +++ b/assets/js/script.js @@ -0,0 +1,66 @@ +($ => { + const toTop = $('#sidebar').height() - $(window).height() + 60; + // Caption + $('.article-entry').each(function articleEntry(i) { + $(this) + .find('img') + .each(function fancybox() { + if ( + $(this) + .parent() + .hasClass('fancybox') + ) { + return; + } + const { alt } = this; + if (alt) { + $(this).after(`${alt}`); + } + + $(this).wrap(``); + }); + + $(this) + .find('.fancybox') + .each(function article() { + $(this).attr('rel', `article${i}`); + }); + }); + if ($.fancybox) { + $('.fancybox').fancybox(); + } + + // Profile card + $(document) + .on('click', () => { + $('#profile').removeClass('card'); + }) + .on('click', '#profile-anchor', e => { + e.stopPropagation(); + $('#profile').toggleClass('card'); + }) + .on('click', '.profile-inner', e => { + e.stopPropagation(); + }); + + // To Top + if ($('#sidebar').length) { + $(document) + .on('scroll', function scroll() { + if ($(document).width() >= 800) { + if ($(this).scrollTop() > toTop && $(this).scrollTop() > 0) { + $('#toTop').fadeIn(); + $('#toTop').css('left', $('#sidebar').offset().left); + } else { + $('#toTop').fadeOut(); + } + } else { + $('#toTop').fadeIn(); + $('#toTop').css('right', 20); + } + }) + .on('click', '#toTop', () => { + $('body, html').animate({ scrollTop: 0 }, 600); + }); + } +})(jQuery); diff --git a/assets/scss/extend.scss b/assets/scss/extend.scss new file mode 100644 index 0000000..f1d5739 --- /dev/null +++ b/assets/scss/extend.scss @@ -0,0 +1,117 @@ +%link-dark { + &, + &:visited { + color: $color-default; + transition: 0.2s ease; + } + + &:hover, + &:visited:hover { + color: $color-link; + } +} + +%block-caption { + line-height: 1em; + + text-decoration: none; + text-transform: uppercase; +} + +%block { + background: $color-white; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +%base-style { + h1 { + font-size: 2em; + } + + h2 { + font-size: 1.5em; + } + + h3 { + font-size: 1.3em; + } + + h4 { + font-size: 1.2em; + } + + h5 { + font-size: 1em; + } + + h6 { + font-size: 1em; + color: $color-grey; + } + + hr { + border: 1px dashed $color-border; + } + + strong { + font-weight: bold; + } + + em, + cite { + font-style: italic; + } + + sup, + sub { + font-size: 0.75em; + line-height: 0; + position: relative; + vertical-align: baseline; + } + + sup { + top: -0.5em; + } + + sub { + bottom: -0.2em; + } + + small { + font-size: 0.85em; + } + + acronym, + abbr { + border-bottom: 1px dotted; + } + + ul, + ol, + dl { + line-height: $line-height; + margin: 0 20px; + } + + ul, + ol { + ul, + ol { + margin-bottom: 0; + margin-top: 0; + } + } + + ul { + list-style: disc; + } + + ol { + list-style: decimal; + } + + dt { + font-weight: bold; + } +} diff --git a/assets/scss/highlight/agate.scss b/assets/scss/highlight/agate.scss new file mode 100644 index 0000000..889ac57 --- /dev/null +++ b/assets/scss/highlight/agate.scss @@ -0,0 +1,105 @@ +/*! + * Agate by Taufik Nurrohman + * ---------------------------------------------------- + * + * #ade5fc + * #a2fca2 + * #c6b4f0 + * #d36363 + * #fcc28c + * #fc9b9b + * #ffa + * #fff + * #333 + * #62c8f3 + * #888 + * + */ +.highlight { + background: #333; + color: #fff; + .code { + .name, + .strong { + font-weight: bold; + } + + .code, + .emphasis { + font-style: italic; + } + + .tag { + color: #62c8f3; + } + + .variable, + .template-variable, + .selector-id, + .selector-class { + color: #ade5fc; + } + + .string, + .bullet { + color: #a2fca2; + } + + .type, + .title, + .section, + .attribute, + .quote, + .built_in, + .builtin-name { + color: #ffa; + } + + .number, + .symbol, + .bullet { + color: #d36363; + } + + .keyword, + .selector-tag, + .literal { + color: #fcc28c; + } + + .comment, + .deletion, + .code { + color: #888; + } + + .regexp, + .link { + color: #c6b4f0; + } + + .meta { + color: #fc9b9b; + } + + .deletion { + background-color: #fc9b9b; + color: #333; + } + + .addition { + background-color: #a2fca2; + color: #333; + } + + .highlight a { + color: inherit; + } + + .highlight a:focus, + .highlight a:hover { + color: inherit; + text-decoration: underline; + } + } +} diff --git a/assets/scss/highlight/androidstudio.scss b/assets/scss/highlight/androidstudio.scss new file mode 100644 index 0000000..2837fff --- /dev/null +++ b/assets/scss/highlight/androidstudio.scss @@ -0,0 +1,63 @@ +/* +Date: 24 Fev 2015 +Author: Pedro Oliveira +*/ +.highlight { + background: #282b2e; + color: #a9b7c6; + .code { + .number, + .literal, + .symbol, + .bullet { + color: #6897bb; + } + + .keyword, + .selector-tag, + .deletion { + color: #cc7832; + } + + .variable, + .template-variable, + .link { + color: #629755; + } + + .comment, + .quote { + color: #808080; + } + + .meta { + color: #bbb529; + } + + .string, + .attribute, + .addition { + color: #6a8759; + } + + .section, + .title, + .type { + color: #ffc66d; + } + + .name, + .selector-id, + .selector-class { + color: #e8bf6a; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/arduino-light.scss b/assets/scss/highlight/arduino-light.scss new file mode 100644 index 0000000..7ed3684 --- /dev/null +++ b/assets/scss/highlight/arduino-light.scss @@ -0,0 +1,85 @@ +/* + +Arduino® Light Theme - Stefania Mellai + +*/ +.highlight { + background: #fff; + color: #434f54; + .code { + .subst { + color: #434f54; + } + + .keyword, + .attribute, + .selector-tag, + .doctag, + .name { + color: #00979d; + } + + .built_in, + .literal, + .bullet, + .code, + .addition { + color: #d35400; + } + + .regexp, + .symbol, + .variable, + .template-variable, + .link, + .selector-attr, + .selector-pseudo { + color: #00979d; + } + + .type, + .string, + .selector-id, + .selector-class, + .quote, + .template-tag, + .deletion { + color: #005c5f; + } + + .title, + .section { + color: #800; + font-weight: bold; + } + + .comment { + color: rgba(149, 165, 166, 0.8); + } + + .meta-keyword { + color: #728e00; + } + + .meta { + color: #728e00; + color: #434f54; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + + .function { + color: #728e00; + } + + .number { + color: #8a7b52; + } + } +} diff --git a/assets/scss/highlight/arta.scss b/assets/scss/highlight/arta.scss new file mode 100644 index 0000000..a719286 --- /dev/null +++ b/assets/scss/highlight/arta.scss @@ -0,0 +1,70 @@ +/* +Date: 17.V.2011 +Author: pumbur +*/ +.highlight { + background: #222; + color: #aaa; + .code { + .subst { + color: #aaa; + } + + .section { + color: #fff; + } + + .comment, + .quote, + .meta { + color: #444; + } + + .string, + .symbol, + .bullet, + .regexp { + color: #fc3; + } + + .number, + .addition { + color: #0c6; + } + + .built_in, + .builtin-name, + .literal, + .type, + .template-variable, + .attribute, + .link { + color: #32aaee; + } + + .keyword, + .selector-tag, + .name, + .selector-id, + .selector-class { + color: #64a; + } + + .title, + .variable, + .deletion, + .template-tag { + color: #b16; + } + + .section, + .doctag, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/ascetic.scss b/assets/scss/highlight/ascetic.scss new file mode 100644 index 0000000..5c9f947 --- /dev/null +++ b/assets/scss/highlight/ascetic.scss @@ -0,0 +1,42 @@ +/* + +Original style from softwaremaniacs.org (c) Ivan Sagalaev + +*/ +.highlight { + background: #fff; + color: #000; + .code { + .string, + .variable, + .template-variable, + .symbol, + .bullet, + .section, + .addition, + .attribute, + .link { + color: #888; + } + + .comment, + .quote, + .meta, + .deletion { + color: #ccc; + } + + .keyword, + .selector-tag, + .section, + .name, + .type, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/atelier-cave-dark.scss b/assets/scss/highlight/atelier-cave-dark.scss new file mode 100644 index 0000000..6be0626 --- /dev/null +++ b/assets/scss/highlight/atelier-cave-dark.scss @@ -0,0 +1,80 @@ +/* Base16 Atelier Cave Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #19171c; + color: #8b8792; + .code { + /* Atelier-Cave Comment */ + .comment, + .quote { + color: #7e7887; + } + + /* Atelier-Cave Red */ + .variable, + .template-variable, + .attribute, + .regexp, + .link, + .tag, + .name, + .selector-id, + .selector-class { + color: #be4678; + } + + /* Atelier-Cave Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #aa573c; + } + + /* Atelier-Cave Green */ + .string, + .symbol, + .bullet { + color: #2a9292; + } + + /* Atelier-Cave Blue */ + .title, + .section { + color: #576ddb; + } + + /* Atelier-Cave Purple */ + .keyword, + .selector-tag { + color: #955ae7; + } + + .deletion, + .addition { + color: #19171c; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #be4678; + } + + .addition { + background-color: #2a9292; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-cave-light.scss b/assets/scss/highlight/atelier-cave-light.scss new file mode 100644 index 0000000..b681325 --- /dev/null +++ b/assets/scss/highlight/atelier-cave-light.scss @@ -0,0 +1,82 @@ +/* Base16 Atelier Cave Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #efecf4; + color: #585260; + .code { + /* Atelier-Cave Comment */ + .comment, + .quote { + color: #655f6d; + } + + /* Atelier-Cave Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .name, + .selector-id, + .selector-class { + color: #be4678; + } + + /* Atelier-Cave Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #aa573c; + } + + /* Atelier-Cave Green */ + .string, + .symbol, + .bullet { + color: #2a9292; + } + + /* Atelier-Cave Blue */ + .title, + .section { + color: #576ddb; + } + + /* Atelier-Cave Purple */ + .keyword, + .selector-tag { + color: #955ae7; + } + + .deletion, + .addition { + color: #19171c; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #be4678; + } + + .addition { + background-color: #2a9292; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-dune-dark.scss b/assets/scss/highlight/atelier-dune-dark.scss new file mode 100644 index 0000000..ccc7271 --- /dev/null +++ b/assets/scss/highlight/atelier-dune-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Dune Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #20201d; + color: #a6a28c; + .code { + /* Atelier-Dune Comment */ + .comment, + .quote { + color: #999580; + } + + /* Atelier-Dune Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #d73737; + } + + /* Atelier-Dune Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #b65611; + } + + /* Atelier-Dune Green */ + .string, + .symbol, + .bullet { + color: #60ac39; + } + + /* Atelier-Dune Blue */ + .title, + .section { + color: #6684e1; + } + + /* Atelier-Dune Purple */ + .keyword, + .selector-tag { + color: #b854d4; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-dune-light.scss b/assets/scss/highlight/atelier-dune-light.scss new file mode 100644 index 0000000..17e74fd --- /dev/null +++ b/assets/scss/highlight/atelier-dune-light.scss @@ -0,0 +1,74 @@ +/* Base16 Atelier Dune Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #fefbec; + color: #6e6b5e; + .code { + /* Atelier-Dune Comment */ + .comment, + .quote { + color: #7d7a68; + } + + /* Atelier-Dune Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #d73737; + } + + /* Atelier-Dune Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #b65611; + } + + /* Atelier-Dune Green */ + .string, + .symbol, + .bullet { + color: #60ac39; + } + + /* Atelier-Dune Blue */ + .title, + .section { + color: #6684e1; + } + + /* Atelier-Dune Purple */ + .keyword, + .selector-tag { + color: #b854d4; + } + + .highlight { + background: #fefbec; + color: #6e6b5e; + display: block; + overflow-x: auto; + padding: 0.5em; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-estuary-dark.scss b/assets/scss/highlight/atelier-estuary-dark.scss new file mode 100644 index 0000000..43d3d78 --- /dev/null +++ b/assets/scss/highlight/atelier-estuary-dark.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Estuary Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/estuary) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #22221b; + color: #929181; + .code { + /* Atelier-Estuary Comment */ + .comment, + .quote { + color: #878573; + } + + /* Atelier-Estuary Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ba6236; + } + + /* Atelier-Estuary Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #ae7313; + } + + /* Atelier-Estuary Green */ + .string, + .symbol, + .bullet { + color: #7d9726; + } + + /* Atelier-Estuary Blue */ + .title, + .section { + color: #36a166; + } + + /* Atelier-Estuary Purple */ + .keyword, + .selector-tag { + color: #5f9182; + } + + .deletion, + .addition { + color: #22221b; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #ba6236; + } + + .addition { + background-color: #7d9726; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-estuary-light.scss b/assets/scss/highlight/atelier-estuary-light.scss new file mode 100644 index 0000000..276af90 --- /dev/null +++ b/assets/scss/highlight/atelier-estuary-light.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Estuary Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/estuary) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f4f3ec; + color: #5f5e4e; + .code { + /* Atelier-Estuary Comment */ + .comment, + .quote { + color: #6c6b5a; + } + + /* Atelier-Estuary Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ba6236; + } + + /* Atelier-Estuary Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #ae7313; + } + + /* Atelier-Estuary Green */ + .string, + .symbol, + .bullet { + color: #7d9726; + } + + /* Atelier-Estuary Blue */ + .title, + .section { + color: #36a166; + } + + /* Atelier-Estuary Purple */ + .keyword, + .selector-tag { + color: #5f9182; + } + + .deletion, + .addition { + color: #22221b; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #ba6236; + } + + .addition { + background-color: #7d9726; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-forest-dark.scss b/assets/scss/highlight/atelier-forest-dark.scss new file mode 100644 index 0000000..1b82478 --- /dev/null +++ b/assets/scss/highlight/atelier-forest-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Forest Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #1b1918; + color: #a8a19f; + .code { + /* Atelier-Forest Comment */ + .comment, + .quote { + color: #9c9491; + } + + /* Atelier-Forest Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #f22c40; + } + + /* Atelier-Forest Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #df5320; + } + + /* Atelier-Forest Green */ + .string, + .symbol, + .bullet { + color: #7b9726; + } + + /* Atelier-Forest Blue */ + .title, + .section { + color: #407ee7; + } + + /* Atelier-Forest Purple */ + .keyword, + .selector-tag { + color: #6666ea; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-forest-light.scss b/assets/scss/highlight/atelier-forest-light.scss new file mode 100644 index 0000000..19947cc --- /dev/null +++ b/assets/scss/highlight/atelier-forest-light.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Forest Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f1efee; + color: #68615e; + .code { + /* Atelier-Forest Comment */ + .comment, + .quote { + color: #766e6b; + } + + /* Atelier-Forest Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #f22c40; + } + + /* Atelier-Forest Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #df5320; + } + + /* Atelier-Forest Green */ + .string, + .symbol, + .bullet { + color: #7b9726; + } + + /* Atelier-Forest Blue */ + .title, + .section { + color: #407ee7; + } + + /* Atelier-Forest Purple */ + .keyword, + .selector-tag { + color: #6666ea; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-heath-dark.scss b/assets/scss/highlight/atelier-heath-dark.scss new file mode 100644 index 0000000..88613b3 --- /dev/null +++ b/assets/scss/highlight/atelier-heath-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Heath Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #1b181b; + color: #ab9bab; + .code { + /* Atelier-Heath Comment */ + .comment, + .quote { + color: #9e8f9e; + } + + /* Atelier-Heath Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ca402b; + } + + /* Atelier-Heath Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #a65926; + } + + /* Atelier-Heath Green */ + .string, + .symbol, + .bullet { + color: #918b3b; + } + + /* Atelier-Heath Blue */ + .title, + .section { + color: #516aec; + } + + /* Atelier-Heath Purple */ + .keyword, + .selector-tag { + color: #7b59c0; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-heath-light.scss b/assets/scss/highlight/atelier-heath-light.scss new file mode 100644 index 0000000..1aa21e2 --- /dev/null +++ b/assets/scss/highlight/atelier-heath-light.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Heath Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f7f3f7; + color: #695d69; + .code { + /* Atelier-Heath Comment */ + .comment, + .quote { + color: #776977; + } + + /* Atelier-Heath Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ca402b; + } + + /* Atelier-Heath Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #a65926; + } + + /* Atelier-Heath Green */ + .string, + .symbol, + .bullet { + color: #918b3b; + } + + /* Atelier-Heath Blue */ + .title, + .section { + color: #516aec; + } + + /* Atelier-Heath Purple */ + .keyword, + .selector-tag { + color: #7b59c0; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-lakeside-dark.scss b/assets/scss/highlight/atelier-lakeside-dark.scss new file mode 100644 index 0000000..0de9c77 --- /dev/null +++ b/assets/scss/highlight/atelier-lakeside-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Lakeside Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #161b1d; + color: #7ea2b4; + .code { + /* Atelier-Lakeside Comment */ + .comment, + .quote { + color: #7195a8; + } + + /* Atelier-Lakeside Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #d22d72; + } + + /* Atelier-Lakeside Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #935c25; + } + + /* Atelier-Lakeside Green */ + .string, + .symbol, + .bullet { + color: #568c3b; + } + + /* Atelier-Lakeside Blue */ + .title, + .section { + color: #257fad; + } + + /* Atelier-Lakeside Purple */ + .keyword, + .selector-tag { + color: #6b6bb8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-lakeside-light.scss b/assets/scss/highlight/atelier-lakeside-light.scss new file mode 100644 index 0000000..795e96e --- /dev/null +++ b/assets/scss/highlight/atelier-lakeside-light.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Lakeside Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #ebf8ff; + color: #516d7b; + .code { + /* Atelier-Lakeside Comment */ + .comment, + .quote { + color: #5a7b8c; + } + + /* Atelier-Lakeside Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #d22d72; + } + + /* Atelier-Lakeside Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #935c25; + } + + /* Atelier-Lakeside Green */ + .string, + .symbol, + .bullet { + color: #568c3b; + } + + /* Atelier-Lakeside Blue */ + .title, + .section { + color: #257fad; + } + + /* Atelier-Lakeside Purple */ + .keyword, + .selector-tag { + color: #6b6bb8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-plateau-dark.scss b/assets/scss/highlight/atelier-plateau-dark.scss new file mode 100644 index 0000000..8eb0024 --- /dev/null +++ b/assets/scss/highlight/atelier-plateau-dark.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Plateau Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/plateau) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #1b1818; + color: #8a8585; + .code { + /* Atelier-Plateau Comment */ + .comment, + .quote { + color: #7e7777; + } + + /* Atelier-Plateau Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ca4949; + } + + /* Atelier-Plateau Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #b45a3c; + } + + /* Atelier-Plateau Green */ + .string, + .symbol, + .bullet { + color: #4b8b8b; + } + + /* Atelier-Plateau Blue */ + .title, + .section { + color: #7272ca; + } + + /* Atelier-Plateau Purple */ + .keyword, + .selector-tag { + color: #8464c4; + } + + .deletion, + .addition { + color: #1b1818; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #ca4949; + } + + .addition { + background-color: #4b8b8b; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-plateau-light.scss b/assets/scss/highlight/atelier-plateau-light.scss new file mode 100644 index 0000000..59aa453 --- /dev/null +++ b/assets/scss/highlight/atelier-plateau-light.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Plateau Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/plateau) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f4ecec; + color: #585050; + .code { + /* Atelier-Plateau Comment */ + .comment, + .quote { + color: #655d5d; + } + + /* Atelier-Plateau Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #ca4949; + } + + /* Atelier-Plateau Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #b45a3c; + } + + /* Atelier-Plateau Green */ + .string, + .symbol, + .bullet { + color: #4b8b8b; + } + + /* Atelier-Plateau Blue */ + .title, + .section { + color: #7272ca; + } + + /* Atelier-Plateau Purple */ + .keyword, + .selector-tag { + color: #8464c4; + } + + .deletion, + .addition { + color: #1b1818; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #ca4949; + } + + .addition { + background-color: #4b8b8b; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-savanna-dark.scss b/assets/scss/highlight/atelier-savanna-dark.scss new file mode 100644 index 0000000..f421c8c --- /dev/null +++ b/assets/scss/highlight/atelier-savanna-dark.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Savanna Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/savanna) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #171c19; + color: #87928a; + .code { + /* Atelier-Savanna Comment */ + .comment, + .quote { + color: #78877d; + } + + /* Atelier-Savanna Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #b16139; + } + + /* Atelier-Savanna Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #9f713c; + } + + /* Atelier-Savanna Green */ + .string, + .symbol, + .bullet { + color: #489963; + } + + /* Atelier-Savanna Blue */ + .title, + .section { + color: #478c90; + } + + /* Atelier-Savanna Purple */ + .keyword, + .selector-tag { + color: #55859b; + } + + .deletion, + .addition { + color: #171c19; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #b16139; + } + + .addition { + background-color: #489963; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-savanna-light.scss b/assets/scss/highlight/atelier-savanna-light.scss new file mode 100644 index 0000000..6962fa4 --- /dev/null +++ b/assets/scss/highlight/atelier-savanna-light.scss @@ -0,0 +1,81 @@ +/* Base16 Atelier Savanna Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/savanna) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #ecf4ee; + color: #526057; + .code { + /* Atelier-Savanna Comment */ + .comment, + .quote { + color: #5f6d64; + } + + /* Atelier-Savanna Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #b16139; + } + + /* Atelier-Savanna Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #9f713c; + } + + /* Atelier-Savanna Green */ + .string, + .symbol, + .bullet { + color: #489963; + } + + /* Atelier-Savanna Blue */ + .title, + .section { + color: #478c90; + } + + /* Atelier-Savanna Purple */ + .keyword, + .selector-tag { + color: #55859b; + } + + .deletion, + .addition { + color: #171c19; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #b16139; + } + + .addition { + background-color: #489963; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-seaside-dark.scss b/assets/scss/highlight/atelier-seaside-dark.scss new file mode 100644 index 0000000..40db18c --- /dev/null +++ b/assets/scss/highlight/atelier-seaside-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Seaside Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #131513; + color: #8ca68c; + .code { + /* Atelier-Seaside Comment */ + .comment, + .quote { + color: #809980; + } + + /* Atelier-Seaside Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #e6193c; + } + + /* Atelier-Seaside Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #87711d; + } + + /* Atelier-Seaside Green */ + .string, + .symbol, + .bullet { + color: #29a329; + } + + /* Atelier-Seaside Blue */ + .title, + .section { + color: #3d62f5; + } + + /* Atelier-Seaside Purple */ + .keyword, + .selector-tag { + color: #ad2bee; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-seaside-light.scss b/assets/scss/highlight/atelier-seaside-light.scss new file mode 100644 index 0000000..f63295a --- /dev/null +++ b/assets/scss/highlight/atelier-seaside-light.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Seaside Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f4fbf4; + color: #5e6e5e; + .code { + /* Atelier-Seaside Comment */ + .comment, + .quote { + color: #687d68; + } + + /* Atelier-Seaside Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #e6193c; + } + + /* Atelier-Seaside Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #87711d; + } + + /* Atelier-Seaside Green */ + .string, + .symbol, + .bullet { + color: #29a329; + } + + /* Atelier-Seaside Blue */ + .title, + .section { + color: #3d62f5; + } + + /* Atelier-Seaside Purple */ + .keyword, + .selector-tag { + color: #ad2bee; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-sulphurpool-dark.scss b/assets/scss/highlight/atelier-sulphurpool-dark.scss new file mode 100644 index 0000000..25d6e7d --- /dev/null +++ b/assets/scss/highlight/atelier-sulphurpool-dark.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Sulphurpool Dark - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/sulphurpool) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #202746; + color: #979db4; + .code { + /* Atelier-Sulphurpool Comment */ + .comment, + .quote { + color: #898ea4; + } + + /* Atelier-Sulphurpool Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #c94922; + } + + /* Atelier-Sulphurpool Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #c76b29; + } + + /* Atelier-Sulphurpool Green */ + .string, + .symbol, + .bullet { + color: #ac9739; + } + + /* Atelier-Sulphurpool Blue */ + .title, + .section { + color: #3d8fd1; + } + + /* Atelier-Sulphurpool Purple */ + .keyword, + .selector-tag { + color: #6679cc; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/atelier-sulphurpool-light.scss b/assets/scss/highlight/atelier-sulphurpool-light.scss new file mode 100644 index 0000000..e6bf082 --- /dev/null +++ b/assets/scss/highlight/atelier-sulphurpool-light.scss @@ -0,0 +1,66 @@ +/* Base16 Atelier Sulphurpool Light - Theme */ +/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/sulphurpool) */ +/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */ +.highlight { + background: #f5f7ff; + color: #5e6687; + .code { + /* Atelier-Sulphurpool Comment */ + .comment, + .quote { + color: #6b7394; + } + + /* Atelier-Sulphurpool Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .regexp, + .link, + .name, + .selector-id, + .selector-class { + color: #c94922; + } + + /* Atelier-Sulphurpool Orange */ + .number, + .meta, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #c76b29; + } + + /* Atelier-Sulphurpool Green */ + .string, + .symbol, + .bullet { + color: #ac9739; + } + + /* Atelier-Sulphurpool Blue */ + .title, + .section { + color: #3d8fd1; + } + + /* Atelier-Sulphurpool Purple */ + .keyword, + .selector-tag { + color: #6679cc; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/brown-paper.scss b/assets/scss/highlight/brown-paper.scss new file mode 100644 index 0000000..b452809 --- /dev/null +++ b/assets/scss/highlight/brown-paper.scss @@ -0,0 +1,62 @@ +/* + +Brown Paper style from goldblog.com.ua (c) Zaripov Yura + +*/ +.highlight { + background: #b7a68e url('./brown-papersq.png'); + color: #363c69; + .code { + .keyword, + .selector-tag, + .literal { + color: #059; + font-weight: bold; + } + + .highlight, + .subst { + color: #363c69; + } + + .string, + .title, + .section, + .type, + .attribute, + .symbol, + .bullet, + .built_in, + .addition, + .variable, + .template-tag, + .template-variable, + .link, + .name { + color: #2c009f; + } + + .comment, + .quote, + .meta, + .deletion { + color: #802022; + } + + .keyword, + .selector-tag, + .literal, + .doctag, + .title, + .section, + .type, + .name, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/brown-papersq.png b/assets/scss/highlight/brown-papersq.png new file mode 100644 index 0000000..3813903 Binary files /dev/null and b/assets/scss/highlight/brown-papersq.png differ diff --git a/assets/scss/highlight/codepen-embed.scss b/assets/scss/highlight/codepen-embed.scss new file mode 100644 index 0000000..d7b3da6 --- /dev/null +++ b/assets/scss/highlight/codepen-embed.scss @@ -0,0 +1,57 @@ +/* + codepen.io Embed Theme + Author: Justin Perry + Original theme - https://github.com/chriskempson/tomorrow-theme +*/ +.highlight { + background: #222; + color: #fff; + .code { + .comment, + .quote { + color: #777; + } + + .variable, + .template-variable, + .tag, + .regexp, + .meta, + .number, + .built_in, + .builtin-name, + .literal, + .params, + .symbol, + .bullet, + .link, + .deletion { + color: #ab875d; + } + + .section, + .title, + .name, + .selector-id, + .selector-class, + .type, + .attribute { + color: #9b869b; + } + + .string, + .keyword, + .selector-tag, + .addition { + color: #8f9c6c; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/color-brewer.scss b/assets/scss/highlight/color-brewer.scss new file mode 100644 index 0000000..c2aff2e --- /dev/null +++ b/assets/scss/highlight/color-brewer.scss @@ -0,0 +1,66 @@ +/* + +Colorbrewer theme +Original: https://github.com/mbostock/colorbrewer-theme (c) Mike Bostock +Ported by Fabrício Tavares de Oliveira + +*/ +.highlight { + background: #fff; + color: #000; + .code { + .subst { + color: #000; + } + + .string, + .meta, + .symbol, + .template-tag, + .template-variable, + .addition { + color: #756bb1; + } + + .comment, + .quote { + color: #636363; + } + + .number, + .regexp, + .literal, + .bullet, + .link { + color: #31a354; + } + + .deletion, + .variable { + color: #88f; + } + + .keyword, + .selector-tag, + .title, + .section, + .built_in, + .doctag, + .type, + .tag, + .name, + .selector-id, + .selector-class, + .strong { + color: #3182bd; + } + + .emphasis { + font-style: italic; + } + + .attribute { + color: #e6550d; + } + } +} diff --git a/assets/scss/highlight/dark.scss b/assets/scss/highlight/dark.scss new file mode 100644 index 0000000..622701d --- /dev/null +++ b/assets/scss/highlight/dark.scss @@ -0,0 +1,60 @@ +/* + +Dark style from softwaremaniacs.org (c) Ivan Sagalaev + +*/ +.highlight { + background: #444; + color: #ddd; + .code { + .keyword, + .selector-tag, + .literal, + .section, + .link { + color: #fff; + } + + .subst { + color: #ddd; + } + + .string, + .title, + .name, + .type, + .attribute, + .symbol, + .bullet, + .built_in, + .addition, + .variable, + .template-tag, + .template-variable { + color: #d88; + } + + .comment, + .quote, + .deletion, + .meta { + color: #777; + } + + .keyword, + .selector-tag, + .literal, + .title, + .section, + .doctag, + .type, + .name, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/darkula.scss b/assets/scss/highlight/darkula.scss new file mode 100644 index 0000000..786204c --- /dev/null +++ b/assets/scss/highlight/darkula.scss @@ -0,0 +1,67 @@ +/* + +Darkula color scheme from the JetBrains family of IDEs + +*/ +.highlight { + background: #2b2b2b; + color: #bababa; + .code { + .strong, + .emphasis { + color: #a8a8a2; + } + + .bullet, + .quote, + .link, + .number, + .regexp, + .literal { + color: #6896ba; + } + + .code, + .selector-class { + color: #a6e22e; + } + + .emphasis { + font-style: italic; + } + + .keyword, + .selector-tag, + .section, + .attribute, + .name, + .variable { + color: #cb7832; + } + + .params { + color: #b9b9b9; + } + + .string, + .subst, + .type, + .built_in, + .builtin-name, + .symbol, + .selector-id, + .selector-attr, + .selector-pseudo, + .template-tag, + .template-variable, + .addition { + color: #e0c46c; + } + + .comment, + .deletion, + .meta { + color: #7f7f7f; + } + } +} diff --git a/assets/scss/highlight/docco.scss b/assets/scss/highlight/docco.scss new file mode 100644 index 0000000..61c71c0 --- /dev/null +++ b/assets/scss/highlight/docco.scss @@ -0,0 +1,94 @@ +/* +Docco style used in http://jashkenas.github.com/docco/ converted by Simon Madine (@thingsinjars) +*/ +.highlight { + background: #f8f8ff; + color: #000; + .code { + .comment, + .quote { + color: #408080; + font-style: italic; + } + + .keyword, + .selector-tag, + .literal, + .subst { + color: #954121; + } + + .number { + color: #40a070; + } + + .string, + .doctag { + color: #219161; + } + + .selector-id, + .selector-class, + .section, + .type { + color: #19469d; + } + + .params { + color: #00f; + } + + .title { + color: #458; + font-weight: bold; + } + + .tag, + .name, + .attribute { + color: #000080; + font-weight: normal; + } + + .variable, + .template-variable { + color: #008080; + } + + .regexp, + .link { + color: #b68; + } + + .symbol, + .bullet { + color: #990073; + } + + .built_in, + .builtin-name { + color: #0086b3; + } + + .meta { + color: #999; + font-weight: bold; + } + + .deletion { + background: #fdd; + } + + .addition { + background: #dfd; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/far.scss b/assets/scss/highlight/far.scss new file mode 100644 index 0000000..3ca4f17 --- /dev/null +++ b/assets/scss/highlight/far.scss @@ -0,0 +1,68 @@ +/* + +FAR Style (c) MajestiC + +*/ +.highlight { + background: #000080; + color: #0ff; + .code { + .subst { + color: #0ff; + } + + .string, + .attribute, + .symbol, + .bullet, + .built_in, + .builtin-name, + .template-tag, + .template-variable, + .addition { + color: #ff0; + } + + .keyword, + .selector-tag, + .section, + .type, + .name, + .selector-id, + .selector-class, + .variable { + color: #fff; + } + + .comment, + .quote, + .doctag, + .deletion { + color: #888; + } + + .number, + .regexp, + .literal, + .link { + color: #0f0; + } + + .meta { + color: #008080; + } + + .keyword, + .selector-tag, + .title, + .section, + .name, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/foundation.scss b/assets/scss/highlight/foundation.scss new file mode 100644 index 0000000..3e509f1 --- /dev/null +++ b/assets/scss/highlight/foundation.scss @@ -0,0 +1,86 @@ +/* +Description: Foundation 4 docs style for highlight.js +Author: Dan Allen +Website: http://foundation.zurb.com/docs/ +Version: 1.0 +Date: 2013-04-02 +*/ +.highlight { + background: #eee; + color: #000; + .code { + .link, + .emphasis, + .attribute, + .addition { + color: #070; + } + + .emphasis { + font-style: italic; + } + + .strong, + .string, + .deletion { + color: #d14; + } + + .strong { + font-weight: bold; + } + + .quote, + .comment { + color: #998; + font-style: italic; + } + + .section, + .title { + color: #900; + } + + .class .title, + .type { + color: #458; + } + + .variable, + .template-variable { + color: #369; + } + + .bullet { + color: #970; + } + + .meta { + color: #34b; + } + + .code, + .number, + .literal, + .keyword, + .selector-tag { + color: #099; + } + + .regexp { + background-color: #fff0ff; + color: #808; + } + + .symbol { + color: #990073; + } + + .tag, + .name, + .selector-id, + .selector-class { + color: #070; + } + } +} diff --git a/assets/scss/highlight/github-gist.scss b/assets/scss/highlight/github-gist.scss new file mode 100644 index 0000000..b1fdc10 --- /dev/null +++ b/assets/scss/highlight/github-gist.scss @@ -0,0 +1,68 @@ +/** + * GitHub Gist Theme + * Author : Louis Barranqueiro - https://github.com/LouisBarranqueiro + */ +.highlight { + color: #333; + padding: 0.5em; + .code { + .comment, + .meta { + color: #969896; + } + + .string, + .variable, + .template-variable, + .strong, + .emphasis, + .quote { + color: #df5000; + } + + .keyword, + .selector-tag, + .type { + color: #a71d5d; + } + + .literal, + .symbol, + .bullet, + .attribute { + color: #0086b3; + } + + .section, + .name { + color: #63a35c; + } + + .tag { + color: #333; + } + + .title, + .attr, + .selector-id, + .selector-class, + .selector-attr, + .selector-pseudo { + color: #795da3; + } + + .addition { + background-color: #eaffea; + color: #55a532; + } + + .deletion { + background-color: #ffecec; + color: #bd2c00; + } + + .link { + text-decoration: underline; + } + } +} diff --git a/assets/scss/highlight/github.scss b/assets/scss/highlight/github.scss new file mode 100644 index 0000000..a64bce5 --- /dev/null +++ b/assets/scss/highlight/github.scss @@ -0,0 +1,96 @@ +/* + +github.com style (c) Vasily Polovnyov + +*/ +.highlight { + background: #f8f8f8; + color: #333; + .code { + .comment, + .quote { + color: #998; + font-style: italic; + } + + .keyword, + .selector-tag, + .subst { + color: #333; + font-weight: bold; + } + + .number, + .literal, + .variable, + .template-variable, + .tag .attr { + color: #008080; + } + + .string, + .doctag { + color: #d14; + } + + .title, + .section, + .selector-id { + color: #900; + font-weight: bold; + } + + .subst { + font-weight: normal; + } + + .type, + .class .title { + color: #458; + font-weight: bold; + } + + .tag, + .name, + .attribute { + color: #000080; + font-weight: normal; + } + + .regexp, + .link { + color: #009926; + } + + .symbol, + .bullet { + color: #990073; + } + + .built_in, + .builtin-name { + color: #0086b3; + } + + .meta { + color: #999; + font-weight: bold; + } + + .deletion { + background: #fdd; + } + + .addition { + background: #dfd; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/googlecode.scss b/assets/scss/highlight/googlecode.scss new file mode 100644 index 0000000..44b4ca0 --- /dev/null +++ b/assets/scss/highlight/googlecode.scss @@ -0,0 +1,86 @@ +/* + +Google Code style (c) Aahan Krish + +*/ +.highlight { + background: #fff; + color: #000; + .code { + .comment, + .quote { + color: #800; + } + + .keyword, + .selector-tag, + .section, + .title, + .name { + color: #008; + } + + .variable, + .template-variable { + color: #660; + } + + .string, + .selector-attr, + .selector-pseudo, + .regexp { + color: #080; + } + + .literal, + .symbol, + .bullet, + .meta, + .number, + .link { + color: #066; + } + + .title, + .doctag, + .type, + .attr, + .built_in, + .builtin-name, + .params { + color: #606; + } + + .attribute, + .subst { + color: #000; + } + + .formula { + background-color: #eee; + font-style: italic; + } + + .selector-id, + .selector-class { + color: #9b703f; + } + + .addition { + background-color: #baeeba; + } + + .deletion { + background-color: #ffc8bd; + } + + .doctag, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/grayscale.scss b/assets/scss/highlight/grayscale.scss new file mode 100644 index 0000000..ee64360 --- /dev/null +++ b/assets/scss/highlight/grayscale.scss @@ -0,0 +1,103 @@ +/* + +grayscale style (c) MY Sun + +*/ +.highlight { + background: #fff; + color: #333; + .code { + .comment, + .quote { + color: #777; + font-style: italic; + } + + .keyword, + .selector-tag, + .subst { + color: #333; + font-weight: bold; + } + + .number, + .literal { + color: #777; + } + + .string, + .doctag, + .formula { + background: url('data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAJ0lEQVQIW2O8e/fufwYGBgZBQUEQxcCIIfDu3Tuwivfv30NUoAsAALHpFMMLqZlPAAAAAElFTkSuQmCC') + repeat; + color: #333; + } + + .title, + .section, + .selector-id { + color: #000; + font-weight: bold; + } + + .subst { + font-weight: normal; + } + + .class .title, + .type, + .name { + color: #333; + font-weight: bold; + } + + .tag { + color: #333; + } + + .regexp { + background: url('data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAICAYAAADA+m62AAAAPUlEQVQYV2NkQAN37979r6yszIgujiIAU4RNMVwhuiQ6H6wQl3XI4oy4FMHcCJPHcDS6J2A2EqUQpJhohQDexSef15DBCwAAAABJRU5ErkJggg==') + repeat; + color: #333; + } + + .symbol, + .bullet, + .link { + background: url('data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAKElEQVQIW2NkQAO7d+/+z4gsBhJwdXVlhAvCBECKwIIwAbhKZBUwBQA6hBpm5efZsgAAAABJRU5ErkJggg==') + repeat; + color: #000; + } + + .built_in, + .builtin-name { + color: #000; + text-decoration: underline; + } + + .meta { + color: #999; + font-weight: bold; + } + + .deletion { + background: url('data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAE0lEQVQIW2MMDQ39zzhz5kwIAQAyxweWgUHd1AAAAABJRU5ErkJggg==') + repeat; + color: #fff; + } + + .addition { + background: url('data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAALUlEQVQYV2N89+7dfwYk8P79ewZBQUFkIQZGOiu6e/cuiptQHAPl0NtNxAQBAM97Oejj3Dg7AAAAAElFTkSuQmCC') + repeat; + color: #000; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/highlightjs.scss b/assets/scss/highlight/highlightjs.scss new file mode 100644 index 0000000..a6aad73 --- /dev/null +++ b/assets/scss/highlight/highlightjs.scss @@ -0,0 +1,74 @@ +/* + +Original highlight.js style (c) Ivan Sagalaev + +*/ +.highlight { + background: #f0f0f0; + color: #444; + .code { + .subst { + color: #444; + } + + .keyword, + .attribute, + .selector-tag, + .meta-keyword, + .doctag, + .name { + font-weight: bold; + } + + .built_in, + .literal, + .bullet, + .code, + .addition { + color: #1f811f; + } + + .regexp, + .symbol, + .variable, + .template-variable, + .link, + .selector-attr, + .selector-pseudo { + color: #bc6060; + } + + .type, + .string, + .number, + .selector-id, + .selector-class, + .quote, + .template-tag, + .deletion { + color: #800; + } + + .title, + .section { + color: #800; + font-weight: bold; + } + + .comment { + color: #888; + } + + .meta { + color: #2b6ea1; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/hopscotch.scss b/assets/scss/highlight/hopscotch.scss new file mode 100644 index 0000000..a88bf50 --- /dev/null +++ b/assets/scss/highlight/hopscotch.scss @@ -0,0 +1,81 @@ +/* + * Hopscotch + * by Jan T. Sott + * https://github.com/idleberg/Hopscotch + * + * This work is licensed under the Creative Commons CC0 1.0 Universal License + */ +.highlight { + background: #322931; + color: #b9b5b8; + .code { + /* Comment */ + .comment, + .quote { + color: #989498; + } + + /* Red */ + .variable, + .template-variable, + .attribute, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .link, + .deletion { + color: #dd464c; + } + + /* Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params { + color: #fd8b19; + } + + /* Yellow */ + .class .title { + color: #fdcc59; + } + + /* Green */ + .string, + .symbol, + .bullet, + .addition { + color: #8fc13e; + } + + /* Aqua */ + .meta { + color: #149b93; + } + + /* Blue */ + .function, + .section, + .title { + color: #1290bf; + } + + /* Purple */ + .keyword, + .selector-tag { + color: #c85e7c; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/hybrid.scss b/assets/scss/highlight/hybrid.scss new file mode 100644 index 0000000..ca294ce --- /dev/null +++ b/assets/scss/highlight/hybrid.scss @@ -0,0 +1,96 @@ +/* + +vim-hybrid theme by w0ng (https://github.com/w0ng/vim-hybrid) + +*/ + +/*background color*/ +.highlight { + background: #1d1f21; + color: #c5c8c6; + /*selection color*/ + &::selection, + span::selection { + background: #373b41; + } + + &::-moz-selection, + span::-moz-selection { + background: #373b41; + } + + .code { + /*color: fg_yellow*/ + .title, + .name { + color: #f0c674; + } + + /*color: fg_comment*/ + .comment, + .meta, + .meta .keyword { + color: #707880; + } + + /*color: fg_red*/ + .number, + .symbol, + .literal, + .deletion, + .link { + color: #c66; + } + + /*color: fg_green*/ + .string, + .doctag, + .addition, + .regexp, + .selector-attr, + .selector-pseudo { + color: #b5bd68; + } + + /*color: fg_purple*/ + .attribute, + .code, + .selector-id { + color: #b294bb; + } + + /*color: fg_blue*/ + .keyword, + .selector-tag, + .bullet, + .tag { + color: #81a2be; + } + + /*color: fg_aqua*/ + .subst, + .variable, + .template-tag, + .template-variable { + color: #8abeb7; + } + + /*color: fg_orange*/ + .type, + .built_in, + .builtin-name, + .quote, + .section, + .selector-class { + color: #de935f; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/idea.scss b/assets/scss/highlight/idea.scss new file mode 100644 index 0000000..71b8d0a --- /dev/null +++ b/assets/scss/highlight/idea.scss @@ -0,0 +1,94 @@ +/* + +Intellij Idea-like styling (c) Vasily Polovnyov + +*/ +.highlight { + background: #fff; + color: #000; + .code { + .subst, + .title { + color: #000; + font-weight: normal; + } + + .comment, + .quote { + color: #808080; + font-style: italic; + } + + .meta { + color: #808000; + } + + .tag { + background: #efefef; + } + + .section, + .name, + .literal, + .keyword, + .selector-tag, + .type, + .selector-id, + .selector-class { + color: #000080; + font-weight: bold; + } + + .attribute, + .number, + .regexp, + .link { + color: #00f; + font-weight: bold; + } + + .number, + .regexp, + .link { + font-weight: normal; + } + + .string { + color: #008000; + font-weight: bold; + } + + .symbol, + .bullet, + .formula { + background: #d0eded; + color: #000; + font-style: italic; + } + + .doctag { + text-decoration: underline; + } + + .variable, + .template-variable { + color: #660e7a; + } + + .addition { + background: #baeeba; + } + + .deletion { + background: #ffc8bd; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/index.scss b/assets/scss/highlight/index.scss new file mode 100644 index 0000000..0dfcf23 --- /dev/null +++ b/assets/scss/highlight/index.scss @@ -0,0 +1,102 @@ +.highlight { + background: $color-white; + color: #4d4d4c; + display: block; + font-family: $font-mono; + font-size: $font-size; + line-height: (($font-size/16px) * 1.6em); + margin: 0; + overflow-x: auto; + padding: 15px 20px; + + table { + margin: 0; + width: auto; + + td { + border: 0; + + &.code { + padding-right: 20px; + } + } + } + + .gutter { + pre { + color: #666; + padding-right: 20px; + text-align: right; + } + } + + .code { + .comment, + .quote { + color: #8e908c; + } + + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #c82829; + } + + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #f5871f; + } + + .attribute { + color: #eab700; + } + + .string, + .symbol, + .bullet, + .addition { + color: #718c00; + } + + .title, + .section { + color: #4271ae; + } + + .keyword, + .selector-tag { + color: #8959a8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} + +.article-entry { + .highlight { + margin: 1.6em 0; + + .line { + height: 1.6em; + } + } +} + +@import 'monokai'; diff --git a/assets/scss/highlight/ir-black.scss b/assets/scss/highlight/ir-black.scss new file mode 100644 index 0000000..2713aad --- /dev/null +++ b/assets/scss/highlight/ir-black.scss @@ -0,0 +1,70 @@ +/* + IR_Black style (c) Vasily Mikhailitchenko +*/ +.highlight { + background: #000; + color: #f8f8f8; + .code { + .comment, + .quote, + .meta { + color: #7c7c7c; + } + + .keyword, + .selector-tag, + .tag, + .name { + color: #96cbfe; + } + + .attribute, + .selector-id { + color: #ffffb6; + } + + .string, + .selector-attr, + .selector-pseudo, + .addition { + color: #a8ff60; + } + + .subst { + color: #daefa3; + } + + .regexp, + .link { + color: #e9c062; + } + + .title, + .section, + .type, + .doctag { + color: #ffffb6; + } + + .symbol, + .bullet, + .variable, + .template-variable, + .literal { + color: #c6c5fe; + } + + .number, + .deletion { + color: #ff73fd; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/kimbie.dark.scss b/assets/scss/highlight/kimbie.dark.scss new file mode 100644 index 0000000..936fd35 --- /dev/null +++ b/assets/scss/highlight/kimbie.dark.scss @@ -0,0 +1,71 @@ +/* + Name: Kimbie (dark) + Author: Jan T. Sott + License: Creative Commons Attribution-ShareAlike 4.0 Unported License + URL: https://github.com/idleberg/Kimbie-highlight.js +*/ +.highlight { + background: #221a0f; + color: #d3af86; + .code { + /* Kimbie Comment */ + .comment, + .quote { + color: #d6baad; + } + + /* Kimbie Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .meta { + color: #dc3958; + } + + /* Kimbie Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .deletion, + .link { + color: #f79a32; + } + + /* Kimbie Yellow */ + .title, + .section, + .attribute { + color: #f06431; + } + + /* Kimbie Green */ + .string, + .symbol, + .bullet, + .addition { + color: #889b4a; + } + + /* Kimbie Purple */ + .keyword, + .selector-tag, + .function { + color: #98676a; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/kimbie.light.scss b/assets/scss/highlight/kimbie.light.scss new file mode 100644 index 0000000..9e12e3a --- /dev/null +++ b/assets/scss/highlight/kimbie.light.scss @@ -0,0 +1,71 @@ +/* + Name: Kimbie (light) + Author: Jan T. Sott + License: Creative Commons Attribution-ShareAlike 4.0 Unported License + URL: https://github.com/idleberg/Kimbie-highlight.js +*/ +.highlight { + background: #fbebd4; + color: #84613d; + .code { + /* Kimbie Comment */ + .comment, + .quote { + color: #a57a4c; + } + + /* Kimbie Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .meta { + color: #dc3958; + } + + /* Kimbie Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .deletion, + .link { + color: #f79a32; + } + + /* Kimbie Yellow */ + .title, + .section, + .attribute { + color: #f06431; + } + + /* Kimbie Green */ + .string, + .symbol, + .bullet, + .addition { + color: #889b4a; + } + + /* Kimbie Purple */ + .keyword, + .selector-tag, + .function { + color: #98676a; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/magula.scss b/assets/scss/highlight/magula.scss new file mode 100644 index 0000000..bd4e369 --- /dev/null +++ b/assets/scss/highlight/magula.scss @@ -0,0 +1,67 @@ +/* +Description: Magula style for highligh.js +Author: Ruslan Keba +Website: http://rukeba.com/ +Version: 1.0 +Date: 2009-01-03 +Music: Aphex Twin / Xtal +*/ +.highlight { + background-color: #f4f4f4; + .code { + .highlight, + .subst { + color: #000; + } + + .string, + .title, + .symbol, + .bullet, + .attribute, + .addition, + .variable, + .template-tag, + .template-variable { + color: #050; + } + + .comment, + .quote { + color: #777; + } + + .number, + .regexp, + .literal, + .type, + .link { + color: #800; + } + + .deletion, + .meta { + color: #00e; + } + + .keyword, + .selector-tag, + .doctag, + .title, + .section, + .built_in, + .tag, + .name { + color: #000080; + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/mono-blue.scss b/assets/scss/highlight/mono-blue.scss new file mode 100644 index 0000000..91f70f6 --- /dev/null +++ b/assets/scss/highlight/mono-blue.scss @@ -0,0 +1,54 @@ +/* + Five-color theme from a single blue hue. +*/ +.highlight { + background: #eaeef3; + color: #00193a; + .code { + .keyword, + .selector-tag, + .title, + .section, + .doctag, + .name, + .strong { + font-weight: bold; + } + + .comment { + color: #738191; + } + + .string, + .title, + .section, + .built_in, + .literal, + .type, + .addition, + .tag, + .quote, + .name, + .selector-id, + .selector-class { + color: #0048ab; + } + + .meta, + .subst, + .symbol, + .regexp, + .attribute, + .deletion, + .variable, + .template-variable, + .link, + .bullet { + color: #4c81c9; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/monokai-sublime.scss b/assets/scss/highlight/monokai-sublime.scss new file mode 100644 index 0000000..5039fd1 --- /dev/null +++ b/assets/scss/highlight/monokai-sublime.scss @@ -0,0 +1,81 @@ +/* + +Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/ + +*/ +.highlight { + background: #23241f; + color: #f8f8f2; + .code { + .highlight, + .tag, + .subst { + color: #f8f8f2; + } + + .strong, + .emphasis { + color: #a8a8a2; + } + + .bullet, + .quote, + .number, + .regexp, + .literal, + .link { + color: #ae81ff; + } + + .code, + .title, + .section, + .selector-class { + color: #a6e22e; + } + + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + + .keyword, + .selector-tag, + .name, + .attr { + color: #f92672; + } + + .symbol, + .attribute { + color: #66d9ef; + } + + .params, + .class .title { + color: #f8f8f2; + } + + .string, + .type, + .built_in, + .builtin-name, + .selector-id, + .selector-attr, + .selector-pseudo, + .addition, + .variable, + .template-variable { + color: #e6db74; + } + + .comment, + .deletion, + .meta { + color: #75715e; + } + } +} diff --git a/assets/scss/highlight/monokai.scss b/assets/scss/highlight/monokai.scss new file mode 100644 index 0000000..03faf40 --- /dev/null +++ b/assets/scss/highlight/monokai.scss @@ -0,0 +1,68 @@ +/* +Monokai style - ported by Luigi Maselli - http://grigio.org +*/ +.highlight { + background: #272822; + color: #ddd; + .code { + .tag, + .keyword, + .selector-tag, + .literal, + .strong, + .name { + color: #f92672; + } + + .code { + color: #66d9ef; + } + + .class .title { + color: #fff; + } + + .attribute, + .symbol, + .regexp, + .link { + color: #bf79db; + } + + .string, + .bullet, + .subst, + .title, + .section, + .emphasis, + .type, + .built_in, + .builtin-name, + .selector-attr, + .selector-pseudo, + .addition, + .variable, + .template-tag, + .template-variable { + color: #a6e22e; + } + + .comment, + .quote, + .deletion, + .meta { + color: #75715e; + } + + .keyword, + .selector-tag, + .literal, + .doctag, + .title, + .section, + .type, + .selector-id { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/obsidian.scss b/assets/scss/highlight/obsidian.scss new file mode 100644 index 0000000..f253d84 --- /dev/null +++ b/assets/scss/highlight/obsidian.scss @@ -0,0 +1,82 @@ +/** + * Obsidian style + * ported by Alexander Marenin (http://github.com/ioncreature) + */ +.highlight { + background: #282b2e; + color: #e0e2e4; + .code { + .keyword, + .selector-tag, + .literal, + .selector-id { + color: #93c763; + } + + .number { + color: #ffcd22; + } + + .attribute { + color: #668bb0; + } + + .code, + .class .title, + .section { + color: #fff; + } + + .regexp, + .link { + color: #d39745; + } + + .meta { + color: #557182; + } + + .tag, + .name, + .bullet, + .subst, + .emphasis, + .type, + .built_in, + .selector-attr, + .selector-pseudo, + .addition, + .variable, + .template-tag, + .template-variable { + color: #8cbbad; + } + + .string, + .symbol { + color: #ec7600; + } + + .comment, + .quote, + .deletion { + color: #818e96; + } + + .selector-class { + color: #a082bd; + } + + .keyword, + .selector-tag, + .literal, + .doctag, + .title, + .section, + .type, + .name, + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/paraiso-dark.scss b/assets/scss/highlight/paraiso-dark.scss new file mode 100644 index 0000000..26a27d5 --- /dev/null +++ b/assets/scss/highlight/paraiso-dark.scss @@ -0,0 +1,69 @@ +/* + Paraíso (dark) + Created by Jan T. Sott (http://github.com/idleberg) + Inspired by the art of Rubens LP (http://www.rubenslp.com.br) +*/ +.highlight { + background: #2f1e2e; + color: #a39e9b; + .code { + /* Paraíso Comment */ + .comment, + .quote { + color: #8d8687; + } + + /* Paraíso Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .link, + .meta { + color: #ef6155; + } + + /* Paraíso Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .deletion { + color: #f99b15; + } + + /* Paraíso Yellow */ + .title, + .section, + .attribute { + color: #fec418; + } + + /* Paraíso Green */ + .string, + .symbol, + .bullet, + .addition { + color: #48b685; + } + + /* Paraíso Purple */ + .keyword, + .selector-tag { + color: #815ba4; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/paraiso-light.scss b/assets/scss/highlight/paraiso-light.scss new file mode 100644 index 0000000..8e6fe8f --- /dev/null +++ b/assets/scss/highlight/paraiso-light.scss @@ -0,0 +1,69 @@ +/* + Paraíso (light) + Created by Jan T. Sott (http://github.com/idleberg) + Inspired by the art of Rubens LP (http://www.rubenslp.com.br) +*/ +.highlight { + background: #e7e9db; + color: #4f424c; + .code { + /* Paraíso Comment */ + .comment, + .quote { + color: #776e71; + } + + /* Paraíso Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .link, + .meta { + color: #ef6155; + } + + /* Paraíso Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .deletion { + color: #f99b15; + } + + /* Paraíso Yellow */ + .title, + .section, + .attribute { + color: #fec418; + } + + /* Paraíso Green */ + .string, + .symbol, + .bullet, + .addition { + color: #48b685; + } + + /* Paraíso Purple */ + .keyword, + .selector-tag { + color: #815ba4; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/pojoaque.jpg b/assets/scss/highlight/pojoaque.jpg new file mode 100644 index 0000000..9c07d4a Binary files /dev/null and b/assets/scss/highlight/pojoaque.jpg differ diff --git a/assets/scss/highlight/pojoaque.scss b/assets/scss/highlight/pojoaque.scss new file mode 100644 index 0000000..d88084e --- /dev/null +++ b/assets/scss/highlight/pojoaque.scss @@ -0,0 +1,80 @@ +/* + +Pojoaque Style by Jason Tate +http://web-cms-designs.com/ftopict-10-pojoaque-style-for-highlight-js-code-highlighter.html +Based on Solarized Style from http://ethanschoonover.com/solarized + +*/ +.highlight { + background: url('./pojoaque.jpg') repeat scroll left top #181914; + color: #dccf8f; + .code { + .comment, + .quote { + color: #586e75; + font-style: italic; + } + + .keyword, + .selector-tag, + .literal, + .addition { + color: #b64926; + } + + .number, + .string, + .doctag, + .regexp { + color: #468966; + } + + .title, + .section, + .built_in, + .name { + color: #ffb03b; + } + + .variable, + .template-variable, + .class .title, + .type, + .tag { + color: #b58900; + } + + .attribute { + color: #b89859; + } + + .symbol, + .bullet, + .link, + .subst, + .meta { + color: #cb4b16; + } + + .deletion { + color: #dc322f; + } + + .selector-id, + .selector-class { + color: #d3a60c; + } + + .formula { + background: #073642; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/railscasts.scss b/assets/scss/highlight/railscasts.scss new file mode 100644 index 0000000..e8e9808 --- /dev/null +++ b/assets/scss/highlight/railscasts.scss @@ -0,0 +1,102 @@ +/* + +Railscasts-like style (c) Visoft, Inc. (Damien White) + +*/ +.highlight { + background: #232323; + color: #e6e1dc; + .code { + .comment, + .quote { + color: #bc9458; + font-style: italic; + } + + .keyword, + .selector-tag { + color: #c26230; + } + + .string, + .number, + .regexp, + .variable, + .template-variable { + color: #a5c261; + } + + .subst { + color: #519f50; + } + + .tag, + .name { + color: #e8bf6a; + } + + .type { + color: #da4939; + } + + .symbol, + .bullet, + .built_in, + .builtin-name, + .attr, + .link { + color: #6d9cbe; + } + + .params { + color: #d0d0ff; + } + + .attribute { + color: #cda869; + } + + .meta { + color: #9b859d; + } + + .title, + .section { + color: #ffc66d; + } + + .addition { + background-color: #144212; + color: #e6e1dc; + display: inline-block; + width: 100%; + } + + .deletion { + background-color: #600; + color: #e6e1dc; + display: inline-block; + width: 100%; + } + + .selector-class { + color: #9b703f; + } + + .selector-id { + color: #8b98ab; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + + .link { + text-decoration: underline; + } + } +} diff --git a/assets/scss/highlight/rainbow.scss b/assets/scss/highlight/rainbow.scss new file mode 100644 index 0000000..0447921 --- /dev/null +++ b/assets/scss/highlight/rainbow.scss @@ -0,0 +1,81 @@ +/* + +Style with support for rainbow parens + +*/ +.highlight { + background: #474949; + color: #d1d9e1; + .code { + .comment, + .quote { + color: #969896; + font-style: italic; + } + + .keyword, + .selector-tag, + .literal, + .type, + .addition { + color: #c9c; + } + + .number, + .selector-attr, + .selector-pseudo { + color: #f99157; + } + + .string, + .doctag, + .regexp { + color: #8abeb7; + } + + .title, + .name, + .section, + .built_in { + color: #b5bd68; + } + + .variable, + .template-variable, + .selector-id, + .class .title { + color: #fc6; + } + + .section, + .name, + .strong { + font-weight: bold; + } + + .symbol, + .bullet, + .subst, + .meta, + .link { + color: #f99157; + } + + .deletion { + color: #dc322f; + } + + .formula { + background: #eee8d5; + } + + .attr, + .attribute { + color: #81a2be; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/school-book.png b/assets/scss/highlight/school-book.png new file mode 100644 index 0000000..956e979 Binary files /dev/null and b/assets/scss/highlight/school-book.png differ diff --git a/assets/scss/highlight/school-book.scss b/assets/scss/highlight/school-book.scss new file mode 100644 index 0000000..3705bc2 --- /dev/null +++ b/assets/scss/highlight/school-book.scss @@ -0,0 +1,64 @@ +/* + +School Book style from goldblog.com.ua (c) Zaripov Yura + +*/ +.highlight { + background: #f6f6ae url('./school-book.png'); + border-bottom: solid 1px #d2e8b9; + border-top: solid 2px #d2e8b9; + .code { + .keyword, + .selector-tag, + .literal { + color: #059; + font-weight: bold; + } + + .highlight, + .subst { + color: #3e5915; + } + + .string, + .title, + .section, + .type, + .symbol, + .bullet, + .attribute, + .built_in, + .builtin-name, + .addition, + .variable, + .template-tag, + .template-variable, + .link { + color: #2c009f; + } + + .comment, + .quote, + .deletion, + .meta { + color: #e60415; + } + + .keyword, + .selector-tag, + .literal, + .doctag, + .title, + .section, + .type, + .name, + .selector-id, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/solarized-dark.scss b/assets/scss/highlight/solarized-dark.scss new file mode 100644 index 0000000..41bff98 --- /dev/null +++ b/assets/scss/highlight/solarized-dark.scss @@ -0,0 +1,81 @@ +/* + +Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull + +*/ +.highlight { + background: #002b36; + color: #839496; + .code { + .comment, + .quote { + color: #586e75; + } + + /* Solarized Green */ + .keyword, + .selector-tag, + .addition { + color: #859900; + } + + /* Solarized Cyan */ + .number, + .string, + .meta .meta-string, + .literal, + .doctag, + .regexp { + color: #2aa198; + } + + /* Solarized Blue */ + .title, + .section, + .name, + .selector-id, + .selector-class { + color: #268bd2; + } + + /* Solarized Yellow */ + .attribute, + .attr, + .variable, + .template-variable, + .class .title, + .type { + color: #b58900; + } + + /* Solarized Orange */ + .symbol, + .bullet, + .subst, + .meta, + .meta .keyword, + .selector-attr, + .selector-pseudo, + .link { + color: #cb4b16; + } + + /* Solarized Red */ + .built_in, + .deletion { + color: #dc322f; + } + + .formula { + background: #073642; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/solarized-light.scss b/assets/scss/highlight/solarized-light.scss new file mode 100644 index 0000000..42ff65f --- /dev/null +++ b/assets/scss/highlight/solarized-light.scss @@ -0,0 +1,81 @@ +/* + +Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull + +*/ +.highlight { + background: #fdf6e3; + color: #657b83; + .code { + .comment, + .quote { + color: #93a1a1; + } + + /* Solarized Green */ + .keyword, + .selector-tag, + .addition { + color: #859900; + } + + /* Solarized Cyan */ + .number, + .string, + .meta .meta-string, + .literal, + .doctag, + .regexp { + color: #2aa198; + } + + /* Solarized Blue */ + .title, + .section, + .name, + .selector-id, + .selector-class { + color: #268bd2; + } + + /* Solarized Yellow */ + .attribute, + .attr, + .variable, + .template-variable, + .class .title, + .type { + color: #b58900; + } + + /* Solarized Orange */ + .symbol, + .bullet, + .subst, + .meta, + .meta .keyword, + .selector-attr, + .selector-pseudo, + .link { + color: #cb4b16; + } + + /* Solarized Red */ + .built_in, + .deletion { + color: #dc322f; + } + + .formula { + background: #eee8d5; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/sunburst.scss b/assets/scss/highlight/sunburst.scss new file mode 100644 index 0000000..5597930 --- /dev/null +++ b/assets/scss/highlight/sunburst.scss @@ -0,0 +1,99 @@ +/* + +Sunburst-like style (c) Vasily Polovnyov + +*/ +.highlight { + background: #000; + color: #f8f8f8; + .code { + .comment, + .quote { + color: #aeaeae; + font-style: italic; + } + + .keyword, + .selector-tag, + .type { + color: #e28964; + } + + .string { + color: #65b042; + } + + .subst { + color: #daefa3; + } + + .regexp, + .link { + color: #e9c062; + } + + .title, + .section, + .tag, + .name { + color: #89bdff; + } + + .class .title, + .doctag { + text-decoration: underline; + } + + .symbol, + .bullet, + .number { + color: #3387cc; + } + + .params, + .variable, + .template-variable { + color: #3e87e3; + } + + .attribute { + color: #cda869; + } + + .meta { + color: #8996a8; + } + + .formula { + background-color: #0e2231; + color: #f8f8f8; + font-style: italic; + } + + .addition { + background-color: #253b22; + color: #f8f8f8; + } + + .deletion { + background-color: #420e09; + color: #f8f8f8; + } + + .selector-class { + color: #9b703f; + } + + .selector-id { + color: #8b98ab; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/tomorrow-night-blue.scss b/assets/scss/highlight/tomorrow-night-blue.scss new file mode 100644 index 0000000..c585931 --- /dev/null +++ b/assets/scss/highlight/tomorrow-night-blue.scss @@ -0,0 +1,72 @@ +/* Tomorrow Night Blue Theme */ +/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ +/* Original theme - https://github.com/chriskempson/tomorrow-theme */ +/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ +.highlight { + background: #002451; + color: #fff; + .code { + /* Tomorrow Comment */ + .comment, + .quote { + color: #7285b7; + } + + /* Tomorrow Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #ff9da4; + } + + /* Tomorrow Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #ffc58f; + } + + /* Tomorrow Yellow */ + .attribute { + color: #ffeead; + } + + /* Tomorrow Green */ + .string, + .symbol, + .bullet, + .addition { + color: #d1f1a9; + } + + /* Tomorrow Blue */ + .title, + .section { + color: #bbdaff; + } + + /* Tomorrow Purple */ + .keyword, + .selector-tag { + color: #ebbbff; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/tomorrow-night-bright.scss b/assets/scss/highlight/tomorrow-night-bright.scss new file mode 100644 index 0000000..96ae48c --- /dev/null +++ b/assets/scss/highlight/tomorrow-night-bright.scss @@ -0,0 +1,71 @@ +/* Tomorrow Night Bright Theme */ +/* Original theme - https://github.com/chriskempson/tomorrow-theme */ +/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ +.highlight { + background: #000; + color: #eaeaea; + .code { + /* Tomorrow Comment */ + .comment, + .quote { + color: #969896; + } + + /* Tomorrow Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #d54e53; + } + + /* Tomorrow Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #e78c45; + } + + /* Tomorrow Yellow */ + .attribute { + color: #e7c547; + } + + /* Tomorrow Green */ + .string, + .symbol, + .bullet, + .addition { + color: #b9ca4a; + } + + /* Tomorrow Blue */ + .title, + .section { + color: #7aa6da; + } + + /* Tomorrow Purple */ + .keyword, + .selector-tag { + color: #c397d8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/tomorrow-night-eighties.scss b/assets/scss/highlight/tomorrow-night-eighties.scss new file mode 100644 index 0000000..74282d4 --- /dev/null +++ b/assets/scss/highlight/tomorrow-night-eighties.scss @@ -0,0 +1,71 @@ +/* Tomorrow Night Eighties Theme */ +/* Original theme - https://github.com/chriskempson/tomorrow-theme */ +/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ +.highlight { + background: #2d2d2d; + color: #ccc; + .code { + /* Tomorrow Comment */ + .comment, + .quote { + color: #999; + } + + /* Tomorrow Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #f2777a; + } + + /* Tomorrow Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #f99157; + } + + /* Tomorrow Yellow */ + .attribute { + color: #fc6; + } + + /* Tomorrow Green */ + .string, + .symbol, + .bullet, + .addition { + color: #9c9; + } + + /* Tomorrow Blue */ + .title, + .section { + color: #69c; + } + + /* Tomorrow Purple */ + .keyword, + .selector-tag { + color: #c9c; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/tomorrow-night.scss b/assets/scss/highlight/tomorrow-night.scss new file mode 100644 index 0000000..a4080d9 --- /dev/null +++ b/assets/scss/highlight/tomorrow-night.scss @@ -0,0 +1,70 @@ +/* Original theme - https://github.com/chriskempson/tomorrow-theme */ +/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ +.highlight { + background: #1d1f21; + color: #c5c8c6; + .code { + /* Tomorrow Comment */ + .comment, + .quote { + color: #969896; + } + + /* Tomorrow Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #c66; + } + + /* Tomorrow Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #de935f; + } + + /* Tomorrow Yellow */ + .attribute { + color: #f0c674; + } + + /* Tomorrow Green */ + .string, + .symbol, + .bullet, + .addition { + color: #b5bd68; + } + + /* Tomorrow Blue */ + .title, + .section { + color: #81a2be; + } + + /* Tomorrow Purple */ + .keyword, + .selector-tag { + color: #b294bb; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/tomorrow.scss b/assets/scss/highlight/tomorrow.scss new file mode 100644 index 0000000..b6c4c38 --- /dev/null +++ b/assets/scss/highlight/tomorrow.scss @@ -0,0 +1,68 @@ +.highlight { + background: #fff; + color: #4d4d4c; + .code { + /* Tomorrow Comment */ + .comment, + .quote { + color: #8e908c; + } + + /* Tomorrow Red */ + .variable, + .template-variable, + .tag, + .name, + .selector-id, + .selector-class, + .regexp, + .deletion { + color: #c82829; + } + + /* Tomorrow Orange */ + .number, + .built_in, + .builtin-name, + .literal, + .type, + .params, + .meta, + .link { + color: #f5871f; + } + + /* Tomorrow Yellow */ + .attribute { + color: #eab700; + } + + /* Tomorrow Green */ + .string, + .symbol, + .bullet, + .addition { + color: #718c00; + } + + /* Tomorrow Blue */ + .title, + .section { + color: #4271ae; + } + + /* Tomorrow Purple */ + .keyword, + .selector-tag { + color: #8959a8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/vs.scss b/assets/scss/highlight/vs.scss new file mode 100644 index 0000000..09e8261 --- /dev/null +++ b/assets/scss/highlight/vs.scss @@ -0,0 +1,68 @@ +/* + +Visual Studio-like style based on original C# coloring by Jason Diamond + +*/ +.highlight { + background: #fff; + color: #000; + display: block; + overflow-x: auto; + padding: 0.5em; + .code { + .comment, + .quote, + .variable { + color: #008000; + } + + .keyword, + .selector-tag, + .built_in, + .name, + .tag { + color: #00f; + } + + .string, + .title, + .section, + .attribute, + .literal, + .template-tag, + .template-variable, + .type, + .addition { + color: #a31515; + } + + .deletion, + .selector-attr, + .selector-pseudo, + .meta { + color: #2b91af; + } + + .doctag { + color: #808080; + } + + .attr { + color: #f00; + } + + .symbol, + .bullet, + .link { + color: #00b0e8; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/highlight/xcode.scss b/assets/scss/highlight/xcode.scss new file mode 100644 index 0000000..d803b83 --- /dev/null +++ b/assets/scss/highlight/xcode.scss @@ -0,0 +1,90 @@ +/* + +XCode style (c) Angel Garcia + +*/ +.highlight { + background: #fff; + color: #000; + .code { + .comment, + .quote { + color: #006a00; + } + + .keyword, + .selector-tag, + .literal { + color: #aa0d91; + } + + .name { + color: #008; + } + + .variable, + .template-variable { + color: #660; + } + + .string { + color: #c41a16; + } + + .regexp, + .link { + color: #080; + } + + .title, + .tag, + .symbol, + .bullet, + .number, + .meta { + color: #1c00cf; + } + + .section, + .class .title, + .type, + .attr, + .built_in, + .builtin-name, + .params { + color: #5c2699; + } + + .attribute, + .subst { + color: #000; + } + + .formula { + background-color: #eee; + font-style: italic; + } + + .addition { + background-color: #baeeba; + } + + .deletion { + background-color: #ffc8bd; + } + + .selector-id, + .selector-class { + color: #9b703f; + } + + .doctag, + .strong { + font-weight: bold; + } + + .emphasis { + font-style: italic; + } + } +} diff --git a/assets/scss/highlight/zenburn.scss b/assets/scss/highlight/zenburn.scss new file mode 100644 index 0000000..8ee821f --- /dev/null +++ b/assets/scss/highlight/zenburn.scss @@ -0,0 +1,76 @@ +/* + +Zenburn style from voldmar.ru (c) Vladimir Epifanov +based on dark.css by Ivan Sagalaev + +*/ +.highlight { + background: #3f3f3f; + color: #dcdcdc; + .code { + .keyword, + .selector-tag, + .tag { + color: #e3ceab; + } + + .template-tag { + color: #dcdcdc; + } + + .number { + color: #8cd0d3; + } + + .variable, + .template-variable, + .attribute { + color: #efdcbc; + } + + .literal { + color: #efefaf; + } + + .subst { + color: #8f8f8f; + } + + .title, + .name, + .selector-id, + .selector-class, + .section, + .type { + color: #efef8f; + } + + .symbol, + .bullet, + .link { + color: #dca3a3; + } + + .deletion, + .string, + .built_in, + .builtin-name { + color: #cc9393; + } + + .addition, + .comment, + .quote, + .meta { + color: #7f9f7f; + } + + .emphasis { + font-style: italic; + } + + .strong { + font-weight: bold; + } + } +} diff --git a/assets/scss/main.scss b/assets/scss/main.scss new file mode 100644 index 0000000..d8de61d --- /dev/null +++ b/assets/scss/main.scss @@ -0,0 +1,121 @@ +@import 'util/reset'; +@import 'util/vendor'; +@import 'variables'; +@import 'util/mixin'; +@import 'util/grid'; + +@include global-reset; + +input, +button { + margin: 0; + padding: 0; + + &::focus-inner { + border: 0; + padding: 0; + } +} + +html, +body, +#container { + height: 100%; +} + +body { + background: $color-background; + color: $color-default; + font: $font-size $font-sans; + text-size-adjust: 100%; +} + +a { + color: $color-link; + text-decoration: none; + + &:visited { + color: $color-link; + } +} + +code { + background-color: #f8f8f8; + border-radius: 2px; + color: #e96900; + font-family: $font-mono; + font-size: 0.8em; + margin: 0 2px; + padding: 3px 5px; +} + +.outer { + @include clearfix; + margin: 0 auto; + max-width: ($column-width + $gutter-width + 10) * $columns + $gutter-width; + padding: 0 $gutter-width; + + @include mq-mini { + padding: 0; + } +} + +.left, +.alignleft { + float: left; +} + +.right, +.alignright { + float: right; +} + +.clear { + clear: both; +} + +.logo { + background-image: url($logo-url); + background-repeat: no-repeat; + background-size: $logo-width $logo-height; + height: $logo-height; + width: $logo-width; +} + +#container { + position: relative; + + & > .outer { + margin-bottom: 30px; + } +} + +#main { + @include mq-normal { + @include column($main-column); + } + + @include mq-tablet { + @include column($sidebar-column-tablet); + } +} + +@import 'extend'; +@import 'partial/misc'; +@import 'partial/header'; +@import 'partial/profile'; +@import 'partial/article'; +@import 'partial/archive'; +@import 'partial/timeline'; +@import 'partial/footer'; +@import 'partial/sidebar'; +@import 'partial/404'; +@import 'partial/paypal'; +@import 'partial/scrim'; +@import 'partial/calendar'; +@import 'partial/committee'; +@import 'partial/talks'; +@import 'partial/search'; +@import 'partial/toTop'; +@import 'highlight/index'; +@import 'partial/monokai'; diff --git a/assets/scss/partial/404.scss b/assets/scss/partial/404.scss new file mode 100644 index 0000000..ad1ab37 --- /dev/null +++ b/assets/scss/partial/404.scss @@ -0,0 +1,16 @@ +.not-found { + text-align: center; + + &-header { + font-size: 6em; + margin: 16px; + } + + &-message { + margin: 32px; + } + + img { + border-radius: 100%; + } +} diff --git a/assets/scss/partial/archive.scss b/assets/scss/partial/archive.scss new file mode 100644 index 0000000..75bdffd --- /dev/null +++ b/assets/scss/partial/archive.scss @@ -0,0 +1,232 @@ +.archives { + @include clearfix; + + .article { + &:first-child { + margin: 20px 0; + } + } +} + +.archive-year-wrap, +.archive-category-wrap, +.archive-tag-wrap, +.layout-title { + font-size: 1.4em; + margin: $block-margin 0 20px; + @include mq-mini { + font-size: 1.2em; + padding: 0 15px; + } + + .fa { + margin-right: 3px; + } + + .archive-year { + color: $color-default; + + &:hover { + color: $color-link; + } + } +} + +.archive-article { + @extend %block; + @include clearfix; + @include avoid-column-break; + + margin-bottom: 15px; + padding: 0; + + &.archive-type-summary { + padding: 15px; + + .article-entry { + padding: 0; + + p { + margin: 12px 0; + } + } + } + + &-content, + &-thumbnail { + display: table-cell; + vertical-align: top; + @include mq-mini { + display: block; + } + } + + &-thumbnail { + padding-right: 15px; + width: 160px; + @include mq-mini { + padding-bottom: 15px; + width: 100%; + } + + .thumbnail { + display: block; + height: 0; + overflow: hidden; + padding-bottom: 56.25%; + position: relative; + width: 100%; + + span { + display: block; + height: 100%; + width: 100%; + } + + &-image { + background-position: center; + background-size: cover; + position: absolute; + } + + &-none { + background-image: url($thumbnail-default-small); + } + } + } +} + +.archive-year { + @extend %block-caption; +} + +.archive-article-header { + a { + @extend %link-dark; + } +} + +.archive-article-title { + font-size: 1.6em; + line-height: 1.4em; + display: block; + margin-bottom: 12px; + @include mq-mini { + font-size: 1.3em; + display: block; + } +} + +.archive-article-date { + display: block; + margin-top: 8px; +} + +.layout-wrap-inner { + @include mq-mini { + padding: 0 15px; + } + + &.list-categories { + ul { + list-style: none; + margin-left: 15px; + + li, + .category-list-child { + border-bottom: 1px solid border-color; + font-size: $font-size; + padding: 10px 0; + + a { + color: $color-sidebar-text; + } + } + + ul, + ol { + list-style: none; + + li { + border: 0; + + &:last-child { + padding-bottom: 0; + } + } + } + } + + li { + a { + &::before { + font-size: 12px; + color: #ccc; + content: '\f0da'; + font-family: FontAwesome; + margin-right: 6px; + transition: 0.2s ease; + } + + &:hover::before { + color: $color-sidebar-text-dark; + } + } + } + } + + &.tag-cloud { + a { + @extend %link-dark; + margin-right: 8px; + + &::before { + content: '#'; + } + } + } +} + +#page-nav { + @include clearfix; + color: $color-grey; + margin: $block-margin auto; + overflow: hidden; + text-align: center; + + a, + span { + border-radius: 2px; + display: inline-block; + height: 32px; + line-height: 32px; + padding: 0 10px; + text-align: center; + } + + a { + color: $color-grey; + text-decoration: none; + + &:hover { + background: $color-link; + color: $color-white; + } + } + + .page-number { + display: inline-block; + @include mq-mini { + display: none; + } + } + + .current { + color: $color-default; + font-weight: bold; + } + + .space { + color: $color-default; + } +} diff --git a/assets/scss/partial/article.scss b/assets/scss/partial/article.scss new file mode 100644 index 0000000..1aa23b5 --- /dev/null +++ b/assets/scss/partial/article.scss @@ -0,0 +1,579 @@ +.article { + margin: $block-margin 0; +} + +.article-inner { + @extend %block; + overflow: hidden; +} + +.article-banner { + height: 300px; + object-fit: cover; + width: 100%; +} + +.article-header { + padding: $article-padding $article-padding 0; + + .article-title { + display: block; + margin-bottom: 14px; + } +} + +.article-title { + color: $color-default; + font-size: 2em; + line-height: $line-height-title; + text-decoration: none; + + a { + &:visited { + color: $color-default; + } + + &:hover { + color: $color-link; + } + } + + @include mq-mini { + font-size: 1.6em; + } + + @include mq-mobile { + font-size: 1.6em; + } +} + +.article-meta { + @extend %block-caption; + @include clearfix; + line-height: 1.6em; + + & > div { + float: left; + margin-right: 10px; + + .fa { + margin-right: 3px; + } + } + + a { + color: $color-default; + + &:hover { + color: $color-link; + } + } +} + +.article-category { + .fa-angle-right { + margin: 0 5px; + } +} + +.article-tag { + .tag-link { + &::before { + content: '#'; + } + } +} + +.article-entry { + @extend %base-style; + @include clearfix; + color: $color-default; + line-height: $line-height; + padding: 0 $article-padding; + + p, + table { + line-height: $line-height; + margin: $line-height 0; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: bold; + line-height: $line-height-title; + margin: $line-height-title 0; + } + + a { + color: $color-link; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + + ul, + ol, + dl { + margin-bottom: $line-height; + margin-top: $line-height; + } + + img, + video { + display: block; + height: auto; + margin: auto; + max-width: 100%; + } + + iframe { + border: 0; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 100%; + } + + th { + border-bottom: 3px solid $color-border; + font-weight: bold; + padding-bottom: 0.5em; + } + + td { + border-bottom: 1px solid $color-border; + padding: 10px 0; + } + + blockquote { + background: #fcfcfc; + border-left: 4px solid $color-grey-light; + font-family: $font-serif; + font-size: 1.1em; + margin: 0 -20px; + padding: 10px 20px 10px 54px; + position: relative; + + &::before { + color: #e2e2e2; + content: '\f10d'; + font-family: FontAwesome; + font-size: 32px; + left: 10px; + position: absolute; + text-align: center; + top: 20px; + } + + footer { + font-family: $font-sans; + font-size: $font-size; + margin: $line-height 0; + + cite { + &::before { + content: '—'; + padding: 0 0.5em; + } + } + } + } + + .pullquote { + margin: 0; + text-align: left; + width: 45%; + + &.left { + margin-left: 0.5em; + margin-right: 1em; + } + + &.right { + margin-left: 1em; + margin-right: 0.5em; + } + } + + .caption { + color: $color-grey; + display: block; + font-size: 0.9em; + margin-top: 0.5em; + position: relative; + text-align: center; + } + + .video-container { + height: 0; + overflow: hidden; + padding-top: percentage(9 / 16); + position: relative; + + iframe, + object, + embed { + height: 100%; + left: 0; + margin-top: 0; + position: absolute; + top: 0; + width: 100%; + } + } +} + +.article-more-link { + a { + background: $color-button-background; + border-radius: 15px; + color: $color-grey-dark; + display: inline-block; + line-height: 1em; + padding: 6px 15px; + text-decoration: none; + text-shadow: 0 1px $color-white; + + &:hover { + background: $color-link; + color: $color-white; + text-decoration: none; + text-shadow: 0 1px darken($color-link, 20%); + } + } +} + +.article-footer { + @include clearfix; + border-top: 1px solid $color-border; + font-size: 0.85em; + line-height: $line-height; + margin: 0 $article-padding $article-padding; + padding-top: $line-height; + + a { + color: $color-grey; + text-decoration: none; + + &:hover { + color: $color-default; + } + } +} + +.article-comment-link { + float: right; + + &::before { + content: '\f075'; + font-family: FontAwesome; + padding-right: 5px; + } +} + +.share-container { + float: left; +} + +.article-share-link { + cursor: pointer; + float: right; + margin-left: 20px; + + .fa-share { + margin-right: 5px; + } +} + +#article-nav { + @include clearfix; + position: relative; + @include mq-normal { + margin: $block-margin 0; + + &::before { + @include absolute-center(8px); + background: mix($color-default, #222); + border-radius: 50%; + content: ''; + } + } +} + +.article-nav-link-wrap { + box-sizing: border-box; + color: $color-grey; + display: block; + margin-top: $block-margin; + text-align: center; + text-decoration: none; + + &:hover { + color: $color-default; + } + + @include mq-normal { + margin-top: 0; + width: 50%; + } +} + +#article-nav-newer { + @include mq-normal { + float: left; + padding-right: 20px; + text-align: right; + } +} + +#article-nav-older { + @include mq-normal { + float: right; + padding-left: 20px; + text-align: left; + } +} + +.article-nav-caption { + color: $color-default; + font-weight: bold; + letter-spacing: 2px; + line-height: 1em; + text-transform: uppercase; + + #article-nav-newer & { + margin-right: -2px; + } +} + +.article-nav-title { + color: $color-default; + font-size: 0.85em; + line-height: $line-height; + margin-top: 0.5em; +} + +.article-share-box { + background: $color-white; + border-radius: 3px; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.1); + display: none; + margin-left: -145px; + overflow: hidden; + position: absolute; + z-index: 1; + + &.on { + display: block; + } +} + +.article-share-input { + background: none; + border: 1px solid $color-border; + border-radius: 3px 3px 0 0; + box-sizing: border-box; + color: $color-default; + font: 14px $font-sans; + height: 36px; + line-height: 36px; + outline: none; + padding: 0 10px; + width: 100%; +} + +.article-share-links { + @include clearfix; + background: $color-background; +} + +%article-share-link { + color: #999; + display: block; + float: left; + height: 36px; + position: relative; + text-shadow: 0 1px $color-white; + width: 50px; + + &::before { + @include absolute-center($font-size); + font-size: 20px; + text-align: center; + } + + &:hover { + color: $color-white; + } +} + +.article-share-twitter { + @extend %article-share-link; + + &:hover { + background: $color-twitter; + text-shadow: 0 1px darken($color-twitter, 20%); + } +} + +.article-share-facebook { + @extend %article-share-link; + + &:hover { + background: $color-facebook; + text-shadow: 0 1px darken($color-facebook, 20%); + } +} + +.article-share-pinterest { + @extend %article-share-link; + + &:hover { + background: $color-pinterest; + text-shadow: 0 1px darken($color-pinterest, 20%); + } +} + +.article-share-google { + @extend %article-share-link; + + &:hover { + background: $color-google; + text-shadow: 0 1px darken($color-google, 20%); + } +} + +.article-gallery { + background: #000; + margin: $line-height 0; + overflow: hidden; + position: relative; + text-align: center; + + .gallery-item { + display: none; + max-width: 100%; + + &::before, + &::after { + color: rgba(255, 255, 255, 0.5); + font-family: FontAwesome; + font-size: 36px; + height: 36px; + line-height: 36px; + margin-top: -18px; + position: absolute; + top: 50%; + width: 40px; + } + + &:hover { + &::before, + &::after { + color: rgba(255, 255, 255, 0.8); + } + } + + &::before { + content: '\f104'; + left: 0; + } + + &::after { + content: '\f105'; + right: 0; + } + + &:first-child { + display: block; + } + + img { + display: block; + margin: 0 auto; + max-width: 100%; + } + } +} + +/* topic section */ +.toc-article { + background: #f9f9f9; + border-radius: 0; + margin: 2em 0 0 0.2em; + padding: 1em; + + .toc-title { + font-size: 120%; + } + + strong { + padding: 0.3em 1; + } +} + +ol { + &.toc { + margin: 1em 2em 0 0; + width: 100%; + } +} + +#toc { + float: right; + font-size: 0.8em; + line-height: 1em; + + .toc { + padding: 0; + + li { + list-style-type: none; + } + } + + .toc-child { + padding-left: 0; + } + + &.toc-aside { + color: color-heading; + display: none; + font-size: 1em; + line-height: 1.5em; + opacity: 0.6; + overflow: hidden; + position: fixed; + right: 2%; + top: 320px; + transition: opacity 1s ease-out; + width: 13%; + + strong { + color: color-font; + padding: 0.3em 0; + } + + &:hover { + opacity: 1; + transition: opacity 0.3s ease-out; + } + + a { + transition: color 1s ease-out; + + &:hover { + color: color-theme; + transition: color 0.3s ease-out; + } + } + } +} diff --git a/assets/scss/partial/calendar.scss b/assets/scss/partial/calendar.scss new file mode 100644 index 0000000..ece748d --- /dev/null +++ b/assets/scss/partial/calendar.scss @@ -0,0 +1,19 @@ +.calendar { + margin: 3em 0 0; + + &-header { + font-size: 2em; + margin: 16px; + text-align: center; + } + + &-container { + margin: 4px 8px; + } + + &-message { + font-size: 1.5em; + margin: 15px 0; + text-align: center; + } +} diff --git a/assets/scss/partial/committee.scss b/assets/scss/partial/committee.scss new file mode 100644 index 0000000..8e8e91b --- /dev/null +++ b/assets/scss/partial/committee.scss @@ -0,0 +1,63 @@ +.cmt { + display: flex; + flex-wrap: wrap; + justify-content: center; + + &-member { + margin: 0 16px; + width: 184px; + + a { + color: $color-grey-dark; + + &:hover { + color: $color-link; + text-decoration: none; + } + } + + &-title { + font-weight: bold; + margin: 8px 0; + text-align: center; + } + + &-text { + margin: 8px 0; + text-align: center; + } + + &-image { + border-radius: 50%; + display: block; + height: 126px; + margin: auto; + overflow: hidden; + position: relative; + width: 126px; + + &-cover { + background-position: center; + background-size: cover; + display: block; + height: 100%; + position: absolute; + width: 100%; + } + + &-none { + background-image: url($thumbnail-default-small); + background-position: center; + background-size: cover; + display: block; + height: 100%; + position: absolute; + width: 100%; + } + + &-resigned { + border: 8px solid #f00; + } + } + } +} diff --git a/assets/scss/partial/footer.scss b/assets/scss/partial/footer.scss new file mode 100644 index 0000000..40b65ec --- /dev/null +++ b/assets/scss/partial/footer.scss @@ -0,0 +1,24 @@ +#footer { + border-top: 1px solid $color-border; + color: $color-default; + font-size: $font-size + 2; + padding: 20px 0; + text-align: center; + + .outer { + margin-bottom: 0; + } + + a { + color: $color-link; + text-decoration: none; + &:hover { + text-decoration: underline; + } + } +} + +#footer-info { + font-size: 0.85em; + line-height: $line-height; +} diff --git a/assets/scss/partial/header.scss b/assets/scss/partial/header.scss new file mode 100644 index 0000000..ee5b45f --- /dev/null +++ b/assets/scss/partial/header.scss @@ -0,0 +1,461 @@ +#header { + @extend %block; + background: $color-white; + position: relative; + + a { + color: $color-sidebar-text-dark; + transition: 0.2s ease; + white-space: nowrap; + + &:visited { + color: $color-sidebar-text-dark; + transition: 0.2s ease; + white-space: nowrap; + } + + &:hover { + color: $color-link; + } + } + + #header-main { + .outer { + display: flex; + } + } +} + +%header-block { + height: $logo-height; + line-height: $logo-height; + padding: ($header-height - $logo-height) / 2 2px; +} + +%header-block-left { + float: left; +} + +%header-block-right { + float: right; +} + +.header-inner { + height: 100%; + position: relative; + + #logo { + @extend %header-block; + @extend %header-block-left; + display: inline-block; + float: none; + margin: 12px 0 0 8px; + padding: 0; + @include mq-header-mobile { + width: 100%; + } + + .logo { + background-repeat: no-repeat; + background-size: 160px 40px; + display: inline-block; + height: 40px; + margin-right: 5px; + width: 160px; + @include mq-header { + padding-bottom: 12px; + } + + @include mq-sub-par { + display: none; + } + } + + .site-title { + display: inline-block; + font-size: 16px; + font-weight: 600; + vertical-align: top; + } + } +} + +#header-title { + height: $logo-height; + left: 0; + margin-top: $logo-height * -0.5; + position: absolute; + text-align: center; + top: 50%; +} + +.header-sub { + border-top: 1px solid $color-border; + @include mq-mini { + display: none; + } + @include mq-mobile { + display: none; + } + + ul { + @include clearfix; + margin: 0 15px; + + li { + float: left; + margin: 0 10px; + + a { + display: inline-block; + line-height: $header-sub-height; + } + } + } + + .main-nav-link { + display: inline-block; + line-height: $header-sub-height; + } +} + +#header-sub { + @include mq-mobile { + display: none; + } + + @include mq-mini { + display: none; + } +} + +%dropdown { + .menu { + display: block; + float: left; + margin: 0; + padding: 0; + position: relative; + } + + .main-nav-link { + display: block; + line-height: 32px; + padding: 0 14px; + text-decoration: none; + + &:hover { + border-bottom: solid 5px $color-red; + } + + .fa { + padding-right: 8px; + } + } + + .active { + .dropdown-toggle { + border-bottom: solid 5px $color-red; + } + + .dropdown-menu { + filter: unquote('alpha(opacity=100)'); + opacity: 1; + visibility: visible; + + .main-nav-link { + &:hover { + border-bottom: 0; + } + } + } + } + + li { + float: left; + margin: 0; + padding: 0; + position: relative; + + .current-menu-item { + background: #ddd; + } + } + + .dropdown-toggle { + background: $color-white; + border: 0; + cursor: pointer; + font-weight: inherit; + } + + .dropdown-menu { + background: #e2e2e2; + display: flex; + filter: unquote('alpha(opacity=0)'); + flex-direction: column; + left: 0; + min-width: 100%; + opacity: 0; + padding: 0; + position: absolute; + top: 100%; + transition: 0.4s ease; + visibility: hidden; + z-index: 2; + li { + float: none; + } + + a { + line-height: 120%; + padding: 10px 15px; + } + + .fa { + padding-right: 4px; + } + } +} + +#main-nav { + @extend %header-block; + @extend %header-block-left; + @extend %dropdown; + display: inline-block; + float: none; + font-size: 13px; + height: 40px; + padding: 12px 0; + width: 100%; + @include mq-header-mobile { + display: none; + } +} + +#main-nav-mobile { + @extend %dropdown; + display: inline-block; + margin: 0; + padding: 20px; + width: 33px; + @include mq-header { + display: none; + } + + #menuToggle { + display: block; + left: 50px; + top: 50px; + user-select: none; + + input { + -webkit-touch-callout: none; + cursor: pointer; + display: block; + height: 32px; + opacity: 0; /* hide this */ + position: absolute; + width: 40px; + z-index: 4; /* and place it over the hamburger */ + + &:checked ~ { + #bar1 { + background: #232323; + opacity: 1; + transform: rotate(45deg) translate(-2px, -1px); + } + + #bar2 { + opacity: 0; + transform: rotate(0deg) scale(0.2, 0.2); + } + + #bar3 { + background: #232323; + opacity: 1; + transform: rotate(-45deg) translate(0, -1px); + } + + ul { + opacity: 1; + transform: scale(1, 1); + z-index: 2; + } + + .scrim { + opacity: 0.4; + visibility: visible; + } + } + } + + span { + background: #cdcdcd; + border-radius: 3px; + display: block; + height: 4px; + margin-bottom: 5px; + position: relative; + transform-origin: 4px 0; + transition: transform 0.5s cubic-bezier(0.77, 0.2, 0.05, 1), + background 0.5s cubic-bezier(0.77, 0.2, 0.05, 1), opacity 0.55s ease; + width: 33px; + z-index: 3; + + &:first-child { + transform-origin: 0% 0%; + } + + &:nth-last-child(3) { + transform-origin: 0% 100%; + } + } + + .menu { + background: #ededed; + font-size: 22px; + height: 1000vh; + margin: -110px 0 0 -50px; + padding: 150px 50px 20px 40px; + position: absolute; + text-decoration: none; + transform: translate(-100%, 0); + transform-origin: 0% 0%; + transition: transform 0.5s cubic-bezier(0.77, 0.2, 0.05, 1); + width: 250px; + z-index: 1; + + .main-nav-link { + border-bottom: 0; + color: #232323; + padding: 20px; + text-decoration: none; + transition: color 0.3s ease; + + .fa { + margin-right: 16px; + } + + &:hover { + border-bottom: 0; + color: $color-red; + } + } + } + + .dropdown-toggle { + background: #ededed; + font-size: 22px; + } + + .dropdown-menu { + transition: none; + } + + .active { + .main-nav-link { + .dropdown-toggle { + border-bottom: 5px solid $color-red; + } + } + + .dropdown-menu { + display: inline; + position: initial; + + .main-nav-link { + margin: 0 0 0 16px; + } + } + } + } +} + +%nav-link { + display: block; + float: left; +} + +.nav-icon { + @extend %nav-link; + cursor: pointer; + font-size: $font-size; + height: $logo-height !important; + line-height: $logo-height !important; + position: relative; + text-align: center; + width: $font-size; +} + +.main-nav-link { + @extend %nav-link; + font-weight: 300; +} + +#sub-nav { + @extend %header-block; + @extend %header-block-right; + + #profile-nav { + #profile-anchor { + @include clearfix; + border: 1px solid #eceff2 !important; + border-radius: 50%; + display: block; + height: $logo-height; + line-height: $logo-height; + padding: 0 4px; + } + + .avatar, + .icon { + float: left; + } + + .avatar { + height: $logo-height; + margin-right: 8px; + width: $logo-height; + } + + .icon { + font: 13px font-icon; + font-family: 'FontAwesome'; + line-height: $logo-height; + margin: 0 9px; + + &::before { + content: '\f2ba'; + } + } + } +} + +#main-nav-mobile { + overflow-x: auto; + overflow-y: hidden; + + .menu { + @include clearfix; + height: $header-sub-height; + margin: 0; + + .search-form-input { + border-radius: $header-sub-height - 16 / 2; + display: none; + height: $header-sub-height - 16; + line-height: $header-sub-height - 16; + margin-right: 15px; + padding: 0 10px; + @include mq-mini { + display: block; + } + + &::search-results-decoration, + &::search-cancel-button { + appearance: none; + } + } + } +} diff --git a/assets/scss/partial/help.scss b/assets/scss/partial/help.scss new file mode 100644 index 0000000..d81dee2 --- /dev/null +++ b/assets/scss/partial/help.scss @@ -0,0 +1,7 @@ +#help { + img { + float: left; + max-width: 200px; + padding: 5px; + } +} diff --git a/assets/scss/partial/misc.scss b/assets/scss/partial/misc.scss new file mode 100644 index 0000000..79bf27e --- /dev/null +++ b/assets/scss/partial/misc.scss @@ -0,0 +1,182 @@ +body { + margin: 0; + width: 100%; +} + +.field { + border: 0; + display: inline-block; + margin: 0 1em 0 0; + overflow: hidden; + position: relative; + vertical-align: top; + width: 30%; + z-index: 1; + + &:nth-child(3) { + margin-right: 0; + } +} + +.button { + margin: 16px; +} + +.message { + width: 96%; +} + +.input { + background: transparent; + border: 0; + border-radius: 0; + display: block; + float: right; + height: 2rem; + margin-bottom: 2em; + opacity: 0; + padding: 0.5em; + position: relative; + text-align: center; + width: 100%; + z-index: 100; +} + +textarea { + &.input { + padding-bottom: 0; + resize: none; + } +} + +.input { + &:focus { + outline: none; + } +} + +.label { + -khtml-user-select: none; + -moz-osx-font-smoothing: grayscale; + -moz-user-select: none; + -ms-user-select: none; + -webkit-font-smoothing: antialiased; + -webkit-touch-callout: none; + -webkit-user-select: none; + color: #3a6edf; + display: inline-block; + float: right; + font-size: 1em; + font-weight: bold; + padding: 0.5em 0; + pointer-events: none; + position: absolute; + text-align: left; + user-select: none; + width: 100%; + + &::before, + &::after { + content: ''; + left: 0; + position: absolute; + width: 100%; + } + + &::before { + background: $color-white; + height: 100%; + top: 0; + transform: translate3d(0, -100%, 0); + transition: transform 0.3s; + } + + &::after { + height: 2px; + background: #3a6edf; + top: 100%; + transition: opacity 0.3s; + } +} + +.label-content { + display: block; + padding: 0; + position: relative; + transform-origin: 0 0; + transition: transform 0.3s, color 0.3s; + width: 100%; +} + +.input { + &:focus, + &--filled & { + opacity: 1; + transition: opacity 0s 0.3s; + } +} + +.input:focus + .label::before, +.input--filled .label::before { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} + +.input:focus + .label::after, +.input--filled .label::after { + opacity: 0; +} + +.input:focus + .label .label-content, +.input--filled .label .label-content { + color: #cbc4c6; + -webkit-transform: translate3d(0, 2.1em, 0) scale3d(0.65, 0.65, 1); + transform: translate3d(0, 2.1em, 0) scale3d(0.65, 0.65, 1); +} + +.button, +input[type='submit'] { + -webkit-appearance: none; + border: none; + border-radius: 0.25rem; + padding: 0.5em; + color: $color-white; + background-color: #3a6edf; + transition: all 0.3s ease-out; + -webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.18), + 0 2px 10px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.18), + 0 2px 10px 0 rgba(0, 0, 0, 0.15); + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.18), 0 2px 10px 0 rgba(0, 0, 0, 0.15); +} + +.button { + &:hover, + &:focus, + &:active { + -webkit-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.23), + 0 4px 15px 0 rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.23), + 0 4px 15px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.23), + 0 4px 15px 0 rgba(0, 0, 0, 0.2); + } +} + +#recent-post { + padding: 0; + + .card { + height: 80px; + } + li a { + .item-inner { + .item-title { + margin: 0; + } + .item-date { + margin: 0; + } + } + } +} diff --git a/assets/scss/partial/monokai.scss b/assets/scss/partial/monokai.scss new file mode 100644 index 0000000..5f20abf --- /dev/null +++ b/assets/scss/partial/monokai.scss @@ -0,0 +1,126 @@ +/* +Monokai style - ported by Luigi Maselli - http://grigio.org +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #272822; + -webkit-text-size-adjust: none; +} + +.hljs-tag, +.hljs-tag .hljs-title, +.hljs-keyword, +.hljs-literal, +.hljs-strong, +.hljs-change, +.hljs-winutils, +.hljs-flow, +.nginx .hljs-title, +.tex .hljs-special { + color: #f92672; +} + +.hljs { + color: #ddd; +} + +.hljs .hljs-constant, +.asciidoc .hljs-code, +.markdown .hljs-code { + color: #66d9ef; +} + +.hljs-code, +.hljs-class .hljs-title, +.hljs-header { + color: white; +} + +.hljs-link_label, +.hljs-attribute, +.hljs-symbol, +.hljs-symbol .hljs-string, +.hljs-value, +.hljs-regexp { + color: #bf79db; +} + +.hljs-link_url, +.hljs-tag .hljs-value, +.hljs-string, +.hljs-bullet, +.hljs-subst, +.hljs-title, +.hljs-emphasis, +.hljs-type, +.hljs-preprocessor, +.hljs-pragma, +.ruby .hljs-class .hljs-parent, +.hljs-built_in, +.django .hljs-template_tag, +.django .hljs-variable, +.smalltalk .hljs-class, +.django .hljs-filter .hljs-argument, +.smalltalk .hljs-localvars, +.smalltalk .hljs-array, +.hljs-attr_selector, +.hljs-pseudo, +.hljs-addition, +.hljs-stream, +.hljs-envvar, +.apache .hljs-tag, +.apache .hljs-cbracket, +.tex .hljs-command, +.hljs-prompt, +.hljs-name { + color: #a6e22e; +} + +.hljs-comment, +.hljs-annotation, +.smartquote, +.hljs-blockquote, +.hljs-horizontal_rule, +.hljs-decorator, +.hljs-pi, +.hljs-doctype, +.hljs-deletion, +.hljs-shebang, +.apache .hljs-sqbracket, +.tex .hljs-formula { + color: #75715e; +} + +.hljs-keyword, +.hljs-literal, +.css .hljs-id, +.hljs-doctag, +.hljs-title, +.hljs-header, +.hljs-type, +.vbscript .hljs-built_in, +.rsl .hljs-built_in, +.smalltalk .hljs-class, +.diff .hljs-header, +.hljs-chunk, +.hljs-winutils, +.bash .hljs-variable, +.apache .hljs-tag, +.tex .hljs-special, +.hljs-request, +.hljs-status { + font-weight: bold; +} + +.coffeescript .javascript, +.javascript .xml, +.tex .hljs-formula, +.xml .javascript, +.xml .vbscript, +.xml .css, +.xml .hljs-cdata { + opacity: 0.5; +} diff --git a/assets/scss/partial/paypal.scss b/assets/scss/partial/paypal.scss new file mode 100644 index 0000000..74c7d82 --- /dev/null +++ b/assets/scss/partial/paypal.scss @@ -0,0 +1,18 @@ +.paypal { + &-selection { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + padding: 0 16px 8px; + width: 70%; + + &-text { + margin-left: 4px; + } + } + + &-button { + padding: 8px 16px 0; + } +} diff --git a/assets/scss/partial/profile.scss b/assets/scss/partial/profile.scss new file mode 100644 index 0000000..6863228 --- /dev/null +++ b/assets/scss/partial/profile.scss @@ -0,0 +1,200 @@ +.bio { + text-align: center; +} + +#profile { + .inner { + .bio { + h2 { + font-size: 1.3em; + font-weight: bold; + margin-top: 15px; + } + + p { + line-height: 1.5em; + margin: 5px 20px 10px; + max-width: 300px; + text-align: justify; + } + } + } +} + +.profile-block { + border-bottom: 1px solid $color-border; + padding: 15px 20px; + + &:last-child { + border-bottom: 0; + } +} + +#profile { + @include column($profile-column); + display: none; + + .inner { + @extend %block; + background: $color-white; + + .base-info { + #avatar { + display: block; + height: $profile-avatar-size; + margin: 10px auto 20px; + width: $profile-avatar-size; + } + + #name, + #title, + #location { + display: block; + text-align: center; + } + + #name { + font-size: 20px; + font-weight: 600; + } + + #location { + color: mix($color-default, #444); + font-size: $font-size - 2; + margin-top: 5px; + .fa { + margin-right: 5px; + } + } + + #follow { + background: $color-link; + border-radius: 20px; + color: $color-white; + display: block; + font-size: 14px; + height: 40px; + line-height: 40px; + margin: 20px auto 10px; + text-align: center; + transition: 0.2s ease; + width: 150px; + + &:hover { + background: mix($color-link, #111); + } + } + } + + .article-info { + @include clearfix(); + padding: 0; + + .article-info-block { + box-sizing: border-box; + float: left; + font-size: $font-size + 6px; + padding: 20px 15px; + text-align: center; + width: 50%; + + span { + display: block; + font-size: $font-size; + text-transform: uppercase; + } + + &:first-child { + border-right: 1px solid $color-border; + } + } + } + + .social-links { + & > table { + width: 100%; + + td { + font-size: $font-size + 10px; + text-align: center; + + a { + color: mix($color-default, #333); + position: relative; + transition: 0.2s ease; + + &:hover { + color: $color-default; + } + + &.tooltip:hover { + &::after { + background: #333; + border-radius: 2px; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.2); + color: $color-white; + content: attr(title); + display: block; + font-size: 14px; + padding: 5px 15px; + position: absolute; + right: -50%; + text-transform: uppercase; + top: -41px; + white-space: nowrap; + z-index: 1; + } + + &::before { + border: solid; + border-color: $color-sidebar-text-dark transparent; + border-width: 5px 5px 0; + content: ''; + display: block; + position: absolute; + right: 8px; + top: -12px; + z-index: 2; + } + } + } + } + } + } + } + + &.card { + @extend %block; + display: block; + margin-top: 30px; + max-width: 100px; + min-width: 280px; + position: absolute; + right: 20px; + top: 50px; + z-index: 999; + + .profile-inner { + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + position: relative; + + &::before, + &::after { + border-color: transparent transparent $color-white transparent; + border-style: solid; + border-width: 10px; + content: ''; + position: absolute; + right: 10px; + top: -20px; + z-index: 1; + } + + &::after { + border-color: transparent transparent, + mix($color-border, #111) transparent; + z-index: 0; + } + } + } +} diff --git a/assets/scss/partial/scrim.scss b/assets/scss/partial/scrim.scss new file mode 100644 index 0000000..e8ad085 --- /dev/null +++ b/assets/scss/partial/scrim.scss @@ -0,0 +1,12 @@ +.scrim { + background: #000; + bottom: 0; + left: 0; + opacity: 0; + position: fixed; + right: 0; + top: 0; + transition: opacity 0.3s ease-in-out, visibility 0.3s ease-in-out; + visibility: hidden; + z-index: 1; +} diff --git a/assets/scss/partial/search.scss b/assets/scss/partial/search.scss new file mode 100644 index 0000000..e8133c4 --- /dev/null +++ b/assets/scss/partial/search.scss @@ -0,0 +1,79 @@ +#search-form-wrap { + @extend %header-block; + @extend %header-block-right; + + .search-form { + height: 40px; + line-height: 40px; + position: relative; + + .search-form-input { + border-radius: 21px; + cursor: pointer; + height: $logo-height !important; + line-height: $logo-height; + padding: 0 30px 0 15px; + width: 100%; + + &::search-results-decoration, + &::search-cancel-button { + appearance: none; + } + + .fa-search { + margin: 0 12px; + + &:hover, + &:focus { + color: $color-link; + } + } + } + + .search-form-submit { + background: none; + border: 0; + cursor: pointer; + font: 13px font-icon; + font-family: 'FontAwesome'; + margin-top: -7px; + position: absolute; + right: 15px; + top: 50%; + + &::before { + content: '\f002'; + } + + &:hover, + &:focus { + color: #777; + } + } + } +} + +.search-form-input { + appearance: textarea; + background: none !important; + border: 1px solid $color-border !important; + box-shadow: none; + box-sizing: border-box; + color: $color-default; + font: $font-size $font-sans; + height: auto !important; + line-height: $line-height; + outline: none !important; + padding: 0; + transition: 0.2s ease; + width: 200px; + + &:focus { + border-color: $color-link !important; + } + + &::search-results-decoration, + &::search-cancel-button { + appearance: none; + } +} diff --git a/assets/scss/partial/sidebar.scss b/assets/scss/partial/sidebar.scss new file mode 100644 index 0000000..4bfdd40 --- /dev/null +++ b/assets/scss/partial/sidebar.scss @@ -0,0 +1,240 @@ +#sidebar { + @include mq-normal { + @include column($sidebar-column); + } + + @include mq-tablet { + @include column($sidebar-column-tablet); + } +} + +.widget { + @extend %base-style; + font-size: 0.9em; + line-height: $line-height; + padding: 0; + word-wrap: break-word; + + ul, + ol { + list-style: none; + margin: 0; + + ul, + ol { + margin: 0 20px; + } + + ul { + list-style: disc; + } + + ol { + list-style: decimal; + } + + &:not(#recent-post) { + li { + a { + &::before { + color: #ccc; + content: '\f0da'; + font-family: FontAwesome; + font-size: 12px; + margin-right: 6px; + transition: 0.2s ease; + } + + &:hover::before { + color: $color-sidebar-text-dark; + } + } + } + } + } + + a { + color: $color-sidebar-text; + text-decoration: none; + + &:hover { + color: $color-sidebar-text-dark; + } + + li, + .category-list-child { + border-bottom: 1px solid border-color; + font-size: $font-size; + padding: 10px 0; + + a { + color: $color-sidebar-text; + } + } + + ul, + ol { + list-style: none; + + li { + border: 0; + + &:last-child { + padding-bottom: 0; + } + } + } + } + + ul, + ol, + dl { + ul, + ol, + dl { + list-style: disc; + margin-left: 15px; + } + } +} + +.category-list-count, +.tag-list-count, +.archive-list-count { + color: $color-grey; + font-size: 0.85em; + padding-left: 5px; + + &::before { + content: '('; + } + + &::after { + content: ')'; + } +} + +.tagcloud { + margin: 10px 0 0; + + a { + margin-right: 5px; + } +} + +.widget-wrap { + margin: 40px 0 40px 10px; + @include mq-mini { + margin: $block-margin 20px; + } +} + +.widget-title { + @extend %block-caption; + margin-bottom: 0; +} + +#recent-post { + .card { + @include clearfix; + background: $color-white; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), + 0 2px 10px 0 rgba(0, 0, 0, 0.12); + margin: 10px 0; + padding: 0 0 0 94px; + + &:hover { + box-shadow: $shadow; + transition: box-shadow 0.25s; + } + } + + &.no-thumbnail { + li { + padding: 10px 0; + } + } + + li { + a { + .item-thumbnail { + float: left; + margin-left: -94px; + opacity: 1; + transition: all 0.2s ease; + + .thumbnail { + display: block; + height: 80px; + overflow: hidden; + position: relative; + width: 80px; + + span { + display: block; + height: 100%; + width: 100%; + } + + &-image { + background-position: center; + background-size: cover; + position: absolute; + } + + &-none { + background-image: url($thumbnail-default-small); + background-size: 100% 100%; + } + } + } + + .item-inner { + margin: 6px 14px 0 0; + + .item-category { + font-size: 10px; + + a { + color: $color-link; + + &:hover { + color: $color-sidebar-text-dark; + } + } + + a, + .fa { + margin-right: 5px; + } + } + + .item-title { + font-size: 12px; + max-width: 200px; + overflow: hidden; + padding-bottom: 20px; + text-overflow: ellipsis; + white-space: nowrap; + + .title { + color: $color-sidebar-text-dark; + transition: all 0.2s ease; + } + } + + .item-date { + color: #aaa; + font-size: 12px; + text-transform: uppercase; + } + } + + &:hover { + .item-title { + color: $color-link; + } + } + } + } +} diff --git a/assets/scss/partial/talks.scss b/assets/scss/partial/talks.scss new file mode 100644 index 0000000..9366cca --- /dev/null +++ b/assets/scss/partial/talks.scss @@ -0,0 +1,16 @@ +.talks-list { + h2 { + text-align: center; + } + + p { + display: flex; + flex-wrap: wrap; + justify-content: center; + + img { + margin: 20px; + width: 200px; + } + } +} diff --git a/assets/scss/partial/timeline.scss b/assets/scss/partial/timeline.scss new file mode 100644 index 0000000..68195b9 --- /dev/null +++ b/assets/scss/partial/timeline.scss @@ -0,0 +1,95 @@ +.timeline-wrap { + border-left: 3px solid $color-border; + margin: 40px 20px 40px 40px; + + @include mq-mini { + margin: 40px 20px 40px 30px; + } + + @include mq-mobile { + margin: 40px 20px 40px 30px; + } +} + +.timeline-row { + @include clearfix; + margin: 20px 0; + + .node, + .title { + float: left; + } + + .node { + background-color: $color-link; + border-radius: 50%; + color: $color-white; + display: inline-block; + height: 12px; + margin: 11px 0 0 -8px; + width: 12px; + } + + .content { + @extend %block; + margin-left: 25px; + position: relative; + + &::after, + &::before { + content: ''; + display: inline-block; + position: absolute; + } + + &::after { + border: 7px solid transparent; + border-right-color: $color-white; + left: -14px; + top: 10px; + } + + &::before { + border: 8px solid transparent; + border-right-color: rgba(0, 0, 0, 0.05); + left: -16px; + top: 9px; + } + + h1, + .article-meta { + padding: 10px; + } + + h1 { + font-size: 16px; + + a { + @extend %link-dark; + } + } + + .article-meta { + background-color: rgba(244, 246, 247, 0.2); + border-top: 1px solid #f7f7f7; + color: mix($color-default, #333); + font-size: 12px; + } + } +} + +.timeline-row-major { + .node { + font-size: 14px; + height: 14px; + margin: 0 0 0 -17px; + padding: 6px 8px 10px; + width: 14px; + } + + .title { + font-size: 18px; + line-height: 30px; + margin-left: 15px; + } +} diff --git a/assets/scss/partial/toTop.scss b/assets/scss/partial/toTop.scss new file mode 100644 index 0000000..51d4b6e --- /dev/null +++ b/assets/scss/partial/toTop.scss @@ -0,0 +1,32 @@ +#toTop { + @extend %block; + background: $color-default; + border-radius: 4px; + bottom: 20px; + box-shadow: $shadow; + color: $color-white; + cursor: pointer; + display: none; + font-size: 50px; + height: 60px; + line-height: 55px; + opacity: 0.8; + position: fixed; + text-align: center; + width: 60px; + z-index: 4; + + @include mq-mobile { + font-size: 34px; + height: 52px; + line-height: 52px; + width: 52px; + } + + @include mq-mini { + font-size: 32px; + height: 48px; + line-height: 48px; + width: 48px; + } +} diff --git a/assets/scss/util/grid.scss b/assets/scss/util/grid.scss new file mode 100644 index 0000000..9b3d645 --- /dev/null +++ b/assets/scss/util/grid.scss @@ -0,0 +1,43 @@ +@function gridsystem-width($_columns: $columns) { + @return ($column-width + $gutter-width) * $_columns; +} + +$total-width: 100%; + +body { + @include clearfix; + width: 100%; +} + +@mixin row($_columns: $columns) { + @include clearfix; + display: block; + margin: 0 $total-width * + ((($gutter-width * 0.5) / gridsystem-width($_columns)) * -1); + width: $total-width * + ( + ($gutter-width + gridsystem-width($_columns)) / + gridsystem-width($_columns) + ); +} + +@mixin column($x, $_columns: $columns) { + display: inline; + float: left; + margin: 0 $total-width * (($gutter-width * 0.5) / gridsystem-width($_columns)); + width: $total-width * + ( + ((($gutter-width + $column-width) * $x) - $gutter-width) / + gridsystem-width($_columns) + ); +} + +@mixin push($offset: 1) { + margin-left: $total-width * + ((($gutter-width + $column-width) * $offset) / gridsystem-width($columns)); +} + +@mixin pull($offset: 1) { + margin-right: $total-width * + ((($gutter-width + $column-width) * $offset) / gridsystem-width($columns)); +} diff --git a/assets/scss/util/mixin.scss b/assets/scss/util/mixin.scss new file mode 100644 index 0000000..03c0569 --- /dev/null +++ b/assets/scss/util/mixin.scss @@ -0,0 +1,79 @@ +@mixin hide-text { + overflow: hidden; + text-indent: 100%; + white-space: nowrap; +} + +@mixin absolute-center($width, $height: $width) { + $height: $height; + $width: $width; + left: 50%; + margin-left: $height * -0.5; + margin-top: $width * -0.5; + position: absolute; + top: 50%; +} + +@mixin avoid-column-break { + @include vendor('column-break-inside', 'avoid', 'webkit'); + break-inside: avoid-column; + overflow: hidden; + page-break-inside: avoid; +} + +@mixin clearfix { + zoom: 1; + + &::after, + &::before { + content: ''; + display: table; + } + + &::after { + clear: both; + } +} + +// Media queries + +@mixin mq-sub-par { + @media screen and (max-width: $mq-sub-par) { + @content; + } +} +@mixin mq-tiny { + @media screen and (max-width: $mq-tiny) { + @content; + } +} +@mixin mq-mini { + @media screen and (max-width: $mq-mobile - 1px) { + @content; + } +} +@mixin mq-mobile { + @media screen and (min-width: $mq-mobile) and (max-width: $mq-tablet - 1px) { + @content; + } +} +@mixin mq-tablet { + @media screen and (min-width: $mq-tablet) and (max-width: $mq-normal - 1px) { + @content; + } +} +@mixin mq-normal { + @media screen and (min-width: $mq-normal) { + @content; + } +} +@mixin mq-header-mobile { + @media screen and (max-width: $mq-header) { + @content; + } +} +@mixin mq-header { + @media screen and (min-width: $mq-header) { + @content; + } +} diff --git a/assets/scss/util/reset.scss b/assets/scss/util/reset.scss new file mode 100644 index 0000000..df38bb3 --- /dev/null +++ b/assets/scss/util/reset.scss @@ -0,0 +1,206 @@ +@mixin global-reset { + html, + body, + div, + span, + applet, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + blockquote, + pre, + a, + abbr, + acronym, + address, + big, + cite, + code, + del, + dfn, + em, + img, + ins, + kbd, + q, + s, + samp, + small, + strike, + strong, + sub, + sup, + tt, + var, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + label, + legend, + table, + caption, + tbody, + tfoot, + thead, + tr, + th, + td { + @include reset-box-model; + @include reset-font; + } + + body { + @include reset-body; + } + + ol, + ul { + list-style: none; + } + + table { + @include reset-table; + } + + caption, + th, + td { + @include reset-table-cell; + } + + a img { + border: 0; + } +} + +@mixin nested-reset { + div, + span, + object, + iframe, + h1, + h2, + h3, + h4, + h5, + h6, + p, + pre, + a, + abbr, + acronym, + address, + code, + del, + dfn, + em, + img, + dl, + dt, + dd, + ol, + ul, + li, + fieldset, + form, + label, + legend, + caption, + tbody, + tfoot, + thead, + tr { + @include reset-box-model; + @include reset-font; + } + + table { + @include reset-table; + } + + caption, + th, + td { + @include reset-table-cell; + } + + a img { + border: 0; + } +} + +@mixin reset-box-model { + border: 0; + margin: 0; + outline: 0; + padding: 0; +} + +@mixin reset-font { + font-family: inherit; + font-size: 100%; + font-style: inherit; + font-weight: inherit; + vertical-align: baseline; +} + +@mixin reset-body { + background: $color-white; + color: #000; + line-height: 1; +} + +@mixin reset-table { + border-collapse: separate; + border-spacing: 0; + vertical-align: middle; +} + +@mixin reset-table-cell { + font-weight: normal; + text-align: left; + vertical-align: middle; +} + +@mixin reset-html5 { + article, + aside, + canvas, + details, + figcaption, + figure, + footer, + header, + hgroup, + menu, + nav, + section, + summary, + main { + @include reset-box-model; + display: block; + } + + audio, + canvas, + video { + display: inline; + zoom: 1; + } + + audio:not([controls]), + [hidden] { + display: none; + } +} diff --git a/assets/scss/util/vendor.scss b/assets/scss/util/vendor.scss new file mode 100644 index 0000000..8e53906 --- /dev/null +++ b/assets/scss/util/vendor.scss @@ -0,0 +1,20 @@ +@mixin vendor( + $prop, + $args, + $only: null, + $ignore: null, + $vendor-property: true +) { + @each $prefix in $vendor-prefixes { + @if $only and not($prefix in $only) or ($ignore and ($prefix in $ignore)) { + @if official == $prefix { + #{$prop}: $args; + } @else { + $newprop: $prop; + @if not $vendor-property { + #{$newprop}: $args; + } + } + } + } +} diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss new file mode 100644 index 0000000..085f1bf --- /dev/null +++ b/assets/scss/variables.scss @@ -0,0 +1,74 @@ +$support-for-ie: 0; +$vendor-prefixes: webkit moz ms official; + +// Colors; +$color-default: #565a5f; +$color-white: #fff; +$color-red: #aa0202; +$color-grey: #999; +$color-grey-dark: #585858; +$color-grey-light: #eee; +$color-border: #eceff2; +$color-link: #38b7ea; +$color-button-background: #e8e8e8; +$color-background: $color-grey-light; +$color-sidebar-text: #777; +$color-sidebar-text-dark: #333; +$color-widget-background: #ddd; +$color-widget-border: #ccc; + +$shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + +// Fonts; +$font-sans: 'open sans' 'Helvetica Neue' Helvetica Arial 'Microsoft Yahei' + sans-serif; +$font-serif: Georgia 'Times New Roman' Arial 'Microsoft Yahei' serif; +$font-mono: 'Source Code Pro' Consolas Monaco Menlo Consolas monospace; +$font-size: 14px; +$line-height: 1.6em; +$line-height-title: 1.3em; + +// Header; +$header-height: 64px; +$header-sub-height: 48px; +$logo-url: 'images/logo.png'; +$logo-width: 160px; +$logo-height: 40px; + +$thumbnail-default-small: 'images/thumb-default-small.png'; + +$profile-avatar-size: 128px; + +// Layout; +$block-margin: 40px; +$article-padding: 20px; +$mobile-nav-width: 280px; +$main-column: 8; +$sidebar-column: 3; +$profile-column: 3; +$sidebar-column-tablet: 4; + +$_sidebar-column: $sidebar-column; + +$_profile-column: $profile-column; + +$column-width: 80px; +$gutter-width: 20px; +$columns: $main-column + $_sidebar-column; + +$main-column-tablet: 5; +$main-column-tablet: 7; + +// Media queries +$mq-sub-par: '290px'; +$mq-tiny: '320px'; +$mq-mobile: '560px'; +$mq-tablet: '800px'; +$mq-normal: '1200px'; +$mq-header: '1020px'; + +// Miscellaneous; +$color-twitter: #00aced; +$color-facebook: #3b5998; +$color-pinterest: #cb2027; +$color-google: #dd4b39; diff --git a/bin/www b/bin/www deleted file mode 100755 index 90925bc..0000000 --- a/bin/www +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env node -/** - * Module dependencies. - */ - -const app = require('../app'); -const debug = require('debug')('express:server'); -const http = require('http'); - -/** - * Get port from environment and store in Express. - */ - -const port = normalizePort(process.env.PORT || '3000'); -app.set('port', port); - -/** - * Create HTTP server. - */ - -const server = http.createServer(app); - -/** - * Listen on provided port, on all network interfaces. - */ - -server.listen(port); -server.on('error', onError); -server.on('listening', onListening); - -/** - * Normalize a port into a number, string, or false. - */ - -function normalizePort (val) { - const port = parseInt(val, 10); - - if (isNaN(port)) { - // named pipe - return val; - } - - if (port >= 0) { - // port number - return port; - } - - return false; -} - -/** - * Event listener for HTTP server "error" event. - */ - -function onError (error) { - if (error.syscall !== 'listen') { - throw error; - } - - const bind = typeof port === 'string' ? `Pipe ${port}` : `Port ${port}`; - - // handle specific listen errors with friendly messages - switch (error.code) { - case 'EACCES': - console.error(`${bind} requires elevated privileges`); - process.exit(1); - break; - case 'EADDRINUSE': - console.error(`${bind} is already in use`); - process.exit(1); - break; - default: - throw error; - } -} - -/** - * Event listener for HTTP server "listening" event. - */ - -function onListening () { - const addr = server.address(); - const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr.port}`; - debug(`Listening on ${bind}`); -} diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..3c46dcb --- /dev/null +++ b/config.toml @@ -0,0 +1,174 @@ +baseURL = "http://redbrick.dcu.ie/" +languageCode = "en-uk" +title = "Redbrick" +googleAnalytics = "UA-85359173-1" +paginate = 10 +footnotereturnlinkcontents = "↩" +disablePathToLower = true + +[permalinks] + post = "/:year/:month/:day/:slug" + +[params] + author = "Redbrick" + subtitle = "DCU's Networking Society" + site_description = "Redbrick is DCU’s Computer Networking society. We host events for everything computing related this ranges from; how to setup your own website and storing your photos online to System Administration and Computer Programming Tutorials. We also host a number of services for our membership." + email = "committee@redbrick.dcu.ie" + location = "Clubs and Societies Office, Dublin City University, Glasnevin, Dublin 9." + avatar = "images/avatar.png" + logo = "images/logo.png" + date_format = "2006-01-02" # Format dates with Go's time formatting + +[menu] + [[menu.main]] + name = "Home" + pre = "" + url = "/" + weight = -110 + [[menu.main]] + name = "About" + pre = "" + url = "#" + identifier = "about" + weight = -90 + [[menu.main]] + name = "The Society" + pre = "" + url = "/about" + parent = "about" + [[menu.main]] + name = "Committee" + pre = "" + url = "/about/committee" + parent = "about" + [[menu.main]] + name = "Minutes" + pre = "" + url = "/about/minutes" + parent = "about" + [[menu.main]] + name = "Constitution" + pre = "" + url = "/about/constitution" + parent = "about" + [[menu.main]] + name = "Regulations" + pre = "" + url = "/about/regulations" + parent = "about" + [[menu.main]] + name = "Contact" + pre = "" + url = "/about/contact" + parent = "about" + [[menu.main]] + name = "Past Committee" + pre = "" + url = "/about/past-committees" + parent = "about" + [[menu.main]] + name = "Help" + pre = "" + url = "/help/" + identifier = "help" + weight = -70 + [[menu.main]] + name = "Helpdesk" + pre = "" + url = "/help" + parent = "help" + [[menu.main]] + name = "Joining" + pre = "" + url = "/help/joining" + parent = "help" + [[menu.main]] + name = "Tutorial" + pre = "" + url = "/help/tutorials" + parent = "help" + [[menu.main]] + name = "Exams" + pre = "" + url = "/help/exams" + parent = "help" + [[menu.main]] + name = "Services" + pre = "" + url = "/help/services" + parent = "help" + [[menu.main]] + name = "Services" + pre = "" + url = "#" + identifier = "services" + weight = -60 + [[menu.main]] + name = "Mail" + pre = "" + url = "https://webmail.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "Wiki" + pre = "" + url = "https://wiki.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "Chat" + pre = "" + url = "https://webchat.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "Git" + pre = "" + url = "https://git.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "HackMD" + pre = "" + url = "https://md.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "Hastebin" + pre = "" + url = "https://paste.redbrick.dcu.ie" + parent = "services" + [[menu.main]] + name = "Events" + pre = "" + url = "/events/" + weight = -10 + [[menu.footer]] + name = "events" + url = "/events" + [[menu.footer]] + name = "contact" + url = "/about/contact" + [[menu.footer]] + name = "Call for Talks" + url = "/CFT" + +[params.widgets] + recent_articles = true + categories = false + tags = false + tag_cloud = true + +[params.profile] + follow_button = "https://twitter.com/redbrickdcu" + +[social] + github = "redbrick" + twitter = "redbrickdcu" + facebook = "dcuredbrick" + youtube = "redbrickdcu" + status = "redbrick.status.io" + +[params.googleCal] + api = "AIzaSyAV0PnlM4b3k2NoBPglIuMD8vfQwlD31zY" + id = "r2l6edh5l8jm5t9dbfi84rn26s" + +[outputs] + page = ["HTML", "json"] + home = ["HTML", "RSS", "json"] + section = ["HTML", "RSS", "json"] diff --git a/content/CFT/_index.md b/content/CFT/_index.md new file mode 100644 index 0000000..31154f8 --- /dev/null +++ b/content/CFT/_index.md @@ -0,0 +1,48 @@ +--- +banner: talks.jpg +date: '2017-02-26' +title: Call for Talks +--- + +Redbrick are looking for people to come and talk to our members, and we'd like +to hear from you! We'd like people to come and talk to us about all aspects of +software engineering, operations, networking, or anything that you’re passionate +about. Some talks we've had in the past that we've enjoyed have included: + +- Security +- Internet of Things (IoT) +- Virtualisation +- Mobile Development +- Development tools +- Web Design +- Distributed Systems +- Open Source Software +- Networking +- Linux +- Hardware +- Frameworks + +## What we want? + +We want people to come and talk to us! We’d love to hear about any relevant +topic that you’re passionate about, or want to spread the word about. We’re open +to any ideas, so if you think that you have an idea for a talk, just email us at +committee@redbrick.dcu.ie with a short description and we’ll see what we can +organise. + +We hold weekly tutorials and talks, usually run by members of the committee, but +often by our associate members (former students and staff of DCU) and other +people from the industry. + +Since we’re a college society, we tend to try organise talks during the +semester, and to work around lecture schedules. Typically this is from September +to December, and February to June. We normally meet on Monday/Tuesday/Thursday +between 4 and 6pm, or on Wednesday between 2 and 5pm. We’re flexible though, so +don't let that put you off! + +## Who are we? + +Redbrick is the Computer Networking society in DCU. We started in 1996, and +since then we've been building a community of members with a common interest: +All things tech. We aim to make a great environment to learn new skills and +technologies and to meet other people with a common interest. diff --git a/source/CFT/talks.jpg b/content/CFT/talks.jpg similarity index 100% rename from source/CFT/talks.jpg rename to content/CFT/talks.jpg diff --git a/content/about/_index.md b/content/about/_index.md new file mode 100644 index 0000000..3680b16 --- /dev/null +++ b/content/about/_index.md @@ -0,0 +1,47 @@ +--- +banner: society.jpg +date: '2016-04-17 16:22:40' +title: About Redbrick +type: about +--- + +Redbrick is DCU's Computer Networking society. We host events for everything +computing related this ranges from; how to setup your own website and storing +your photos online to System Administration and Computer Programming Tutorials. +We also host a number of services for our membership. + +## A Brief Redbrick History + +In October of 1995 a group of friends started the ball rolling on the idea of a +computer network in [DCU][1], run by students for the students. Starting out +with a battered 386 PC (dubbed Nurse), bits of borrowed memory, their own cash, +and a lot of luck, they went about organising the DCU Networking Society. Once +recognised as a society, they were allowed to setup a temporary home for our +server in the [Computer Applications][2] faculty. With the approval of John +Boland, the then head of [Computer Services][3] in DCU, the society received its +own subnet, dubbed Redbrick, along with a physical area in which to store Nurse, +our one and only machine. Since April 9th 1996, when the machine went officially +online, the society itself has grown rapidly. So rapidly in fact, that we are +one of the largest societies on/off campus! + +Redbrick's social side has grown a lot also, with the society celebrating its +[20th Anniversary][4] back in April 2016. The society continues to run their +annual Freshers Ball, Halloween Party, Christmas Party and Tech Week throughout +the year. + +As one of the biggest societies in DCU, we're always looking for new membership. +The membership fee itself is a paltry €4.00 until Clubs & Socs Day 2 +(generally mid February) when the membership cost drops to €2.00! However +outside of Clubs & Socs days it becomes a little awkward to sign up, but it is +more than doable - check [here][5] for details on how to pay. Our current main +server is [Azazel][6], with Pygmalion also providing login services to users. +See the [Redbrick Hardware Inventory][7] for descriptions of our servers and +other equipment. + +[1]: https://dcu.ie +[2]: http://computing.dcu.ie +[3]: http://www.dcu.ie/csd +[4]: http://wiki.redbrick.dcu.ie/mw/RedBrick_Anniversary +[5]: ../help/joining +[6]: http://wiki.redbrick.dcu.ie/mw/Azazel +[7]: https://docs.redbrick.dcu.ie/#hardware diff --git a/source/about/committee/index.md b/content/about/committee.md similarity index 66% rename from source/about/committee/index.md rename to content/about/committee.md index 86d3d9f..ee2d243 100644 --- a/source/about/committee/index.md +++ b/content/about/committee.md @@ -1,83 +1,84 @@ ---- -title: Committee -date: 2018-17-10 18:00:00 -type: cmt +--- cmt: - - position: Chairperson + - image: mctastic.jpg name: James Mc Dermott nick: mctastic - image: mctastic.jpg - - position: Vice Chair - name: Eamon Crawford + position: Chairperson + - name: Eamon Crawford nick: eamon_c - image: eamonc.jpg - - position: Secretary + position: Vice Chair + - image: branch.jpg name: Nevan Oman Crowe nick: branch - image: branch.jpg - - position: Treasurer + position: Secretary + - image: hexagon.jpg name: Ciara Godwin nick: hexagon - image: hexagon.jpg - - position: Public Relations Officer + position: Treasurer + - image: sangreal.jpg name: Josh Malone nick: sangreal - image: sangreal.jpg - - position: Graphic Design Officer + position: Public Relations Officer + - image: depp.png name: Theo Coyne Morgan nick: depp - image: depp.png - - position: Events Officer + position: Graphic Design Officer + - image: thegirl.jpg name: Cliodhna Harrison nick: thegirl - image: thegirl.jpg - - position: Events Officer + position: Events Officer + - image: chill.jpg name: Jack Liston nick: chill - image: chill.jpg - - position: System Administrator + position: Events Officer + - image: m1cr0man.jpg name: Lucas Savva nick: m1cr0man - image: m1cr0man.jpg - - position: System Administrator + position: System Administrator + - image: mcmahon.jpg name: Ben McMahon nick: mcmahon - image: mcmahon.jpg - - position: System Administrator + position: System Administrator + - image: greenday.jpg name: Tom Doyle nick: greenday - image: greenday.jpg - - position: Webmaster + position: System Administrator + - image: fraz.jpg name: Sean Fradl nick: fraz - image: fraz.jpg - - position: Helpdesk + position: Webmaster + - image: berns.jpg name: Conor Berns nick: berns - image: berns.jpg - - position: Helpdesk - name: Connor Mulready + position: Helpdesk + - image: mulreac.jpg + name: Connor Mulready nick: mulreac - image: mulreac.jpg - - position: First Year Rep + position: Helpdesk + - image: wolfer.jpg name: Maciej Zamoyski Swierad nick: wolfer - image: wolfer.jpg - - position: Ordinary Member + position: First Year Rep + - image: sun.jpg name: Daniel Christie nick: sun - image: sun.jpg - - position: Ordinary Member + position: Ordinary Member + - image: cianky.jpg name: Cian Kehoe nick: cianky - image: cianky.jpg - + position: Ordinary Member +date: 2018-17-10 18:00:00 +title: Committee +type: committee --- -The Committee is a 17 person team which is elected yearly to run all aspects of the society. +The Committee is a 17 person team which is elected yearly to run all aspects of +the society. ## Helpdesk -The Helpdesk is made up of the wonderful Conor Berns (berns) and Connor Mulready (mulreac). + +The Helpdesk is made up of the wonderful Conor Berns (berns) and Connor Mulready +(mulreac). The Helpdesk is what it sounds like, a desk for help. No seriously, we're here to help out and answer any questions at all to help you make the most of @@ -88,20 +89,24 @@ We also run regular tutorial in the CA labs in DCU, any member can attend and we will guide you through the basics and answer any queries, watch out for notices and posters around campus or on Redbrick. -The Helpdesk tutorials can be found [here](/help/tutorials/). +The Helpdesk tutorials can be found +[here](https://redbrick.dcu.ie/help/tutorials/). ## Admins + An elite team of individuals dedicated to keeping the society's hardware and services running. The Admin team is made up of three elected Admins and the Webmaster who are current members of the Committee, as well as previous elected root holders who have volunteered to keep doing stuff. Elected System Administrators: + - Tom Doyle (greenday) - Lucas Savva (m1cr0man) - Ben McMahon (mcmahon) Esteemed Holders Of Root: + - Lucas Savva (m1cr0man) - Ben McMahon (mcmahon) - Tom Doyle (greenday) diff --git a/content/about/constitution.md b/content/about/constitution.md new file mode 100644 index 0000000..71a0ea1 --- /dev/null +++ b/content/about/constitution.md @@ -0,0 +1,267 @@ +--- +date: '2016-04-17 16:22:40' +title: Constitution +type: about +--- + +# DUBLIN CITY UNIVERSITY: Dublin City University Networking Society CONSTITUTION + +## 1. Name of Society: + +1. The official name of the society will be Dublin City University Networking + Society. This shall appear on correspondence with official bodies. + 1. The society operates under the name Redbrick. + +## 2. Aims & Objectives: + +The aims and objectives of the Society are as follows: + +1. To facilitate computer networking in all its forms. +2. The promotion of electronic communication and related computer systems in + all its forms. +3. To foster the development of members. +4. To provide a forum for members to interact and socialise through activities + and discuss and gain experience in computer networking. +5. To assist Society members to represent the Society at a higher level. +6. To increase and promote awareness of electronic communication and related + computer systems. +7. To help educate people in the usage of Internet utilities and resources. + +## 3. Members: + +1. Membership of the Society shall be open to all students, staff and former + students of the University, +2. Membership shall be obtained by paying the appropriate fee and registering + with the OSL Database for the current academic year. +3. The Society recognizes the important role that former students and staff can + play in Societies . Therefore there shall be a class of "Associate Member" + of the Society for former students of the University and staff. +4. Associate Members shall pay an annual membership fee to the Society. The + amount of this fee shall not be less than the ordinary membership fee and no + more than 10 (ten) times the ordinary membership fee.Application for a + higher Associate Member fee made be made to the OSL by the Society involved. +5. In consultation with OSL as outlined (see section 3.4) associate members + shall pay an annual membership fee that will be twice that of the ordinary + membership fee.This will be re-evaluated in the event of a change to the + ordinary membership fee. +6. Associate Members are not eligible for election to the Society’s Governing + Executive committee +7. Associate Members shall be entitled to attend all general meetings of the + Society but have no voting rights. The rights of an Associate Member shall + not exceed those of an ordinary member of the Society +8. All members shall be bound by this constitution +9. Honorary lifetime membership is awarded to the founding committee members. +10. Nothing in this section shall prevent the society bestowing honorary + membership upon a graduate or former student of Dublin City University. + +## 4. Governing Executive Committee: + +1. The Society shall have a Governing Executive Committee all of whom must be + fully registered students of DCU (The Committee). +2. The Committee shall run the Society of behalf of its members and in + accordance with the aims and objectives. +3. Although decisions should be arrived at by the consensus of the committee + (where possible), committee decisions shall be decided by majority voting. +4. A quorum shall be ⅔ of committee members. +5. The following Officer positions are obligatory on the Committee : + +- Chairperson +- Secretary +- Treasurer +- Public Relations Officer + +_Other suggested positions include:_ + +- 3x Systems Administrators +- 2x Helpdesk +- 1st Year Liaison Officer +- 2x Events Officer +- Webmaster +- 2x Ordinary Member +- Vice Chair +- Graphics Design Officer (G.D.O) + +6. The Term of Office of these elected officers shall be one academic year. +7. No student may hold an obligatory Officer (as above) position for more than + two consecutive years. + +## 5. Election of the Governing Executive Committee: + +1. The Committee Members shall be democratically elected at the Annual General + Meeting (AGM) or at an Extra-ordinary General Meeting (EGM). +2. To seek election to the Committee, each candidate must have two nominations + by current members of the Society. +3. To be deemed fit for election to the position of Systems Administrator or + Webmaster, the candidate must either: +4. Pass an Aptitude test, as devised by the outgoing Webmaster for Webmaster + candidates, or system administrators for system administrator candidates. If + it is deemed preferable to do so, the test may be set by a third party + nominated by the Webmaster (in the case of the Webmaster examination), or by + a majority of the system administrators (in the case of the system + administrator exams). The current committee will nominate this third party. + Be an outgoing Webmaster or Systems Administrator +5. All Helpdesk candidates must sit and pass a test as devised by the outgoing + education officer(s) + +## 6. Duties of the Governing Executive Committee: + +1. The Chairperson shall be the Chief Officer of the Society whose functions + include chairing all meetings of the committee and officiating at meetings + of the Society. +2. The Chair of any meeting shall have an ordinary vote at committee meetings + and meetings of the Society. In the event of a tied vote on any matter + she/he shall have the casting vote. +3. The Secretary’s function shall be to deal with all correspondence and + records of the Society. +4. The Secretary keeps minutes of all committee meetings, of all general + meetings, of the Annual General Meeting or any other meetings related to the + business of the Society when requested by the committee. +5. The Secretary may keep a record of authorization of expenditure. +6. The Secretary shall give notice to all members of the Society's meetings, + events, and functions. +7. The Secretary shall assist the Public Relations Officer (PRO) or other + officers to organize fundraising events and sponsorship where necessary. +8. The Treasurer’s function shall be to administer the funds of the Society and + to maintain accounts and budgets. +9. The Treasurer shall be responsible for the maintenance of accounts subject + to the decision of the committee in compliance with the regulations set down + by the Society Life Committee. +10. The Treasurer shall keep full records of income and expenditure of the + Society. The Treasurer shall also keep a record of who authorized various + expenditures and shall issue receipts. +11. The Treasurer must countersign all cheques and withdrawal forms for the + Society’s bank account. +12. Where the Treasurer is decreed as unavailable, another designated person may + countersign cheques and withdrawal forms for the Society in consultation + with the Society Life Committee. +13. The Public Relations Officer (along with the Secretary) shall be responsible + for the advertising of all functions of the Society through all means + possible. +14. The System Administrators shall be held ultimately responsible for the + administration, security, and maintenance of the society's computer systems. + They shall be responsible for the notification of the committee in regard to + any breaches of the rules and regulations of the system. They are hereby + authorised to take any administrative action necessary to discharge their + duties, so long as such actions are constitutional. Such actions are open to + review by the committee. +15. The Webmaster shall be responsible for the design, implementation, and + maintenance of the web site. They shall work in conjunction with other + members of the committee in order to publicise society details via the web. +16. The Helpdesk's role is to answer the system-related questions of the + society's membership, and to detail, organise, and implement beneficial + tutorials for the members. +17. The Events Officer shall have the responsibility of organising all + receptions held by the society. +18. 1st Year Liaison Officer shall work with the committee to make the society + more accessible for first years. As part of this they shall work with the + Events, Public Relations & Helpdesk where applicable. The 1st Year Liaison + Officer shall be elected at an EGM in semester one, and must be in their + first year as an undergraduate student at DCU. +19. The Ordinary member shall be an assiting figure within the society. The + shall be involved in assiting other committee members in their duties and + the organisation and running of events. +20. The Vice Chair shall act as a stand in chair in the absence of the elected + one and shall be required to assume all their aforementioned duties. In the + event that neither is available, a stand in may be elected ad hoc. +21. The Graphics Design Officer (G.D.O) shall be responsible for the design and + creation of art assets for events and promotional materials. They shall also + be required to liase with the Events officer(s) and PRO in the commissioning + and distribution of said materials +22. The committee shall endeavour to meet weekly during term time, at which a + majority of the committee must attend. +23. Any committee member that misses more than 3 committee meetings without the + permission of the chair will be deemed to have reasonable grounds for + dismissal subject to section 7 + +## 7. Dismissal and Resignation of Committee Members: + +1. No member of the committee shall be dismissed from office unless: +1. Written notice of a resolution to seek such a dismissal, signed by 10% of + the members of the Society is received five working days prior to a general + meeting at which such a resolution shall be debated. +1. ⅔ of the Governing Executive Committee may also call a meeting to debate the + dismissal of another committee member. +1. A resolution to dismiss a committee member shall be passed by a simple + majority voting at the relevant and quorate meeting. +1. A committee member wishing to resigned must submit a letter in writing + declaring that intention to resign to the Secretary, who will immediately + inform the committee as a whole. The responsibilities of that person shall + be delegated to other committee member(s) until a by- election can be held + to re-elect a new person to the position. + +## 8. Meetings: + +1. There shall be an Annual General Meeting (AGM) held each year where the + committee member shall be elected +2. The AGM shall be held no later than in the final month of the Academic year. +3. A quorum of a meeting shall be a majority of the committee members and the + square-root of the number of ordinary members, rounded-up. +4. The business of the AGM shall include elections of relevant Executive + Governing Committee as well as annual reports from the outgoing Governing + Executive Committee (which should include a Treasurer’s report on the + finances of the Society). +5. An Extra-ordinary General Meeting (EGM) shall be convened if: +6. 10% of the ordinary membership of the Society requests such a meeting in + writing. +7. A quorum of the Governing Executive Committee requests such a meeting in + writing. +8. A vacancy on the current committee occurs and there is a need to elect a + replacement. +9. Notice of all meetings shall be given to the membership at least five + working days prior to the date of the meeting. +10. At a meeting, a member may propose a resolution relating to the business of + the Society. The resolution shall be voted on by a show of hands and a + declaration of the Chairperson that the resolution is carried (unless a + secret ballot is demanded by any 5 members) shall be conclusive evidence + that the resolution has passed or failed. +11. In the event that the Chairperson’s resolution (8.7) is challenged a recount + of the votes will be administered in which a number of appropriate people + will be appointed by the committee as "tellers" to count the votes. The + result will be announced by the Chairperson or the Vice-Chairperson (where + requested by the general meeting). +12. No resolution may contravene DCU, DCU OSL or CLC policy. + +## 9. General: + +1. There shall be a President of the Society who shall be a staff member in + compliance with the regulations set down by the Society Life Committee +2. The membership fee for the Society shall be in compliance with the + conditions set down by the OSL +3. Each member of the Society shall be entitled to receive a copy of this + Constitution, on demand, free of charge. +4. In the event of a clash with the Society Life Committee Constitution, the + Society Life Committee Constitution shall take precedence above this + constitution and is subject to the Society Life Committee at all times. +5. In joining the Society, members agree to be bound by the rules and + regulations of the Society as laid down in this constitution and by the + Governing Executive Committee. Members violating these rules and regulations + shall be answerable to the committee and may have + 1. Computer system account suspended for a period of time decided by the + System Administrators. + 2. Their membership revoked and no monies refunded, for persistent breaches + or extremely serious breaches, as deemed by a majority of the committee. + In the event that the committee cannot resolve a dispute with a + member(s), The Society Life Committee shall rule on the matter and its + decision is final. + +## 10. Equipment. + +1. Any equipment loaned to the society by individuals may only be withdrawn if: +1. Notice is given by the individual at least two weeks prior to the date of + withdrawal. +1. Or by the express approval of a committee majority. +1. The society shall seek to return any loaned equipment. +1. Any equipment donated to the society shall therein be the property of the + society. +1. Any equipment which is damaged or destroyed whilst on loan to the society + will have its replacement cost paid to it's loaner. +1. Administration of loaned or donated equipment shall be the exclusive + responsibility of the committee. + +## 11. Amendments to this Constitution: + +1. Notice of a proposal to seek an amendment to this Constitution shall be + given to the members at least 4 working days prior to the meeting at which + such a proposal shall be considered. +2. A proposal to amend this Constitution must receive the approval of 2/3 of + the members present and entitled to vote at the relevant meeting. diff --git a/source/about/contact/index.md b/content/about/contact.md similarity index 67% rename from source/about/contact/index.md rename to content/about/contact.md index 28ebc89..4cdd714 100644 --- a/source/about/contact/index.md +++ b/content/about/contact.md @@ -1,34 +1,48 @@ --- +date: '2016-04-17 16:22:40' title: Contact & Services type: about -date: 2016-04-17 16:22:40 --- ### Redbrick Admin Team -- This address can be used to contact the Admin team if you have any requests regarding your account or any special service requests. -- Please provide your Redbrick username (if applicable or you are not using your Redbrick email address) and in the case of getting unsubscribed to a mailing list the mailing list's name and the email subscribed is very important. + +- This address can be used to contact the Admin team if you have any requests + regarding your account or any special service requests. +- Please provide your Redbrick username (if applicable or you are not using your + Redbrick email address) and in the case of getting unsubscribed to a mailing + list the mailing list's name and the email subscribed is very important. - Email the Redbrick [Admin Team][5] ### Helpdesk Team -If you have any queries about the functionality of your Redbrick account, or if you have any issues you want explained, you can contact the [Helpdesk Team][6] + +If you have any queries about the functionality of your Redbrick account, or if +you have any issues you want explained, you can contact the [Helpdesk Team][6] ### Accounts And Finance -Enquiries regarding membership and financing should be directed to our [Treasurer][7]. + +Enquiries regarding membership and financing should be directed to our +[Treasurer][7]. ### Webgroup/Webmaster -If you would like to get involved with the Webgroup (more information [here][4]) or -have web-related Redbrick queries, please email the [Webmaster][8]. + +If you would like to get involved with the Webgroup (more information [here][4]) +or have web-related Redbrick queries, please email the [Webmaster][8]. ### Committee + If there is a general matter you wish to raise with the Committee please Email use [here][9]. ### Abuse + If there is a matter you would like to raise with committee concerning the abuse of redbrick services you can contact committee [here][10]. ## Discussion Lists -Redbrick hosts many discussion and announce lists which can be viewed [here][1]. Two lists members may find interesting are the [admin discussion][2] list and the [trainee admin][3] list. + +Redbrick hosts many discussion and announce lists which can be viewed [here][1]. +Two lists members may find interesting are the [admin discussion][2] list and +the [trainee admin][3] list. [1]: http://lists.redbrick.dcu.ie/ [2]: http://lists.redbrick.dcu.ie/mailman/listinfo/admin-discuss diff --git a/source/about/minutes/index.md b/content/about/minutes.md similarity index 93% rename from source/about/minutes/index.md rename to content/about/minutes.md index cf966f3..e5a5c32 100644 --- a/source/about/minutes/index.md +++ b/content/about/minutes.md @@ -1,14 +1,14 @@ --- +date: '2018-09-20 16:22:40' title: Minutes type: about -date: 2018-09-20 16:22:40 --- ### Current Years Minutes + - [10 September 2018](https://md.redbrick.dcu.ie/s/rJl8e9f_X#) - [17 September 2018](https://md.redbrick.dcu.ie/s/BJNtEno_m#) - [24 September 2018](https://md.redbrick.dcu.ie/s/S1t64mSt7#) - [01 October 2018](https://md.redbrick.dcu.ie/s/rJVG0IRYm#) - [08 October 2018](https://md.redbrick.dcu.ie/s/r13Y8sD5X) - [15 October 2018](https://md.redbrick.dcu.ie/s/Hk7jDEZo7#) - diff --git a/content/about/past-committees/_index.md b/content/about/past-committees/_index.md new file mode 100644 index 0000000..9406c5c --- /dev/null +++ b/content/about/past-committees/_index.md @@ -0,0 +1,32 @@ +--- +title: Past Committees +type: about +--- + +Over the years Redbrick has had many many people serve on its committee. Below +is a list of each year and the names of the people who were a part of the +committee. There is also an interesting page on our wiki which shows this in one +[diagram](http://wiki.redbrick.dcu.ie/mw/Committee_Timeline). + +- [Committee 2017-2018](./the-committee-2017-2018) +- [Committee 2016-2017](./the-committee-2016-2017) +- [Committee 2015-2016](./the-committee-2015-2016) +- [Committee 2014-2015](./the-committee-2014-2015) +- [Committee 2013-2014](./the-committee-2013-2014) +- [Committee 2012-2013](./the-committee-2012-2013) +- [Committee 2011-2012](./the-committee-2011-2012) +- [Committee 2010-2011](./the-committee-2010-2011) +- [Committee 2009-2010](./the-committee-2009-2010) +- [Committee 2008-2009](./the-committee-2008-2009) +- [Committee 2007-2008](./the-committee-2007-2008) +- [Committee 2006-2007](./the-committee-2006-2007) +- [Committee 2005-2006](./the-committee-2005-2006) +- [Committee 2004-2005](./the-committee-2004-2005) +- [Committee 2003-2004](./the-committee-2003-2004) +- [Committee 2002-2003](./the-committee-2002-2003) +- [Committee 2001-2002](./the-committee-2001-2002) +- [Committee 2000-2001](./the-committee-2000-2001) +- [Committee 1999-2000](./the-committee-1999-2000) +- [Committee 1998-1999](./the-committee-1998-1999) +- [Committee 1997-1998](./the-committee-1997-1998) +- [Committee 1996-1997](./the-committee-1996-1997) diff --git a/content/about/past-committees/the-committee-1996-1997.md b/content/about/past-committees/the-committee-1996-1997.md new file mode 100644 index 0000000..7f2e2b1 --- /dev/null +++ b/content/about/past-committees/the-committee-1996-1997.md @@ -0,0 +1,23 @@ +--- +cmt: + - name: Sean Cullen + nick: hyper + position: Chairperson + - name: Dermot Hanley + nick: wibble + position: Secretary + - name: Paraic O'Ceallaigh + nick: swipe + position: Treasurer + - name: Michael McHugh + nick: sandman + position: Public Relations Officer + - name: Fergus Donohue + nick: fergus + position: System Administrator + - name: David Murphy + nick: drjolt + position: System Administrator +title: The Committee 1996-1997 +type: committee +--- diff --git a/content/about/past-committees/the-committee-1997-1998.md b/content/about/past-committees/the-committee-1997-1998.md new file mode 100644 index 0000000..7fecfa0 --- /dev/null +++ b/content/about/past-committees/the-committee-1997-1998.md @@ -0,0 +1,45 @@ +--- +cmt: + - name: Patrick Grant + nick: floppy + position: Chairperson + - name: Mike Bennet + nick: thalia + position: Chairperson + resigned: true + - name: Jonathan Lundberg + nick: spock + position: Secretary + - name: Aoife McGoveran + nick: hms + position: Treasurer + - name: Dave O'Flynn + nick: firefly + position: Public Relations Officer + - name: Kevin O'Donovan + nick: kod + position: Events Officer + - name: Dermot Hanley + nick: wibble + position: System Administrator + - name: Ka Chun Leung + nick: plop + position: System Administrator + - name: David Murphy + nick: drjolt + position: System Administrator + - name: Andrew Lawless + nick: andy + position: Webmaster + - name: Shane O'hUid + nick: wishkah + position: Helpdesk + - name: Daire McKenna + nick: fatwa + position: Helpdesk + - name: John Barker + nick: barkerj + position: Helpdesk +title: The Committee 1997-1998 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-1998-1999.md b/content/about/past-committees/the-committee-1998-1999.md new file mode 100644 index 0000000..e749357 --- /dev/null +++ b/content/about/past-committees/the-committee-1998-1999.md @@ -0,0 +1,56 @@ +--- +cmt: + - name: Justin Moran + nick: cain + postion: Chairperson + - name: Jonathan Lundberg + nick: spock + position: Secretary + - name: Caroline Sheedy + nick: bootie + position: Treasurer + - name: Kevin O'Donovan + nick: kod + position: Events Officer + - name: Cecily Murray + nick: celery + position: Public Relations Officer + - name: Adam Kelly + nick: cthulhu + position: System Administrator + - name: John Looney + nick: valen + position: System Administrator + - name: Hoi Chau Wong + nick: whc + position: System Administrator + - name: Colin Whittaker + nick: grimnar + position: System Administrator + - name: John Bolger + nick: jbolger + position: System Administrator + - name: Cian Synnott + nick: pooka + position: System Administrator + - name: Ka Chun Leung + nick: plop + position: System Administrator + - name: Brian Scanlan + nick: singer + position: Webmaster + - name: David Murphy + nick: drjolt + position: Webmaster + - name: Aoife Cahill + nick: ace + position: Helpdesk + - name: Sarvesh Singh + nick: macbain + position: Helpdesk + - name: Eoin McGrath + nick: bob + position: Helpdesk +title: The Committee 1998-1999 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-1999-2000.md b/content/about/past-committees/the-committee-1999-2000.md new file mode 100644 index 0000000..5fca07a --- /dev/null +++ b/content/about/past-committees/the-committee-1999-2000.md @@ -0,0 +1,44 @@ +--- +cmt: + - name: Jonathan Lundberg + nick: spock + position: Chairperson + - name: Caroline Sheedy + nick: bootie + position: Secretary + - name: Damien Martin + nick: otto + position: Treasurer + - name: Orla McGan + nick: orly + position: Events Officer + - name: Julie Kerin + ncik: julie + position: Public Relations Officer + - name: Adam Kelly + nick: cthulhu + position: System Administrators + - name: Hoi Chau Wong + nick: whc + position: System Administrators + - name: Robert Crosbie + nick: bobb + position: System Administrators + - name: Karl Podesta + nick: kpodesta + position: Webmaster + - name: Conor O'Kane + nick: cokane + position: Helpdesk + - name: Nigel Parkes + nick: elmer + position: Helpdesk + - name: Eileen Gavin + nick: munchkin + position: Helpdesk + - name: Barry O'Neill + nick: bubble + position: Helpdesk +title: The Committee 1999-2000 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2000-2001.md b/content/about/past-committees/the-committee-2000-2001.md new file mode 100644 index 0000000..102545d --- /dev/null +++ b/content/about/past-committees/the-committee-2000-2001.md @@ -0,0 +1,47 @@ +--- +cmt: + - name: Karl Podesta + nick: kpodesta + position: Chairperson + - name: Brian Banbrick + nick: moridin + position: Secretary + - name: Jonathan Lundberg + nick: spock + position: Treasurer + - name: John Canavan + nick: tibor + position: Events Officer + - name: Kevin Cannon + nick: p + position: Public Relations Officer + - name: Philip Reynolds + nick: phil + position: System Administrators + - name: Sarvesh Singh + nick: macbain + position: System Administrators + - name: Noel Fitzpatrick + nick: noelfitz + position: System Administrators + - name: Mark Dunne + nick: pixies + position: System Administrators + - name: Robert Crosbie + nick: bobb + position: System Administrators + - name: Barry O'Neill + nick: bubble + position: Webmaster + - name: Conor O'Kane + nick: cokane + position: Education Officers + - name: Mark Campbell + nick: mark + position: Education Officers + - name: Donal Hunt + nick: redgiant + position: Education Officers +title: The Committee 2000-2001 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2001-2002.md b/content/about/past-committees/the-committee-2001-2002.md new file mode 100644 index 0000000..44f6228 --- /dev/null +++ b/content/about/past-committees/the-committee-2001-2002.md @@ -0,0 +1,41 @@ +--- +cmt: + - name: Donal Mulligan + nick: thor + position: Chairperson + - name: Brian Banbrick + ncik: moridin + position: Secretary + - name: John Canavan + nick: tibor + position: Treasurer + - name: Micheal Glennon + nick: magluby + position: Events Officer + - name: Andrew MacCann + nick: montoya + position: Public Relations Officer + - name: Philip Reynolds + nick: phil + position: System Administrators + - name: Mark Campbell + nick: mark + position: System Administrators + - name: Cillian Sharkey + nick: cns + position: System Administrators + - name: Colm MacCarthaigh + nick: colmmacc + position: Webmaster + - name: Kevin Dermody + nick: esoteric + position: Education Officers + - name: Nikki Kenny + nick: kamili + position: Education Officers + - name: Neil Walsh + nick: marvin + position: Education Officers +title: The Committee 2001-2002 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2002-2003.md b/content/about/past-committees/the-committee-2002-2003.md new file mode 100644 index 0000000..ebae2f4 --- /dev/null +++ b/content/about/past-committees/the-committee-2002-2003.md @@ -0,0 +1,53 @@ +--- +cmt: + - name: Nikki Kenny + nick: kamili + position: Chairperson + - name: Trevor Johnston + nick: trevj + position: Secretary + - name: Andrew MacCann + nick: montoya + position: Secretary + resigned: true + - name: Grainne Sheerin + nick: dimples + position: Treasurer + - name: Neil Walsh + nick: marvin + position: Treasurer + resigned: true + - name: Micheal Glennon + nick: magluby + position: Events Officer + - name: Shane Tallon + nick: del_boy + position: Public Relations Officer + - name: Cillian Sharkey + nick: cns + position: System Administrators + - name: Dermot Duffy + nick: dizer + position: System Administrators + - name: Mark Dunne + nick: pixies + position: System Administrators + - name: David Johnston + nick: emperor + position: Webmaster + - name: Eoin Campbell + nick: cambo + position: Education Officers + - name: Declan McMullen + nick: skyhawk + position: Education Officers + - name: Declan O'Neill + nick: dec + position: Education Officers + - name: Mark Campbell + nick: mark + position: Education Officers + resigned: true +title: The Committee 2002-2003 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2003-2004.md b/content/about/past-committees/the-committee-2003-2004.md new file mode 100644 index 0000000..71da995 --- /dev/null +++ b/content/about/past-committees/the-committee-2003-2004.md @@ -0,0 +1,45 @@ +--- +cmt: + - name: David Johnston + nick: emperor + position: Chairperson + - name: Cillian Sharkey + nick: cns + position: Secretary + - name: Seamus O'Toole + nick: mael + position: Treasurer + - name: Grainne Sheerin + nick: dimples + position: Treasurer + resigned: true + - name: Martina Frain + nick: dramaq + position: Events Officer + - name: Aisling Devlin + nick: aeris + position: Public Relations Officer + - name: Martin Clarke + nick: prolix + position: System Administrators + - name: Dermot Duffy + nick: dizer + position: System Administrators + - name: Martin Harte + nick: tuama + position: System Administrators + - name: Declan McMullen + nick: skyhawk + position: Webmaster + - name: Eoin Campbell + nick: cambo + position: Education Officers + - name: Una Kehoe + nick: keloe + position: Education Officers + - name: Sun Ning + nick: sunshine + position: Education Officers +title: The Committee 2003-2004 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2004-2005.md b/content/about/past-committees/the-committee-2004-2005.md new file mode 100644 index 0000000..649adef --- /dev/null +++ b/content/about/past-committees/the-committee-2004-2005.md @@ -0,0 +1,46 @@ +--- +cmt: + - name: Michelle Graham + nick: drusilla + position: Chairperson + - name: Aisling Devlin + nick: aeris + position: Secretary + - name: Donal Mulligan + nick: thor + position: Secretary + - name: Charlene Barrett + nick: charlene + position: Treasurer + - name: Martina Frain + nick: dramaq + position: Public Relations Officer + - name: Martin Clarke + nick: prolix + position: System Administrators + resigned: true + - name: Michael Dowling + nick: mickeyd + position: System Administrators + - name: Padraic Hallinan + nick: halenger + position: System Administrators + - name: David Whelan + nick: biteme + position: Webmaster + - name: John Doyle + nick: art_wolf + position: Education Officers + - name: Una Kehoe + nick: keloe + position: Education Officers + resigned: true + - name: Stephen Doyle + nick: igy + position: Education Officers + - name: Eoghan Gaffney + nick: atlas + position: Education Officers +title: The Committee 2004-2005 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2005-2006.md b/content/about/past-committees/the-committee-2005-2006.md new file mode 100644 index 0000000..bcb4030 --- /dev/null +++ b/content/about/past-committees/the-committee-2005-2006.md @@ -0,0 +1,45 @@ +--- +cmt: + - name: Michelle Graham + nick: drusilla + position: Chairperson + - name: Dave Couse + nick: phreak + position: Secretary + - name: Kenneth Barrett + nick: sionnach + position: Treasurer + - name: Bernard McKeever + nick: dregin + position: Events Officer + - name: Jessica Ni Chonchubhair + nick: jesjes + position: Public Relations Officer + - name: Padraig O'Connor + nick: landa2 + position: Public Relations Officer + resigned: true + - name: Charlie Von Metzradt + nick: phaxx + position: System Administrators + - name: Eoghan Gaffney + nick: atlas + position: System Administrators + - name: Stephen Ryan + nick: ryaner + position: System Administrators + - name: Una Kehoe + nick: keloe + position: Webmaster + - name: Stephen Doyle + nick: igy + position: Education Officers + - name: Simon Kilroy + nick: gizmo + position: Education Officers + - name: Graham Bishop + nick: winters + position: Education Officers +title: The Committee 2005-2006 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2006-2007.md b/content/about/past-committees/the-committee-2006-2007.md new file mode 100644 index 0000000..2414dfe --- /dev/null +++ b/content/about/past-committees/the-committee-2006-2007.md @@ -0,0 +1,33 @@ +--- +cmt: + - name: Charlie Von Metzradt + nick: phaxx + position: Chairperson + - name: Jessica N? Chonch?bhair + nick: jesjes + position: Secretary + - name: Andrew Harford + nick: receive + position: Treasurer + - name: Kat Farrell + nick: angelkat + position: Events Officer + - name: Padraig O'Connor + nick: landa2 + position: Public Relations Officer + resigned: true + - name: Damien Rhatighan + nick: dano + position: Public Relations Officer + - name: Eoghan Gaffney + nick: atlas + position: System Administrators + - name: Sarunas Vancevicius + nick: svan + position: System Administrators + - name: Stephen Doyle + nick: igy + position: System Administrators +title: The Committee 2006-2007 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2007-2008.md b/content/about/past-committees/the-committee-2007-2008.md new file mode 100644 index 0000000..7c94481 --- /dev/null +++ b/content/about/past-committees/the-committee-2007-2008.md @@ -0,0 +1,53 @@ +--- +cmt: + - name: Andrew Harford + nick: receive + position: Chairperson + - name: Kevin Fox + nick: undone + position: Secretary + - name: Amy + nick: amy + position: Treasurer + - name: Ashley Samuel Dooley Martin + nick: mythe + position: Treasurer + resigned: true + - name: Kat Farrell + nick: angelkat + position: Events Officer + - name: Damien Rhatigan + nick: dano + position: Public Relations Officer + - name: Andrew Martin + nick: wedz + position: System Administrators + - name: Cian Brennan + nick: lil_cain + position: System Administrators + - name: Diarmuid Bourke + nick: drag0n + position: System Administrators + - name: Richard Dalton + nick: d_fens + position: Webmaster + - name: Padraig O'Connor + nick: landa2 + position: Education Officers + - name: Eoghan Cotter + nick: johan + position: Education Officers + - name: David Ó Laighenáin + nick: coconut + position: Education Officers + - name: Matthew Barrington + nick: moju + position: Education Officers + resigned: true + - name: Declan Whelan + nick: castle + position: Education Officers + resigned: true +title: The Committee 2007-2008 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2008-2009.md b/content/about/past-committees/the-committee-2008-2009.md new file mode 100644 index 0000000..06947ea --- /dev/null +++ b/content/about/past-committees/the-committee-2008-2009.md @@ -0,0 +1,54 @@ +--- +cmt: + - name: Kat Farrell + nick: angelkat + position: Chairperson + - name: Robert O'Reilly + nick: robby + position: Chairperson + resigned: true + - name: Damian Rhatigan + nick: dano + position: Secretary + - name: Leah Doyle + nick: bambi + position: Treasurer + - name: Lotta Mikkonen + nick: attol + position: Events Officer + - name: Caroline Fuery + nick: carri + position: Public Relations Officer + - name: John Needham + nick: colossus + position: Public Relations Officer + resigned: true + - name: Emma Gallagher + nick: emma + position: First Year Representative + - name: Eoghan Cotter + nick: johan + position: System Administrators + - name: Cian Brennan + nick: lil_cain + position: System Administrators + - name: Andrew Harford + nick: receive + position: System Administrators + - name: Andrew Martin + nick: werdz + position: Webmaster + - name: Seamus Ronan + nick: train + position: Education Officers + - name: Seán Hand + nick: revenant + position: Education Officers + resigned: true + - name: Gavin Tubritt + nick: gmblitis + position: Education Officers + resigned: true +title: The Committee 2008-2009 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2009-2010.md b/content/about/past-committees/the-committee-2009-2010.md new file mode 100644 index 0000000..4fbc17a --- /dev/null +++ b/content/about/past-committees/the-committee-2009-2010.md @@ -0,0 +1,57 @@ +--- +cmt: + - name: Lotta Mikkonen + nick: attol + position: Chairperson + - name: Emma Gallagher + nick: emma + position: Secretary + - name: Seán Hand + nick: revenant + position: Treasurer + - name: Caroline Fuery + nick: carri + position: Events Officer + resigned: true + - name: Stephanie Coleman + nick: steph + position: Events Officer + - name: Daniel Fox + nick: maiden + position: Public Relations Officer + resigned: true + - name: David Glennon + nick: azrael + position: First Year Representative + - name: Eoghan Cotter + nick: johan + position: System Administrators + - name: Alan Walsh + nick: sonic + position: System Administrators + - name: David Ó Laigheanáin + nick: coconut + position: System Administrators + resigned: true + - name: Andrew Martin + nick: werdz + position: System Administrators + - name: Kat Farrell + nick: angelkat + position: Webmaster + - name: Diamuid McManus + nick: elephant + position: Education Officers + - name: Gautam Wadhwa + nick: gw + position: Education Officers + - name: Austin Halpin + nick: haus + position: Education Officers + resigned: true + - name: Craig Gavagan + nick: creadak + position: Education Officers +title: The Committee 2009-2010 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2010-2011.md b/content/about/past-committees/the-committee-2010-2011.md new file mode 100644 index 0000000..6b12051 --- /dev/null +++ b/content/about/past-committees/the-committee-2010-2011.md @@ -0,0 +1,42 @@ +--- +cmt: + - name: Lotta Mikkonen + nick: attol + position: Chairperson + - name: Nina Hanzlikova + nick: geekity + position: Secretary + - name: Conor Forde + nick: fordy + position: Treasurer + - name: Aisling Mulholland + nick: crash + position: Events Officer + - name: Carri Fuery + nick: carri + position: Public Relations Officer + - name: Dave Larkan + nick: tziegler + position: First Year Representative + - name: James Reilly + nick: fun + position: System Administrators + - name: Austin Halpin + nick: haus + position: System Administrators + - name: Seamus Ronan + nick: train + position: System Administrators + resigned: true + - name: Craig Gavagan MacEntee + nick: creadak + position: Webmaster + - name: Shane Stacey + nick: isaac702 + position: Education Officers + - name: Paul Bunbury + nick: bunbun + position: Education Officers +title: The Committee 2010-2011 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2011-2012.md b/content/about/past-committees/the-committee-2011-2012.md new file mode 100644 index 0000000..66990df --- /dev/null +++ b/content/about/past-committees/the-committee-2011-2012.md @@ -0,0 +1,49 @@ +--- +cmt: + - name: Dave Larkan + nick: tziegler + position: Chairperson + - name: Lotta Mikkonen + nick: attol + position: Secretary + resigned: true + - name: Niall Gaffney + nick: gamma + position: Secretary + - name: Nina hanzlikova + nick: geekity + position: Treasurer + - name: Meabh Landers + nick: timelady + position: Public Relations Officer + resigned: true + - name: Ciaran McNally + nick: mak + position: Events Officer + - name: James Reilly + nick: fun + position: System Administrator + - name: Austin Halpin + nick: haus + position: System Administrator + - name: Shane Stacey + nick: isaac702 + position: System Administrator + - name: Paul Bunbury + nick: bunbun + position: System Administrator + - name: Vadim Clyne-Kelly + nick: vadimCK + position: Webmaster + - name: Eimear Tyrell + nick: beimear + position: Helpdesk + - name: Craig Duff + nick: duff + position: Helpdesk + - name: Triona Barrow + nick: polka + position: First Year Rep +title: The Committee 2011-2012 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2012-2013.md b/content/about/past-committees/the-committee-2012-2013.md new file mode 100644 index 0000000..00fd922 --- /dev/null +++ b/content/about/past-committees/the-committee-2012-2013.md @@ -0,0 +1,42 @@ +--- +cmt: + - name: James Reilly + nick: fun + position: Chairperson + - name: Robert Devereux + nick: kylar + position: Secretary + - image: koffee.jpg + name: Richard Walsh + nick: koffee + position: Treasurer + - name: Andrew Boylan + nick: fructus + position: Public Relations Officer + - name: Aine Duffy + nick: pedro + position: Events Officer + - name: Gautam Wadhwa + nick: gw + position: System Administrator + - name: Shane Stacey + nick: isaac702 + position: System Administrator + - name: Vadim Clyne-Kelly + nick: vadimCK + position: System Administrator + - name: Ciaran McNally + nick: mak + position: Webmaster + - name: Eimear Tyrell + nick: beimear + position: Helpdesk + - name: Craig Duff + nick: duff + position: Helpdesk + - name: Freddie Hayden + nick: mercury7 + position: First Year Rep +title: "The Committee 2012-2013\t" +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2013-2014.md b/content/about/past-committees/the-committee-2013-2014.md new file mode 100644 index 0000000..6f5ac66 --- /dev/null +++ b/content/about/past-committees/the-committee-2013-2014.md @@ -0,0 +1,40 @@ +--- +cmt: + - name: Vadim Clyne-Kelly + nick: vadimCK + position: Chairperson + - name: Jessica McGowan + nick: teapott + position: Secretary + - image: zergless.jpg + name: Lorcan Boyle + nick: zergless + position: Treasurer + - name: Tríona Barrow + nick: polka + position: Public Relations Officer + - name: Jerry Onianwa + nick: jerbumz + position: Events Officer + - image: koffee.jpg + name: Richard Walsh + nick: koffee + position: System Administrator + - name: Ciaran McNally + nick: mak + position: System Administrator + - name: Emmanuel Caillé + nick: twister + position: System Administrator + - name: Niall Gaffney + nick: gamma + position: Helpdesk + - name: Andrew Boylan + nick: fructus + position: Helpdesk + - name: Seán Healy + nick: space + position: First Year Rep +title: The Committee 2013-2014 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2014-2015.md b/content/about/past-committees/the-committee-2014-2015.md new file mode 100644 index 0000000..6fb88c6 --- /dev/null +++ b/content/about/past-committees/the-committee-2014-2015.md @@ -0,0 +1,42 @@ +--- +cmt: + - image: koffee.jpg + name: Richard Walsh + nick: koffee + position: Chairperson + - name: Gillian Morrisson + nick: socks + position: Secretary + - name: Kirill Sloka + nick: macspayn + position: Treasurer + - name: Michael Wall + nick: thewall + position: Public Relations Officer + - name: Seán Healy + nick: space + position: Events Officer + - image: zergless.jpg + name: Lorcan Boyle + nick: zergless + position: System Administrator + - name: Robert Devereux + nick: kylar + position: System Administrator + - image: voy.jpg + name: Wojtek Bednarzak + nick: voy + position: Webmaster + - image: butlerx.jpg + name: Cian Butler + nick: butlerx + position: Helpdesk + - name: Niall Gaffney + nick: gamma + position: Helpdesk + - name: Robert McConnell + nick: faust + position: First Year Rep +title: The Committee 2014-2015 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2015-2016.md b/content/about/past-committees/the-committee-2015-2016.md new file mode 100644 index 0000000..59bcd84 --- /dev/null +++ b/content/about/past-committees/the-committee-2015-2016.md @@ -0,0 +1,48 @@ +--- +cmt: + - image: zergless.jpg + name: Lorcan Boyle + nick: zergless + position: Chairperson + - image: cac.jpg + name: Noah O' Donnaile + nick: cac + position: Secretary + - name: Aaron Delaney + nick: devoxel + position: Treasurer + - name: Cian Ruane + nick: induxi0n + position: Public Relations Officer + - image: thegirl.jpg + name: Cliodhna Harrison + nick: thegirl + position: Events Officer + - image: koffee.jpg + name: Richard Walsh + nick: koffee + position: System Administrator + - name: Terry Bolt + nick: tbolt + position: System Administrator + - image: voy.jpg + name: Wojtek Bednarzak + nick: voy + position: System Administrator + - name: Seán Healy + nick: space + position: Webmaster + - image: butlerx.jpg + name: Cian Butler + nick: butlerx + position: Helpdesk + - image: pints.jpg + name: Cormac Smartt + nick: pints + position: Helpdesk + - name: Liam Rooney + nick: ginger + position: First Year Rep +title: The Committee 2015-2016 +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2016-2017.md b/content/about/past-committees/the-committee-2016-2017.md new file mode 100644 index 0000000..b6d0f1e --- /dev/null +++ b/content/about/past-committees/the-committee-2016-2017.md @@ -0,0 +1,53 @@ +--- +cmt: + - image: cac.jpg + name: Noah O' Donnaile + nick: cac + position: Chairperson + - image: oskar.jpg + name: Oskar McDermott + nick: oskar + position: Secretary + - image: sully.jpg + name: Ross O' Sullivan + nick: sully + position: Treasurer + - image: sentriz.jpg + name: Senan Kelly + nick: sentriz + position: Public Relations Officer + - image: thegirl.jpg + name: Cliodhna Harrison + nick: thegirl + position: Events Officer + - image: koffee.jpg + name: Richard Walsh + nick: koffee + position: System Administrator + - image: pints.jpg + name: Cormac Smartt + nick: pints + position: System Administrator + - image: zergless.jpg + name: Lorcan Boyle + nick: zergless + position: System Administrator + - image: butlerx.jpg + name: Cian Butler + nick: butlerx + position: Webmaster + - image: greenday.jpg + name: Tom Doyle + nick: greenday + position: Helpdesk + - image: grace.jpg + name: Dylan McDonald + nick: grace + position: Helpdesk + - image: georgey.jpg + name: George Burac + nick: georgey + position: First Year Rep +title: Committee +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2017-2018.md b/content/about/past-committees/the-committee-2017-2018.md new file mode 100644 index 0000000..bcc66d8 --- /dev/null +++ b/content/about/past-committees/the-committee-2017-2018.md @@ -0,0 +1,63 @@ +--- +cmt: + - name: Terry Bolt + nick: tbolt + position: Chairperson + - image: voy.jpg + name: Wojtek Bednarzak + nick: voy + position: Secretary + resigned: true + - image: winesnob.jpg + name: Chris Dowling + nick: winesnob + position: Secretary (Formerly PRO) + - image: hexagon.jpg + name: Ciara Godwin + nick: hexagon + position: Treasurer + - image: sangreal.jpg + name: Josh Malone + nick: sangreal + position: Public Relations Officer + - image: mctastic.jpg + name: James Mc Dermott + nick: mctastic + position: Events Officer + - name: Alex McGrath Kraak + nick: akraak + position: System Administrator + - image: pints.jpg + name: Cormac Smartt + nick: pints + position: System Administrator + - image: greenday.jpg + name: Tom Doyle + nick: greenday + position: System Administrator + - name: Ben McMahon + nick: mcmahon + position: Webmaster + - name: Nevan Oman Crowe + nick: branch + position: Helpdesk (Formerly First Year Rep) + - image: thegirl.jpg + name: Cliodhna Harrison + nick: thegirl + position: Helpdesk + - name: Sahil Mehra + nick: pr0n + position: Helpdesk + resigned: true + - name: Michal Durinik + nick: mikello + position: Helpdesk + resigned: true + - image: albino.jpg + name: Anthony Doran + nick: albino + position: First Year Rep +date: '2017-04-06 09:22:40' +title: Committee +type: cmt +--- diff --git a/content/about/past-committees/the-committee-2018-2019.md b/content/about/past-committees/the-committee-2018-2019.md new file mode 100644 index 0000000..12eb4c5 --- /dev/null +++ b/content/about/past-committees/the-committee-2018-2019.md @@ -0,0 +1,70 @@ +--- +cmt: + - image: mctastic.jpg + name: James McDermott + nick: mctastic + position: Chairperson + - name: Eamon Crawford + nick: eamon_c + position: Vice Chair + - image: branch.jpg + name: Nevan Oman Crowe + nick: branch + position: Secretary + - image: hexagon.jpg + name: Ciara Godwin + nick: hexagon + position: Treasurer + - image: sangreal.jpg + name: Josh Malone + nick: sangreal + position: Public Relations Officer + - name: Theo Coyne Morgan + nick: depp + position: Graphics Design Officer + - image: thegirl.jpg + name: Cliodhna Harrison + nick: thegirl + position: Events Officer + - image: chill.jpg + name: Jack Liston + nick: chill + position: Events Officer + - image: m1cr0man.jpg + name: Lucas Savva + nick: m1cr0man + position: System Administrator + - image: mcmahon.jpg + name: Ben McMahon + nick: mcmahon + position: System Administrator + - image: greenday.jpg + name: Tom Doyle + nick: greenday + position: System Administrator + - name: Sean Fradl + nick: fraz + position: Webmaster + - image: berns.jpg + name: Conor Berns + nick: berns + position: Helpdesk + - image: mulreac.jpg + name: Connor Mulready + nick: mulreac + position: Helpdesk + - image: wolfer.jpg + name: Maciej Zamoyski Swierad + nick: mag1c + position: First Year Rep + - image: sun.jpg + name: Daniel Christie + nick: sun + position: Ordinary Member + - image: cianky.jpg + name: Cian Kehoe + nick: cianky + position: Ordinary Member +date: '2019-08-06 10:37:45' +title: Committee +--- diff --git a/content/about/past-committees/the-committee-2019-2020.md b/content/about/past-committees/the-committee-2019-2020.md new file mode 100644 index 0000000..f6d2f5b --- /dev/null +++ b/content/about/past-committees/the-committee-2019-2020.md @@ -0,0 +1,60 @@ +--- +cmt: + - image: mcmahon.jpg + name: Ben McMahon + nick: mcmahon + position: Chairperson + - image: cianky.jpg + name: Cian Kehoe + nick: cianky + position: Vice Chair + - image: branch.jpg + name: Nevan Oman Crowe + nick: branch + position: Secretary + - name: Sean Hammond + nick: verren + position: Treasurer + - name: Tara Collins + nick: tara + position: Public Relations Officer + - name: Theo Coyne Morgan + nick: depp + position: Graphics Design Officer + - image: thegirl.jpg + name: Cliodhna Harrison + nick: thegirl + position: Events Officer + - image: chill.jpg + name: Jack Liston + nick: chill + position: Events Officer + - image: mctastic.jpg + name: James McDermott + nick: mctastic + position: System Administrator + - name: Kyle McCann + nick: ylmcc + position: System Administrator + - image: fraz.jpg + name: Sean Fradl + nick: fraz + position: Webmaster + - image: berns.jpg + name: Conor Berns + nick: berns + position: Helpdesk + - image: wolfer.jpg + name: Maciej Zamoyski Swierad + nick: mag1c + position: Helpdesk + - image: sangreal.jpg + name: Josh Malone + nick: sangreal + position: Ordinary Member + - name: Shane Grouse + nick: sedge + position: Ordinary Member +date: '2019-08-06 10:37:45' +title: Committee +--- diff --git a/content/about/regulations.md b/content/about/regulations.md new file mode 100644 index 0000000..55c8d33 --- /dev/null +++ b/content/about/regulations.md @@ -0,0 +1,97 @@ +--- +date: '2016-04-17 16:22:40' +title: Regulations +type: about +--- + +1. Members wishing to run networked programs must first obtain the permission + of the committee. The committee reserves the right to shut down such + programs without notice. +2. Members wishing to make an announcement to the membership are encouraged to + use the Newsgroup system, but in cases where mailing the membership is + considered vital, the permission of the committee must be obtained first. +3. Spamming other users is an offense (e.g. mass mailing, system-wide write + messages, or flooding chat rooms) unless a practical need to do so has been + presented to the committee, and their permission obtained for such a mass + communication. +4. Users are requested to take all reasonable precautions to ensure the + security of their account, and to comply with the instructions of Redbrick's + System Administrators and with their guidelines on security. +5. The reprovision of Dublin City University Networking Society Services or + Equipment requires the approval of the committee. +6. Certain file types are banned by our web server and users should not try to + circumvent this rule. For more information on the restricted file types and + getting access, contact [Helpdesk](mailto:helpdesk@redbrick.dcu.ie). + +The following regulations are additional to the Society's own rules... + +- [Code of Conduct for the use of Computing Resources in Dublin City + University][1] +- [HEAnet Acceptable Usage Policy][2] + +## Reasoning + +- These regulations are for the protection of the system and the society. We + have a small but dedicated Admin team. +- Regulation 1, about networked programs, is primarily for security reasons. + Networked programs are programs which allow non-system users to interact with + them, say via TCP/IP. There is an inherent security risk here. +- Regulations 2 and 3 are self-explanatory, spam is not on!! +- Regulation 4 should be an obvious assumption for any accounts you hold. +- Regulation 5 is simply to safeguard that we can control what services are + provided to others (similar to regulation 1), only the Admin team can really + judge what we can support. Also, private members should not be giving + "accounts" to others, their account is for their own use only. + +## Rules For #lobby. + +- Users must obtain the permission of the committee before using bots/scripts in + #lobby. +- Users are not to spam the channel. +- Users should not encourage others to enter IRC commands that might be harmful + or that produce undesirable effects. +- Users are not to direct people to unsafe or inappropriate links without prior + warning of their content. +- Ops are, as a general rule, a committee privilege. While they may be used by + others on occasion, they are only for administrative/emergency use. Abuse of + ops will lead to their removal. +- Offences shall be dealt with by the committee and may lead to banning, + repeated offences may lead to disuserment. +- Ops should endeavour to use common sense when enforcing the rules. + +## Authorized Bots in #lobby + +- butlerx (actually a user but runs a script) +- mincebot (owned by DoC) +- teh (owned by d_fens) +- twit (owned by mickeyd) + +## User Agreement + +By logging into Redbrick you agree to these terms and conditions. + +1. Redbrick is governed by various regulations, as detailed above +2. Redbrick take no responsibility for the integrity of user data stored or + developed using Redbrick. While Redbrick will endeavour to provide a backup + service to all users, Redbrick cannot ultimately guarantee protection from + system failures, user accidents or malicious activities by other users. So + please don't leave the only copy of your 4th year final project on Redbrick! + :o) Redbrick offers no guarantee of user privacy. Redbrick administrators + have the power to search accounts and all user data therein for any material + that is considered to be illegal (by the regulations we mentioned above) or + that pose a security threat to other user accounts or even the system as a + whole. Redbrick will endeavour to make all user accounts secure by default + but it is impossible to 'police' all user activities, which may include + attempts to 'trojan' or subvert other user accounts. +3. Any attempts to undermine or breach the security of Redbrick or any user's + account will be taken as a serious matter, and will be subject to + appropriate punishment as determined by the committee. Such punishments will + typically amount to a disabling of the user's account for a certain period. + All other services (events, talks, tutorials) that Redbrick provide to + members will of course still be available to the user. +4. Redbrick reserve the right to update this agreement at any time in the + future. Should this be necessary, you will be asked to agree to these terms + and conditions again with the new agreement replacing previous versions. + +[1]: http://www.dcu.ie/csd/regulations.html +[2]: http://www.heanet.ie/about/aup diff --git a/source/about/society.jpg b/content/about/society.jpg similarity index 100% rename from source/about/society.jpg rename to content/about/society.jpg diff --git a/source/about/welcome/welcome.jpg b/content/about/welcome.jpg similarity index 100% rename from source/about/welcome/welcome.jpg rename to content/about/welcome.jpg diff --git a/content/about/welcome.md b/content/about/welcome.md new file mode 100644 index 0000000..e98ad0f --- /dev/null +++ b/content/about/welcome.md @@ -0,0 +1,51 @@ +--- +banner: welcome.jpg +date: '2016-04-17 16:22:40' +title: Welcome to Redbrick +type: about +--- + +Redbrick is DCU's Computer Networking Society. + +It was originally setup to give students the opportunity to experiment with UNIX +systems. Over time redbrick has grown in both computing and social aspects. The +social aspects range from meeting up in the bar to events such as Q-Zar and +Bowling. We hold tutorials during the year that will demonstrate how to use the +services that Redbrick offer and to teach members learn topics such as +programming and web design. + +Redbrick's primary servers are Azazel, Paphos, Pygmalion and Metharme. These +provides the major services that you will be using including programming +environments, web services, and our IRC server. + +The following will introduce you to a selection to our services and provide +links to a selection of tutorials to get you started. + +## Services on Redbrick + +Redbrick offers a number of services which are found on the servers we operate +for our members. They are available at any time from any internet connected +device. + +Some of the services Redbrick offers include the following; + +- [Email](https://webmail.redbrick.dcu.ie/) +- [IRC Chat](https://webchat.redbrick.dcu.ie) - + [IRC on the Wiki](http://wiki.redbrick.dcu.ie/mw/IRC) +- [Wiki](https://wiki.redbrick.dcu.ie) +- Programming Environments +- Newsgroups + +## Logging in to Redbrick. + +You can login to redbrick using a number of different methods. + +### Web Client. + +Click [here](https://www.redbrick.dcu.ie/wetty) to open a terminal in your web +browser. Enter your username and password when prompted. + +### Desktop Client. + +Click [here](http://wiki.redbrick.dcu.ie/mw/Connect) to view our guide on using +SSH and setting up PuTTY on your windows computer. diff --git a/source/events/index.md b/content/events/_index.md similarity index 76% rename from source/events/index.md rename to content/events/_index.md index ad919d3..0d3faa6 100644 --- a/source/events/index.md +++ b/content/events/_index.md @@ -1,11 +1,9 @@ --- -title: Events -date: 2016-04-17 16:15:35 -type: calendar -calSubscribe: - text: Subscribe to our Google Calendar - url: https://calendar.google.com/calendar/r?cid=r2l6edh5l8jm5t9dbfi84rn26s@group.calendar.google.com&pli=1 -calMessage: +message: text: Want to give us a talk? url: /CFT +subscribe: + text: Subscribe to our Google Calendar + url: https://calendar.google.com/calendar/r?cid=r2l6edh5l8jm5t9dbfi84rn26s@group.calendar.google.com&pli=1 +title: Events --- diff --git a/content/help/_index.md b/content/help/_index.md new file mode 100644 index 0000000..a1e6335 --- /dev/null +++ b/content/help/_index.md @@ -0,0 +1,26 @@ +--- +banner: helpdesk.jpg +cmt: + - image: berns.jpg + name: Conor Berns + nick: berns + position: Helpdesk + - image: mulreac.jpg + name: Connor Mulready + nick: mulreac + position: Helpdesk +date: '2016-04-17 16:15:35' +keywords: + - help + - helpdesk + - support +title: Helpdesk +--- + +The Redbrick Helpdesk is staffed by our team of highly skilled volunteer +Education Officers. The Helpdesk write and maintain a series of tutorials on +Redbrick's systems. These are available on our wiki. The Helpdesk team can also +be contacted by Email, and over IRC in the channel #helpdesk. You can access IRC +by using one of the methods available [here](/help/tutorials/IntroToRedbrick/). +The Helpdesk can be emailed at the +[Helpdesk Email address](mailto:helpdesk@redbrick.dcu.ie). diff --git a/content/help/exams/_index.md b/content/help/exams/_index.md new file mode 100644 index 0000000..4648f75 --- /dev/null +++ b/content/help/exams/_index.md @@ -0,0 +1,92 @@ +--- +banner: exam.jpg +date: '2016-04-17 16:15:35' +keywords: + - help + - exams + - helpdesk + - admin + - webmaster +title: Exams +--- + +If you are thinking of running for the position of Admin, Webmaster or Helpdesk +you must first pass an exam. Here are some exams from previous years. + +## Admins Tests + +- [2018 AGM](./admin-test-2018-agm) +- [2017 AGM](./admin-test-2017-agm) +- [2016 EGM](./admin-test-2016-egm) +- [2016 AGM](./admin-test-2016-agm) +- [2015 AGM](./admin-test-2015-agm) +- [2014 EGM](./admin-test-2014-egm) +- [2014 AGM](./admin-test-2014-agm) +- [2013 EGM](./admin-test-2013-egm) +- [2013 AGM (+ answers)](./admin-test-2013-agm) +- [2012 AGM](./admin-test-2012-agm) +- [2012 EGM](./admin-test-2012-egm) +- [2011 AGM](./admin-test-2011-agm) +- [2010 EGM](./admin-test-2010-egm) +- [2010 AGM](./admin-test-2010-agm) +- [2009 AGM](./admin-test-2009-agm) +- [2009 EGM](./admin-test-2009-egm) +- [2008 AGM](./admin-test-2008-agm) ([Answers](./admin-test-2008-agm-answers)) +- [2008 EGM](./admin-test-2008-egm) +- [2007 AGM](./admin-test-2007-agm) +- [2006 EGM](./admin-test-2006-egm) +- [2005 AGM](./admin-test-2005-agm) +- [2005 EGM](./admin-test-2005-egm) +- [2004 AGM](./admin-test-2004-agm) ([Answers](./admin-test-2004-agm-answers)) +- [2003 AGM](./admin-test-2003-agm) ([Answers](./admin-test-2003-agm-answers)) +- [2002 AGM](./admin-test-2002-agm) +- [2001 AGM](./admin-test-2001-agm) +- [2000 EGM](./admin-test-2000-egm) ([Answers](./admin-test-2000-egm-answers)) +- [2000 AGM](./admin-test-2000-agm) ([Answers](./admin-test-2000-agm-answers)) + +## Webmaster Tests + +- [2017 AGM](http://webmaster.redbrick.dcu.ie/2017) - + [If you dont get it](https://webmaster.redbrick.dcu.ie/2017) and if you cant + get that one heres the + [easy one](https://webmaster.redbrick.dcu.ie/2017/fixed) +- There was no exam in 2016 +- [2014 AGM](./webmaster-test-2014-agm) +- [2013 EGM](./webmaster-test-2013-egm) +- [2012 AGM](https://www.redbrick.dcu.ie/~vadimck/webmasterexam2012LAWL/) + ([If you didnt get it](http://www.redbrick.dcu.ie/~vadimck/webexam2012/?gg=Nijaush4)) +- [2009 AGM](./webmaster-test-2009-agm) +- There was no exam in 2008 +- Missing - exams from 2005-test-2007 +- [2004 AGM](./webmaster-test-2004-agm) + ([answers](./webmaster-test-2004-agm-answers)) +- [2003 AGM](./webmaster-test-2003-agm) +- [2002 AGM](./webmaster-test-2002-agm) +- [2001 AGM](./webmaster-test-2001-agm) +- [2000 AGM](./webmaster-test-2000-agm) + +## Helpdesk Test + +- [2018 EGM](./helpdesk-test-2018-egm) +- [2018 AGM](./helpdesk-test-2018-agm) +- [2017 EGM](./helpdesk-test-2017-egm) +- [2017 AGM](./helpdesk-test-2017-agm) +- [2016 EGM](./helpdesk-test-2016-egm) +- [2016 AGM](./helpdesk-test-2016-agm) +- [2015 AGM](./helpdesk-test-2015-agm) +- [2014 EGM](./helpdesk-test-2014-egm) +- [2014 AGM](./helpdesk-test-2014-agm) +- [2011 EGM](./helpdesk-test-2011-egm) +- [2011 AGM](./helpdesk-test-2011-agm) +- [2010 AGM](./helpdesk-test-2010-agm) +- [2008 AGM](./helpdesk-test-2008-agm) +- [2008 EGM](./helpdesk-test-2008-egm) +- [2007 EGM](./helpdesk-test-2007-egm) +- [2006 AGM](./helpdesk-test-2006-agm) +- [2006 EGM](./helpdesk-test-2006-egm) +- [2005 EGM](./helpdesk-test-2005-egm) +- [2004 AGM](./helpdesk-test-2004-agm) +- [2003 AGM](./helpdesk-test-2003-agm) +- [2002 AGM](./helpdesk-test-2002-agm) +- [2001 AGM](./helpdesk-test-2001-agm) +- [2000 AGM](./helpdesk-test-2000-agm) diff --git a/content/help/exams/admin-test-2000-agm-answers.md b/content/help/exams/admin-test-2000-agm-answers.md new file mode 100644 index 0000000..d21ea74 --- /dev/null +++ b/content/help/exams/admin-test-2000-agm-answers.md @@ -0,0 +1,170 @@ +--- +title: Admin Test 2000 AGM Answers +--- + +Redbrick System Administrator Test February 11th, 2000 + +## Example Solution + +# Files ( 40 ) + +1. When the sticky bit is set on a directory, only the file's owner may delete + the file. +1. When the set-gid bit is set on a directory, files created in that directory + will be owned by the same group as the directory. +1. A hard link is another reference to a file. Both files refer to the same + inode, and the file is only deleted when the number of links drops to zero. + The hard link is indistinguishable from the original. Hard links may not + cross filesystems. A symbolic link is merely a file which refers to the + filename of another file. +1. mkfifo creates a named piped or fifo. A fifo allows interprocess + communications, one process opens the file for reading while one or more + other processes open the file for writing. +1. Sticky Bit: /tmp Set-Gid Directory: /var/postfix/maildrop ln -s + /usr/local/really/long/and/complicated/path link ln .mailspool mbox + +# Scripting ( 40 ) + +1. (A corrected version of pixies solutio1. (For FreeBSD) + +```bash +#!/bin/sh + +for i in `find ~eviluser -type f` +do + if [ `grep -c "i hate pixies" $i` != 0 ] ; then + echo "And you said you loved me..." | hey eviluser + pw userdel -r eviluser + fi +done +``` + +1. Perl (Practical Extraction and Report Languag1.is a powerful interpreted + scripting language, primarily useful for text manipulation and CGI. Awk is a + pattern matching and text processing language useful for reformatting the + output of other programs. Grep is a pattern matching program + +# Security ( 40 ) + +1. Real UID identifies who we really are. It is taken from the password file and + not normally changed. It may only be changed if our Effective User ID is + zero. Effective UID determines a users file access permissions. It may be set + to either the processes real or saved UID. The Saved UID is set equal to a + processes Effective UID at exec. For a setuid program, both Effective and + Saved IDs are set. +1. chsh - yes mount - sometimes (if users must mount floppy/cdrom) ping - + sometimes (if we want to give users ping) nice - no passwd - yes init - no + (only ever executed by root) write - no (setgid tty) ps - no +1. Shorter than 8 characters. All lower case All alphabetic Dictionary word + Username, Real Name, Tasty (thanks Kar1.Pet's Name +1. You may change the group ownership of a file from one group you are a member + of to another which you are also a member of, if you own the file. +1. Having . in your path is a major security hole, as attempting to run ls in a + users directory may lead to you running a nasty program they have written. It + is especially bad if . is at the front of your path. +1. /etc/master.passwd on FreeBSD is equivalent to /etc/shadow on some other + systems. It contains encrypted passwords. +1. In public key encryption, data is encrypted for a user using a public key + which can be distributed freely. Once encrypted the data may only be + decrypted using that users private key. Keys are created in pairs. + +# Devices ( 25 ) + +1. c = character device. A character device is written to and read from like a + file. Examples: /dev/tty, /dev/null, /dev/psaux b = block device. A device + which is designed to be mounted via the mount command. Examples: /dev/hda, + /dev/fd0, /dev/cdrom +1. A network device. +1. A real terminal device is related to an actual physical terminal such as the + console or a serial port, while pseudo terminals are allocated to processes + wishing to emulate a physical terminal such as telnetd. + +# File systems ( 20 ) + +1. All files in /example are hidden while the drive is mounted, and cannot be + accessed again until the drive is unmounted. +1. Open machine, connect disk, power on. disklabel (on FreeBSD) fdisk mkfs mount + (make appropriate changes to /etc/fstab) +1. da2s1e a - first scsi controller (of this type) 2 - scsi device 1 - disk + label e - partition + +# Networking ( 50 ) + +1. In a class B network the first two bytes of the IP address are the network + address, and the second two bytes are the host address. A netmask is used to + determine which part is the network address and which is the host address. + Eg: Class A: 255.0.0.0 Class B: 255.255.0.0 Class C: 255.255.255.0 +1. ifconfig +1. route +1. The physical address of a network card (assigned to the card on + manafactur1.and used to route data on an ethernet segment. +1. TCP is Transmission Control Protocol and is responsible for checking data for + missing packets, keeping packets in order, connection handshakes, and + directing packets to the processes waiting for them (via port numbers). +1. A network connection over which data may be simultaneously transmitted and + recieved. +1. Types of records in a DNS zone file: MX - Mail Exchange, where mail for the + host should be delivered to. A - Address, the ip address of the name. PTR - + Pointer, the name for an ip address. CNAME - Canonical Name, a DNS alias. + SOA - Source of Authority, information about the Zone file. +1. The Serial Number is used to detect when a zone file changes. It must be + updated every time a zone file is changed and is usually of the form: + YYYYMMDDnn, (nn number of the change today). + +# Fuck Ups ( 10 ) + +1. Pico will attempt to load the entire file into memory. Users will get very + annoyed and you won't get to do very much editing. (Vim does not do this.) +1. On Solaris it kills all processes. On Linux it kills all processes of a given + name. + +# E-Mail and News ( 20 ) + +1. A Mail Transport Agent is responsible from transporting e-mail from it origin + to destrination over the network, and for directing mail to the appropriate + Mail Delivery Agent. Postfix is used on Enigma. +1. A Mail Delivery Agent is used to deliver mail to a users mailbox. Procmail is + used on Enigma. +1. /etc/aliases newaliases -v (Restarting the mailserver will work but is hardly + the ideal solution) +1. innd + +# Miscellaneous Stuff ( 22 ) + +1. tar, dump +1. split (I only learnt about this when everyone answered it, I have always used + dd.) +1. netstat | grep LISTEN ( I didn't require the grep. ) +1. nice - sets a processes priority domainname - sets a servers NIS domainname. + (Not DNS domainname) sync - Flushes disk buffers. true - Do nothing, + successfully. (To quote the manpage) ldconfig - Prepares information about + dynamically loadable libraries for use by the run-time linker. wget - Command + line tool for fetching files via http. dmesg - Displays boot messages wall - + Writes a message to the terminal of every user. su - Changes your uid. It + queries for the users password if you are not root. cat - Writes either its + standard in, or files given as arguements to its standard output. (I did not + accept concatenates files) +1. NIS - Network Information Service. Allows central management of a number of + configuration files over a network. May be used to manage /etc/passwd, + /etc/hosts and others. + +# Suitability ( 0 ) + +1. Yes +1. No +1. No +1. Yes +1. Yes +1. Yes +1. Yes +1. No +1. No +1. No + +Adam. + +--- + +"I didn't sell out, I sold in, and then the people I sold into sold out" + +- Sares on his AOL career. diff --git a/content/help/exams/admin-test-2000-agm.md b/content/help/exams/admin-test-2000-agm.md new file mode 100644 index 0000000..39284cc --- /dev/null +++ b/content/help/exams/admin-test-2000-agm.md @@ -0,0 +1,127 @@ +--- +title: Admin Test 2000 AGM +--- + +DCU Networking Society - System Administrator Test. Friday, February 11th 2000, +2pm. + +This exam will take an arbitrary amount of time. No persons may leave before the +beginning of the exam or after security lock the building. You may not +communicate with any other person or spirit during the course of the exam, nor +may you read books which are written in a language which you understand. You may +not log into redbrick during this exam. Marks will be given for reasonable +attempts, marks may be deducted for stupidity, but no marks will be deducted for +humour. (Neither will marks be awarded for humour.) Where relevant you may +answer on any version of UNIX, or UNIX clone, provided, where relevant, you make +clear what version of UNIX you are answering on. + +# Files ( 40 ) + +1. What does the 'sticky bit' mean for directories? ( 8 ) +1. What does the 'set-gid bit' mean for directories? ( 8 ) +1. What is the difference between hard and symbolic links? ( 8 ) +1. Explain the purpose of this command: mkfifo. ( 8 ) +1. Give an example of a use of each of the above. ( 2 x 4 ) + +# Scripting ( 40 ) + +1. Write a script or command, in the scripting language or shell of your choice, + to: search every file in a users home directory for the string 'i hate + ', and to delete that users account if the string + is found. ( 31 ) +1. Describe briefly each of the following: Perl, awk, grep ( 3 x 3 ) [ This was + a typo - I meant to ask Perl, awk and sed ] + +# Security ( 40 ) + +1. Explain what is meant by Real UID, Effective UID and Saved UID? Which is set + for a setuid program. ( 5 ) +1. Which of the following must be setuid root, which should not be setuid, and + which are sometimes setuid? chsh, mount, ping, nice, passwd, init, write, ps + ( 8 x 1 ) [ I meant to ask why - it would have been a fairer question. ] +1. Give five examples of things which would make a password 'weak'. ( 5 x 1 ) +1. What is changes is a non-root user permitted to make using the chgrp command + on Enigma. ( 6 ) +1. What is wrong with this? Why? ( 5 ) + + ```bash + echo $PATH + .:/bin:/sbin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin + ``` + +1. Explain the purpose of /etc/master.passwd on Enigma. ( 6 ) +1. Explain very briefly the principle of public key encryption. ( 5 ) + +# Devices ( 25 ) + +1. What does the first letter of the permissions on each of these devices mean? + Explain clearly the difference between each type of device and give two + examples of each. ( 15 ) crw-rw-rw- brw-r----- +1. What is the third type of device? ( 5 ) +1. What is the difference between a real and pseudo terminal? (5) + +# File systems ( 20 ) + +1. What happens to the contents of /example, if you mount a drive at that point. + ( 5 ) +1. What sequence of commands would you use to setup and mount a newly installed + hard disk. ( 12 ) +1. On enigma /dev/da2s1e is mounted on /var/tmp. Explain each part of the device + name. ( 3 ) + +# Networking ( 50 ) + +1. What is a class B network? What is a netmask? ( 2 x 5 ) +1. What command is used to configure an interface? ( 5 ) +1. Name a command which can be used to tell packets which gateway they should + use to reach another network. ( 5 ) +1. What is an ethernet address? ( 5 ) +1. What is TCP? ( 5 ) +1. What is meant by full duplex? ( 5 ) +1. Explain what each of the following are: MX, A, PTR, CNAME, SOA ( 5 x 2 ) +1. What is the serial number of a zone file used for. ( 5 ) + +# Fuck Ups ( 10 ) + +1. Why should you not use pico to open a many, many megabyte Apache log file. ( + 5 ) +1. Distinguish between killall on Solaris and Linux. ( 5 ) + +# E-Mail and News ( 20 ) + +1. What is a Mail Transport Agent? What MTA is used on Enigma? ( 5 ) +1. What is a Mail Delivery Agent? What MDA is used on Enigma? ( 5 ) +1. Where are mail aliases typically stored? What command should be run after + making changes to this file? ( 2 x 3 ) +1. What program runs the newsgroups on Enigma? ( 4 ) + +# Miscellaneous Stuff ( 22 ) + +1. Name two commands which could be used to backup data to a tape. ( 2 x 3 ) +1. What command would you use to split a file into a number of pieces? ( 2 ) +1. What command would you use to check what ports have processes listening on + them? ( 4 ) +1. Explain each of the following commands: nice, domainname, sync, true, + ldconfig, wget, dmesg, wall, su, cat. ( 10 x 1 ) +1. Describe NIS? ( 8 ) + +# Suitability ( 0 ) + +1. Do you have long hair? ( 0 ) +1. Do you have a beard? ( 0 ) +1. Do you wear sandals? ( 0 ) +1. Do you own an anorak? ( 0 ) +1. Are you power hungry? ( 0 ) +1. Did you own an 8-bit computer? ( 0 ) +1. Are you sad? ( 0 ) +1. Do you dislike sunlight? ( 0 ) +1. Is your computer your best friend? ( 0 ) +1. Do you flee from members of the opposite sex? ( 0 ) + +Adam. + +--- + +"I didn't sell out, I sold in, and then the people I sold into sold out" + +- Sares on his AOL career. diff --git a/source/help/exams/admin-test-2000-egm-answers/index.md b/content/help/exams/admin-test-2000-egm-answers.md similarity index 93% rename from source/help/exams/admin-test-2000-egm-answers/index.md rename to content/help/exams/admin-test-2000-egm-answers.md index 91f805b..065abb5 100644 --- a/source/help/exams/admin-test-2000-egm-answers/index.md +++ b/content/help/exams/admin-test-2000-egm-answers.md @@ -1,5 +1,5 @@ --- -title: 'Admin Test 2000 EGM Answers' +title: Admin Test 2000 EGM Answers --- 
From: valen@RedBrick.DCU.IE (John Looney)
@@ -13,8 +13,8 @@ doc@CONSORTIUM.RedBrick.DCU.IE broke a keyboard on:
  Disable the user, or merely threaten them with violence if they touch a
 machine.
 
->.2] You want to change a person's username from 'joe' to 'skippy'. 
->Describe how this process would be done (Remember the user's home 
+>.2] You want to change a person's username from 'joe' to 'skippy'.
+>Describe how this process would be done (Remember the user's home
 >directory is /home/joe)
 
  Hmm. Bribe the nice people at the dept. of social welfare to change the
@@ -30,14 +30,14 @@ don't forget. Then get one of the other admins to change it on the system.
 
  find . -exec rm -rf {} \;
 
->.2] What is an inode? Why is there a quota on the number of a 
+>.2] What is an inode? Why is there a quota on the number of a
 >files a user can have as well as the space they take up.
 
  File directory block. 'Cos we are fascist, and users shouldn't be allowed
 to use system resources.
 
->.3] On redbrick give an advantage of using ~/.mailspool to 
->collect mail, instead of the traditional /var/mail/$USER normally 
+>.3] On redbrick give an advantage of using ~/.mailspool to
+>collect mail, instead of the traditional /var/mail/$USER normally
 >used on systems.
 
  Because users are stupid, and have stupid friends that mail them big
@@ -48,7 +48,7 @@ their accounts get their mails bounced first.
 
  Set the IP address of the interface to a network broadcast address >:+)
 
->.5] Why is it a good idea to split up a filesystem instead of 
+>.5] Why is it a good idea to split up a filesystem instead of
 >having one big root partition?
 
  In event of a disaster, it'll really piss of the admins that have to fix
@@ -69,15 +69,15 @@ downloading stuff.
 
  /usr/local/games - 8GB
  / - 1GB
- /var - 1GB 
+ /var - 1GB
 
->.6] You've just installed apache by hand and now you want it to 
+>.6] You've just installed apache by hand and now you want it to
 >startup by default every time you boot up. How is this achieved?
 
  echo "init=/sbin/httpd -X"  >> /etc/lilo.conf ; lilo
 
 > ]4[---- Security --------------------
->.1] Some idiot just changed root's password and can't remember 
+>.1] Some idiot just changed root's password and can't remember
 >it How do you get root back?
 >(Background information: you can't read the shadow file, you're in
 >front of the machine and you want to get root back on the machine).
@@ -89,7 +89,7 @@ some skeletons aside, and get them to torture other people that don't know
 the password. Sow their teeth. Keep going till we have an infinte number of
 skeletons typeing at an infinite number of keyboards.
 
->.2] Why are telnet/ftp/POP sessions inherently insecure? What can 
+>.2] Why are telnet/ftp/POP sessions inherently insecure? What can
 >be done to resolve this?
 
  'cos little wankers snoop the network. We can crucify then. And set the
@@ -112,7 +112,7 @@ is that the information is boring.
 
  rm /dev/backup_device
  ln -s /dev/null /dev/backup_device
- echo "0 0 * * * (for i in /dev/da* ; do dd if=$i of=/dev/backup_device 
+ echo "0 0 * * * (for i in /dev/da* ; do dd if=$i of=/dev/backup_device
 ; done)" | crontab
 
 >.4] E-mail
@@ -144,9 +144,9 @@ is that the information is boring.
 
 >.6] What is BUGTRAQ?
 
- A porn list that script kiddies jack off to. 
+ A porn list that script kiddies jack off to.
 
->.7] Name 4 security resources a sysadmin should use (i.e. mailing 
+>.7] Name 4 security resources a sysadmin should use (i.e. mailing
 >lists, newsgroups etc.)
 
  Skeletons.
@@ -177,7 +177,7 @@ is that the information is boring.
 
 Kate
 
--- 
+--
 The words of the unwary are apt to cause needless pain and bloody violence.
                                                         - Zen Master Greg
 
diff --git a/source/help/exams/admin-test-2000-egm/index.md b/content/help/exams/admin-test-2000-egm.md
similarity index 93%
rename from source/help/exams/admin-test-2000-egm/index.md
rename to content/help/exams/admin-test-2000-egm.md
index 05bf127..c6e5603 100644
--- a/source/help/exams/admin-test-2000-egm/index.md
+++ b/content/help/exams/admin-test-2000-egm.md
@@ -1,16 +1,16 @@
 ---
-title: 'Admin Test 2000 EGM'
+title: Admin Test 2000 EGM
 ---
 
 
Here goes,
-All questions that are general (e.g. 3.1) use the UNIX variant OS of your choice, we don't 
+All questions that are general (e.g. 3.1) use the UNIX variant OS of your choice, we don't
 expect you to be FreeBSD specific, except where specified as "on redbrick", or in the FreeBSD section. A right answer for your OS will do fine.
 
 Negative marking will apply throughout, for answers that are very blatantly incorrect or demonstrate incompetence.
 
 	- DoC, pixies, phil and bobb
 
- ]1[----  Users 
+ ]1[----  Users
 --------------------
 
 .1] Name two ways to disable a users account.
@@ -25,7 +25,7 @@ be done (Remember the user's home directory is /home/joe)
 
 .1] How would you remove a file starting with a "-"
 
-.2] What is an inode? Why is there a quota on the number of a files a user can have as well as 
+.2] What is an inode? Why is there a quota on the number of a files a user can have as well as
 the space they take up.
 
 .3] On redbrick give an advantage of using ~/.mailspool to collect mail, instead of the traditional
@@ -37,14 +37,14 @@ the space they take up.
 Give two partition schemes for a 10Gb drive in two different situations (e.g. a Shell account provider,
 and a Home User. Give reasons for your partition choices and their sizes)
 
-.6] You've just installed apache by hand and now you want it to startup by default every time you 
+.6] You've just installed apache by hand and now you want it to startup by default every time you
 boot up. How is this achieved?
 
  ]4[---- Security
 --------------------
 .1] Some idiot just changed root's password and can't remember it How do you get root back?
 (Background information: you can't read the shadow file, you're in front
-of the machine and you want to get root back on the machine). 
+of the machine and you want to get root back on the machine).
 
 .2] Why are telnet/ftp/POP sessions inherently insecure? What can be done to resolve this?
 
@@ -57,12 +57,12 @@ Give one disadvantage of accounting.
 
 .2] Backup
 /dev/backup_device is the Backup device on your system.
-Your committee is getting annoyed and want the system backed up every week. 
+Your committee is getting annoyed and want the system backed up every week.
 What is the best way to do this (take into account efficieny) and give a reason.
 Write the script that can be periodically run to backup /home onto /dev/backup_device.
 
 .3] DNS
-In zone files under BIND an address class is specified (e.g. PTR is a domain name pointer). Name 
+In zone files under BIND an address class is specified (e.g. PTR is a domain name pointer). Name
 two others and describe them to the best of your ability.
 
 .4] E-mail
@@ -76,7 +76,7 @@ You logout of bash and your background processes areterminating. How you would s
 You've just added a line to /etc/inetd.conf for a funky new pop3 daemon your friend Jimmy told you
 about. How do you start the POP3 daemon.
 
-You're running a distributed net client and you want to decrease it's process priority. How is this 
+You're running a distributed net client and you want to decrease it's process priority. How is this
 done?
 
 .6] What is BUGTRAQ?
@@ -88,8 +88,8 @@ done?
 Scripts can be done in shell, or a scripting language of your choice.
 
 1.
-You're on a system with grep but GNU grep is not installed. This means the "-r" option which is 
-normally used to recursively search subdirectories it not available. You want to write a script to search for 
+You're on a system with grep but GNU grep is not installed. This means the "-r" option which is
+normally used to recursively search subdirectories it not available. You want to write a script to search for
 "sex" in a number of subdirectories.
 
 2.
@@ -149,10 +149,10 @@ You are configuring a new server on the redbrick network (136.206.15.0/24). You
 
 xl0: flags=8843 mtu 1500
 	inet 136.206.15.9 netmask 0xffff0000 broadcast 136.206.15.255
-	inet6 fe80::260:8ff:fe53:9a7c%xl0 prefixlen 64 scopeid 0x1 
-	ether 00:60:08:53:9a:7c 
+	inet6 fe80::260:8ff:fe53:9a7c%xl0 prefixlen 64 scopeid 0x1
+	ether 00:60:08:53:9a:7c
 	media: autoselect (100baseTX ) status: active
-	supported media: autoselect 100baseTX  100baseTX 10baseT/UTP  10baseT/UTP 100baseTX 
+	supported media: autoselect 100baseTX  100baseTX 10baseT/UTP  10baseT/UTP 100baseTX
 
 Why can't the machine communicate with the rest of the network?
 
@@ -204,7 +204,7 @@ Do you have a criminal record? Is it related to a user not reading the manual?
 6.
 How many prolog programmers does it take to change a lightbulb?
 
-7\. 
+7\.
 Name 2 ways you would disable a user
 
 8.
diff --git a/source/help/exams/admin-test-2001-agm/index.md b/content/help/exams/admin-test-2001-agm.md
similarity index 99%
rename from source/help/exams/admin-test-2001-agm/index.md
rename to content/help/exams/admin-test-2001-agm.md
index 094de9b..4b268e9 100644
--- a/source/help/exams/admin-test-2001-agm/index.md
+++ b/content/help/exams/admin-test-2001-agm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Admin Test 2001 AGM'
+title: Admin Test 2001 AGM
 ---
 
 
Redbrick Admin Test : - written by Noel Fitzpatrick (noelfitz) proofed by Phil
diff --git a/content/help/exams/admin-test-2002-agm.md b/content/help/exams/admin-test-2002-agm.md
new file mode 100644
index 0000000..97359c6
--- /dev/null
+++ b/content/help/exams/admin-test-2002-agm.md
@@ -0,0 +1,273 @@
+---
+title: Admin Test 2002 AGM
+---
+
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris and FreeBSD sections obviously!). Indicating which version of UNIX
+you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
+
+Humourous answers while appreciated gain no extra marks. Keep answers short and
+concise - don't waste time writing when one or two word answers will suffice.
+
+Best of luck!
+
+> - cns, phil, mark
+
+## 0\. Scripting (32 marks)
+
+**Rules:**
+
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admin_test and place scripts in there. Name each script by
+  its question number.
+
+Here we go..
+
+1.  Write a script which renames files based on a simple substitute pattern. The
+    script will take the following arguments:
+
+    `% ./script pattern1 pattern2 filename [filename ... ]`
+
+    All occurrences of 'pattern1' found in each filename are replaced by
+    'pattern2'. e.g:
+
+    `% ./script HTM html foo* *.HTM`
+
+    This would rename "HTMSTUFF.HTM" to "htmlSTUFF.html" but leave
+    "foo_blah.html" as is.
+
+    (8 marks)
+
+2.  You've found users regularly leaving processes running in the background
+    after they've logged out. Write a script which takes a list of usernames as
+    its arguments and kills off all such processes belonging to each user. It
+    should print out each process ID that is killed. Note that running this
+    script must not kill processes belonging to a user's current session(s) if
+    logged in! e.g:
+
+    
# ./script luser1 hackd00d luser2
+    709
+    712
+    10045
+    10080

+
+    (8 marks)
+
+3.  You're looking around a source tree and wish to find the top 3 directories
+    in the distribution which contain the most number of files. Write a script
+    which is run from the current working directory (in this example the top
+    level of the distribution) which lists the name of each directory along with
+    the number of files in it in descending order. e.g:
+
+    
% ./script
+    7000 drivers
+    5000 kernel
+    900 misc

+
+    (8 marks)
+
+4.  Write a script that conditionally deletes (i.e. asks for confirmation) all
+    files which either begin with the word "core" or are owned by an unknown
+    user or group in /home. (8 marks)
+
+## 1\. Solaris (29 marks)
+
+1.  "`/dev/dsk/c0t1d0s2`" is mounted on "`/var`" - explain what each part of the
+    disk device "`c0t1d0s2`" means. (3 marks)
+2.  1.  You are logged in as root at the console and wish to reboot the system
+        in 5 minutes time. State the most appropriate command to do this.
+        (2 marks)
+    2.  After the reboot, you wish to interrupt the automatic boot and boot to
+        single user mode. How would you do this? (2
+        marks)
+3.  How would you add a startup script to a Solaris system?
+    (2 marks)
+4.  How would you add a Solaris package you have obtained to the system?
+    (2 marks)
+5.  What is the procedure for adding a Solaris patch you have obtained to the
+    system? (2 marks)
+6.  1.  Which Sun website contains extensive documentaton for Solaris?
+    2.  Which Sun website contains patches, bug reports,
+        etc.?(2 x 1 marks)
+7.  Describe **briefly**what each of the following files are for:
+    1.  `/etc/system`
+    2.  `/etc/dumpadm.conf`(2 x 1 marks)
+8.  After a crash, fsck is run on each filesystem. This can sometimes take a
+    very long time. How can this time be reduced for future crashes?
+    (2 marks)
+9.  Where are the BSD commands in Solaris? (2 marks)
+10. How does the `killall` command on Solaris differ from the command on Linux
+    systems? (2 marks)
+11. Should `/usr` be part of `/` or a seperate filesystem on a Solaris system?
+    Why? (2 marks)
+12. What is `nscd` and what does it do? (2 marks)
+13. What is `/etc/nsswitch.conf` for? (2 marks)
+
+## 2\. FreeBSD (27 marks)
+
+1.  "`/dev/da2s1e`" is mounted on "`/var`" - explain what each part of the disk
+    device "`da2s1e`" means. (3 marks)
+2.  You are about to boot the system but you want to disable a certain device
+    driver in the kernel first. How do you do this (without compiling a new
+    kernel or physically removing the device!)? (2
+    marks)
+3.  Explain **briefly**what the following FreeBSD boot options are for:
+    1.  -s
+    2.  -a(2 x 1 marks)
+4.  Explain **briefly**what the following FreeBSD commands are used for:
+    1.  vnconfig
+    2.  vinum
+    3.  camcontrol
+    4.  sysctl(4 x 1 marks)
+5.  What version of FreeBSD is currently on Enigma? (2
+    marks)
+6.  How do you enable soft updates on a filesystem? (2
+    marks)
+7.  What are the benefits of using soft updates? (2
+    marks)
+8.  How do you install an application from the "ports" collection?
+    (2 marks)
+9.  How would you add a FreeBSD package you have obtained to the system?
+    (2 marks)
+10. How would you update a FreeBSD system without a CD (just the system, not
+    including packages)? Describe the steps. (6 marks)
+
+## 3\. Files & Filesystems (23 marks)
+
+1.  What is the effect of setting the sticky bit on a directory?
+    (2 marks)
+2.  What is the effect of setting the setgid bit on a directory?
+    (2 marks)
+3.  Below is the output from the command "`ls -li /usr/bin/passwd`":
+
+    
519949 -r-sr-xr-x   2 root     wheel       14808 Nov 17  2000 /usr/bin/passwd

+
+    State **briefly** what each part represents (one or two word description
+    will suffice). (5 marks)
+
+4.  1.  State **briefly** what the ctime, mtime and atime of a file represent?
+        (3 marks)
+    2.  How would you retrieve these? (1 mark)
+    3.  Give an advantage of enabling the "`noatime`" mount option?
+        (1 mark)
+5.  1.  What is an inode?
+    2.  Given an arbitrary inode number for a filesystem, how do you find the
+        name of the corresponding file(s)?
+    3.  How do you find the number of total and free inodes on a
+        filesystem?(3 x 1 marks)
+6.  You login to the system and find `/var` is completely full. However when you
+    su to root, you find you can still create files in `/var` even though it is
+    full. Explain why, state which parameter affects this and how you would
+    change it? (3 marks)
+7.  You try to unmount a filesystem but recieve the error "umount: /cdrom:
+    Device busy".
+    1.  What does this mean?
+    2.  How would you solve the problem?
+    3.  Despite your best attempts, you still recieve the same error. What's
+        your last resort?(3 x 1 marks)
+
+## 4\. Hardware (17 marks)
+
+1.  Give 3 advantages of SCSI over IDE. (3 marks)
+2.  1.  Describe **briefly** what RAID is? (2 marks)
+    2.  Give an advantage of software RAID and an advantage of hardware RAID.
+        (2 marks)
+    3.  State and **briefly** describe the 3 most common RAID levels.
+        (3 marks)
+    4.  Which is better, RAID 1+0 or RAID 0+1 and why? (3
+        marks)
+3.  You've just put together a new SCSI setup, but it's not working. Name 2
+    things to check. (2 marks)
+4.  You've just put together a new RAID 5 array and it works fine. Name 2 things
+    you should test/do before putting it into production use.
+    (2 marks)
+
+## 5\. Networking (22 marks)
+
+1.  You notice an unknown daemon is listening on TCP port 31337\. How would you
+    go about finding both the owner of this daemon and the exact path to the
+    program? (4 marks)
+2.  How would you distribute web traffic for a site between more than one web
+    server using only DNS? What is this commonly called? (2
+    marks)
+3.  How would you retrieve the SOA record for the zone "redbrick.dcu.ie" from
+    the DNS server running on 136.206.1.1? (2 marks)
+4.  How would you probe a remote host to enquire what services it is running?
+    (2 marks)
+5.  Given the hypothetical subnet 136.206.16.128 and netmask 255.255.255.128,
+    state the valid range of IP addresses that could be assigned to hosts on the
+    subnet. (2 marks)
+6.  Give 2 advantages of a switch over a hub. (2
+    marks)
+7.  How would you test if the mail server "`relay.eu.ney`" will relay mail for
+    the "`redbrick.dcu.ie`" domain? (4 marks)
+8.  Explain **briefly** what NAT (or IP Masquerading) is and how it's useful?
+    (2 marks)
+9.  Name three useful tools available on all UNIX systems for diagnosing network
+    problems. (2 marks)
+
+## 6\. Security (30 marks)
+
+1.  Give a path name that is very insecure to have in the PATH environment
+    variable? (2 marks)
+2.  What is scp? Give an example of its use. (2 marks)
+3.  Describe **briefly** how identd works. (2 marks)
+4.  Give the reason why sshd TCP forwarding is currently disabled on Redbrick.
+    (2 marks)
+5.  You're on a remote system without ssh and have to login to Redbrick using
+    telnet. Why is this bad? What should be the first thing you do as soon as
+    you login to Redbrick securely (i.e. with ssh) again? (2
+    marks)
+6.  You've lost the root password to a system. Sitting in front of the console
+    you reboot the machine to single user mode, but this also asks for the root
+    password. There are no floppy or CDROM drives in the machine. How do you
+    reset the password? (2 marks)
+7.  You are performing an audit of setuid and setgid binaries on Prodigy. State
+    whether the following should be left as is or stripped of set[ug]id bits and
+    give a reason:
+    1.  `-r-sr-xr-x root bin /usr/bin/login`
+    2.  `-r-s--x--x root lp /usr/bin/lp`
+    3.  `-r-sr-xr-x root bin /usr/bin/traceroute`
+    4.  `-r-sr-xr-x root sys /usr/bin/sparcv9/ps`(4 x 2
+        marks)
+8.  Two methods we use to secure BIND are that of using a chroot environment and
+    high-UIDs. Explain what a chroot environment is and the purpose of using
+    high-UIDs. (2 x 2 marks)
+9.  What are the Real UID, Effective UID and Saved UID of a process? What are
+    these set to for a setuid program? (6 marks)
+
+## 7\. General (20 marks)
+
+1.  1.  How would you find what signal a given signal number corresponds to?
+    2.  What are the SIGINT and SIGHUP signals used for?(2 x
+        2 marks)
+2.  Explain **briefly** what the term Parent Process ID means.
+    (2 marks)
+3.  1.  How would you turn on system accounting?
+    2.  Name 2 commands to retrieve accounting information.
+    3.  Give 1 advantage and 1 disadvantage to its use.(3 x 2
+        marks)
+4.  Give 1 advantage of using dump and 1 advantage of using tar for making
+    backups. (2 marks)
+5.  What is the "`mt`" command used for? (2 marks)
+6.  How would you unpack the file "`prog.tar.gz`" with a version of tar that
+    doesn't support the 'z' flag? (2 marks)
+7.  What is the "`domainname`" command used for? (2
+    marks)
+
+## 8\. Bonus Round! _ding ding_
+
+1.  What key combination enables the FreeBSD console screen saver?
+2.  vi or emacs?
+3.  Do you aspire to be a BOFH?
+4.  What is your preferred procedure for disuserment?
+5.  `|` u 4 l33+ h4X0|`d00d`?
+6.  Are you willing to dedicate so much time to Redbrick that you flunk college?
diff --git a/content/help/exams/admin-test-2003-agm-answers.md b/content/help/exams/admin-test-2003-agm-answers.md
new file mode 100644
index 0000000..65a7954
--- /dev/null
+++ b/content/help/exams/admin-test-2003-agm-answers.md
@@ -0,0 +1,327 @@
+---
+title: Admin Test 2003 AGM Answers
+---
+
+## 0\. Scripting (30 marks)
+
+1.  
#!/bin/sh
+    
+    LOGFILE=test.log
+    
+    tail -0 -f ${LOGFILE} | while read line; do
+    	# Using egrep before the while loop above wasn't working - output to
+    	# while loop was being delayed hence using it here inside the loop
+    	# instead.
+    	#
+    	if echo ${line} | egrep -q '^[0-9]{4}-[0-9]{2}-[0-9]{2} WARNING! [0-9]+ monkies are eating our [a-z ]+!/pre>; then
+    		number=`echo ${line} | sed 's/.*WARNING! \([0-9]*\) monkies.*/\1/'`
+    		hardware=`echo ${line} | sed 's/.*eating our \([a-z ]*\)!.*/\1/'`
+    
+    		# mail requires input for message body so just feed a newline
+    		# into it with echo.
+    		#
+    		echo | mail -s "Monkey alert! ${number} consuming ${hardware}" $*
+    	fi
+    done

+
+2.  
#!/bin/sh
+    
+    output="${2}/`date +%Y/%m/%d`"
+    mkdir -p ${output}
+    cd ${1}
+    
+    for file in *; do
+    	if [ -f ${file} ]; then
+    		mv ${file} ${output}
+    		touch $file
+    		gzip ${output}/${file}
+    	fi
+    done

+
+3.  
#!/bin/sh
+    
+    ps -ax -o pid,rss | (read header; while read pid rss; do
+    	if [ ${pid} -ne $ -a ${pid} -ge ${1} -a ${pid} -le ${2} -a ${rss} -ge ${3} ]; then
+    		kill ${pid}
+    	fi
+    done)

+
+## 1\. Solaris (30 marks)
+
+1.  You can kill all instances of a processes with Linux Killall, Solaris
+    Killall just kills everything.
+
+1.  - shutdown -i0 -g0 -y
+    - Turn off.
+    - Insert new disk.
+    - Turn on.
+    - Stop-A/Break.
+    - probe-scsi-all
+    - This is Solaris, obviously that'll work just fine.
+    - boot -s
+    - Label and format the disk using format.
+    - newfs
+    - mount
+
+1.  dumpadm, is the crash dump admin tool, and is used to specify what happens
+    if the system panics or crashes, whether the core is saved or not, if so
+    where, etc.
+
+1.  Cos it calls /usr/bin/sparcv9/ps, which is setuid.
+
+1.  /kernel/genunix
+
+1.  pkgadd, pkgchk -l
+
+1.  Access Control Lists, ability to specifically set a permission on a file for
+    a particular user or set of users.
+
+    
 setfacl -s user:dizer:rwx,user::rwx,group::rw-,mask:r--,other:--- filename

+
+    Disallows write permission from a particular user on the tty.
+
+1.  
/usr/platform/`uname -i`/sbin/prtdiag -v
+    

+
+1.  sunsolve.sun.com
+
+1.  The filesystem logs all changes to a special area on the disk which can be
+    reread if the machine should crash or reboot, which dramatically increases
+    reboot time and removes the need to fsck the filesystems.
+
+1.  - Shutdown gives warnings.
+    - Init just shuts down.
+    - Halt shuts down without running /sbin/rc0
+    - fsck, raw (block up to 2Gb)
+    - prtvtoc, raw
+    - mount, block
+
+1.  UFS.
+
+1.  Processes the systems accounting files and summarizes.
+
+1.  - /etc/system - Kernel modules and parameters
+    - /etc/default/ - Default configuration for system utilities.
+
+1.  Stop + A
+
+## 2\. FreeBSD (30 marks)
+
+1.  - da0: scsi disk (Direct Access)
+    - sa0: scsi tape (Sequential Access)
+    - ad0: atapi disk
+
+1.  boot off cd, interrupt boot loader and boot with the -a switch to Ask for
+    the root filesystem then type it in when asked for it (using kernel output
+    to identify which disk it is if necessary)
+
+1.  (latest production) 4.7 or (latest technology) 5.0
+
+1.  - shows what kernel modules are loaded
+    - editing and display of disklables (partitions within slices)
+    - show login.conf limits or run a command with given limits from a class
+    - Logical Volume Manager control program
+
+1.  /etc/rc.shutdown
+
+1.  
[as root]
+    cd /usr/ports//
+    make install
+    

+
+1.  Disk slice refers to an 'fdisk' partition, advantages are that all
+    paritioning (disklabels) can be contained within one overall slice, rather
+    than using multiple fdisk partitions.
+
+1.  /boot/loader.conf
+
+1.  - fdisk for partitioning
+    - newfs_msdos /dev/ad0s1
+    - mount -t msdos /dev/ad0s1 /dos
+
+1.  CVSup
+
+## 3\. Files & Filesystems (30 marks)
+
+1.  Obviously, difference between character and block devices. One mark for
+    knowing the words 'character' and 'block' the right way around, 2 for
+    knowing what they mean.
+
+1.  - Directory and normal file, respectively. (1 if both)
+    - It has (or had) ACLs applied to it. getfacl gives more info. (1 for each
+      of those facts)
+    - Anything you find plausible, e.g. he made the file while sued.
+    - It's a FIFO/named pipe (1 mark). mkfifo to make (1 mark).
+    - brief description of what a FIFO does (queue, IPC ,etc) (1 mark).
+
+1.  - mount, or /etc/mnttab (1 mark).
+    - mark each, nosuid = no setuid binaries, quota = enforce quotas on device,
+      first item = mount point, second = device to mount.
+    - Metadevice. Practically any command beginning with meta. (metaclear metadb
+      metadetach metahs metainit metaoffline metaonline metaparam metarename
+      metareplace metaroot metaset metastat metasync metatool metatool-toolsmenu
+      metattach metaclear metadb metadetach metahs metainit metaoffline
+      metaonline metaparam metarename metareplace metaroot metaset metastat
+      metasync metatool metatool-toolsmenu metattach)
+    - Set noexec (mount option, or via fstab) 1 mark.
+    - Remount rw, edit /etc/passwd. The mount bit is the important bit, though.
+
+1.  fsck. That simple. 1 mark.
+
+1.  Rerun newfs on the disk, using -N to not actually write anything. This will
+    print the default superblock positions. 1 mark for parrot-like recitation of
+    newfs command, 1 for knowing what it does and why it works.
+
+1.  /proc = process information, + extras on Linux. /dev = device files for
+    speaking directly to devices (disks, sound card, whatever).
+
+1.  Depends what system they discuss, but they should have paritioning (fdisk,
+    etc), formatting (newfs, etc). adding to fstab. 1 mark for sheer bravado to
+    anybody who reboots in windows, formats it and reboots on the grounds their
+    UNIX-a-like reads FAT32.
+
+## 4\. Hardware (30 marks)
+
+1.  - Redundant Array of Independent Disks.
+    - Several disks forming one or more devices.
+    - Mirroring, duplicates data across disks.
+    - Striping, places strips of data across multiple disks.
+    - Different levels of redundancy and speed.
+
+1.  - Speed
+    - Redundancy
+    - Hot-swapability
+
+1.  - 0
+    - 1
+    - 5
+
+1.  1 because of data duplication and non-striping.
+
+1.  10 = "stripped mirrors", 0+1 = "mirrored strips". 1+0 better redundancy and
+    read speed.
+
+1.  - Speed
+    - More devices per channel
+    - Longer cables
+
+1.  - Termination on last device
+    - Power and data cables connected correctly
+
+1.  Serial Console
+1.  Jumpers, Cable Select
+
+## 5\. Networking (30 marks)
+
+1.  Nmap
+
+1.  Start of Authority
+
+1.  lsof | grep TCP
+
+1.  dig redbrick.dcu.ie mx
+1.  - Hub bandwidth is maximum speed of connections.
+    - Switch does full duplex communication.
+    - Switch bandwidth is combined maximum speed of connections.
+
+1.  - ifconfig eth0
+    - netstat -rn
+    - _note values_
+    - ifconfig eth0 down
+    - ifconfig eth1 IP netmask NETMASK up
+    - Use "route" for each route.
+
+1.  A router (or machine acting as such) translates addresses for outbound
+    connections to have the address of the router. It receives all
+    inboundpackets, retranslates back to appropriate local addresses, outputs.
+
+1.  No direct inbound connections. Slower.
+
+1.  - Broadcast should be 136.206.15.255, ifconfig eth0 broadcast 136.206.15.255
+    - Netmask should be 255.255.255.0, ifconfig eth0 netmask 255.255.255.0
+    - Theres no default route to the gateway, route add default gw
+      136.206.15.254
+
+1.  - Inetd = The "Superserver", listens for connections and spawns off servers
+      when and if they arrive.
+    - Standalone, servers listen for their own connections and are always
+      running.
+    - Too much work for inetd to keep spawning off ftpd
+
+1.  - Port is already taken, use lsof
+    - You are trying to bind to a port less than 1024 and are not root
+
+## 6\. Security (30 marks)
+
+1.  Sends data via plaintext. Why this is bad - sniffing.
+
+1.  cp /bin/sh /tmp; chmod 4755 /tmp/sh
+
+1.  Computationally unfeasible to retrieve original value from signature,
+    compute signatures if files and store on immutable media.
+
+1.  Ask for student card, check against userdb. Politely refuse to do anything
+    otherwise. Basically, show some basic cop-on.
+
+1.  A basic firewall description. Filters based on ruleset which can base
+    decisions on originating and destination IP, port, on protocol type, on
+    flags (SYN, FIN, etc). Reference to stateful/stateless firewalls not
+    _needed_ but good.
+
+1.  At the shortest and sweetest, no it's not. Damaged may be limited by user
+    permissions, but worms could spread via vulnerable services running as
+    privegleged users (c.f. lpd/statd/Ramen, etc).
+
+1.  One all powerful user (root), limited configurability of access, difficulty
+    of granting anything but all-or-nothing access. These are the basic points,
+    it's largely based on demonstrating a good grasp of what's good and what's
+    bad.
+
+1.  RBAC - more finely-grained access control, e.g. allow a print-control role
+    to kill, restart printer related services, run managment tools. Then allow a
+    limited set of people to assume the print-control role.
+
+1.  _cough_ nmap, see what's their. Check arp cache. Check access points to
+    redbrick subnet. When you find out, interview person. Try and get a look at
+    machine before they have time to change anything. Make sure they are present
+    when you examine it. Compile report. Check with CSD.
+
+## 7\. General (30 marks)
+
+1.  - "ldd command" and see which libfoo it refers to
+
+    - set LD_LIBRARY_PATH="/usr/local/foo/lib" before running command
+
+1.  signals (sigstop, sigcont)
+
+1.  - dump: backups entire filesystem, includes all data that tar may miss.
+    - tar: generally much more flexible in terms of list of files and exlusion
+      patterns
+
+1.  the 'file' command or try the test mode:
+
+    - gzip -t file
+    - bzip -t file(also accepted is just trying each possible decompressor on
+      the file till one works, but above is neater!)
+
+1.  From a dedicated daemon (atd) or from the system cron daemon every minute
+    (atrun)
+
+1.  - System for receiving, storing and forwarding email across networks using
+      protocols such as SMTP. Postfix used on prodigy.
+    - System for the local delivery of email. May include filtering and other
+      processing capabilities. Procmail used on prodigy.
+
+1.  Manipulation of magnetic tapes. any valid example of an mt command. tape
+    device should be given on command line or mention that TAPE is used by
+    default
+
+1.  - st0: block tape device
+    - rst0: raw tape device
+    - nrst0: no-rewind raw tape device
+
+1.  - reset
+    - stty sane
+    - local terminal emulator reset command
+
+1.  /usr/include
diff --git a/content/help/exams/admin-test-2003-agm.md b/content/help/exams/admin-test-2003-agm.md
new file mode 100644
index 0000000..6ca26c0
--- /dev/null
+++ b/content/help/exams/admin-test-2003-agm.md
@@ -0,0 +1,366 @@
+---
+title: Admin Test 2003 AGM
+---
+
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris and FreeBSD sections obviously!). Indicating which version of UNIX
+you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
+
+Humourous answers while appreciated gain no extra marks. Keep answers short and
+concise - don't waste time writing when one or two word answers will suffice.
+
+Best of luck!
+
+> - cns, dizer, pixies
+
+## 0\. Scripting (30 marks)
+
+**Rules:**
+
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admin_test and place scripts in there. Name each script by
+  its question number.
+
+Here we go..
+
+1.  Write a script to monitor a log file for a line of the form:
+
+    
2003-03-03 WARNING! **n** monkies are eating our **hardware item**!

+
+    **n** will be a number (5, 10, etc), **hardware item** will be a string
+    containing only lower case letters and spaces. The date at the start can be
+    any date, not always the 3rd March :-)
+
+    When this line appears, the script should send a mail to a list of people
+    supplied as an argument, with the subject "Monkey alert! **n** consuming
+    **hardware item**!". The script should send a mail for all such matching
+    lines not just the first and will be run as follows:
+
+    
% ./script admins@redbrick.dcu.ie committee@redbrick.dcu.ie

+
+    If your script fails, the death of thousands between the jaws of monkies
+    will be on your conscience.
+
+    (10 marks)
+
+2.  Write a script to rotate all the files in a particular directory, to be run
+    as follows:
+
+    
% ./script /directory /output

+
+    `/directory` is the path to the directory containing all the log files and
+    `/output` is the path to the directory where the log files are to be placed
+    like so:
+
+    
/output/YYYY/MM/DD/file.gz

+
+    Where YYYY, MM and DD are the current year, month and day respectively and
+    file.gz is the gzipped version of the original log file.
+
+    (10 marks)
+
+3.  Write a script to kill off all processes between a given range of PIDs
+    (inclusive) that have an RSS value over a given size, to be run as follows:
+
+    
# ./script 100 1000 2000

+
+    This should kill all processes with a PID between 100 and 1000 inclusive
+    that have a RSS greater than or equal to 2000KB.
+
+    (10 marks)
+
+## 1\. Solaris (30 marks)
+
+1.  Name the important difference between the killall command on Linux and on
+    Solaris. (1 mark)
+2.  Discuss how you would go about adding a new disk to a Solaris machine.
+    (3 marks)
+3.  Discuss the purpose and usage of the dumpadm command. (2
+    marks)
+4.  On a Solaris system, why is /usr/bin/ps not setuid root?
+    (2 marks)
+5.  Where is the kernel stored on a Solaris machine? (1
+    mark)
+6.  How would you add a package to a solaris system, and list the packages
+    already installed? (2 marks)
+7.  What is an ACL and how would you set one? thehand is a popular redbrick
+    utility for blocking particular users from writing to your terminal. In the
+    context of ACLs explain how it works. (3 marks)
+8.  What command can provide details on CPU temperature, power supply status,
+    memory bank status (etc)? (2 marks)
+9.  Which Sun website contains patches, bug reports, etc? (1
+    mark)
+10. Describe what is meant by filesystem logging? (2
+    marks)
+11. When shutting a Solaris system down what is the difference between these
+    programs:
+    - shutdown
+    - init
+    - halt(2 marks)
+12. For each of the following commands specify if you should use the raw disk
+    device, or not, or if it doesn't matter.
+    1.  fsck
+    2.  prtvtoc
+    3.  mount(3 x 1 marks)
+13. Linux uses the ext2 filesystem extensively, what does Solaris normally use?
+    (1 mark)
+14. What does the runacct command do? (2 marks)
+15. What are /etc/system and /etc/default/ used for? (2
+    marks)
+16. You're standing in front of Prodigy, which has a Sun Keyboard attached to
+    it. How can you drop to the OBP immediately? (1
+    mark)
+
+## 2\. FreeBSD (30 marks)
+
+1.  Identify what type of devices 'da0', 'sa0' and 'ad0' refer to.
+    (3 marks)
+2.  The kernel on your system is missing and there are no backup copies. You do
+    however have a bootable CD with FreeBSD on it, how do you boot using the
+    CD's kernel but using the root filesystem of your hard disk?
+    (2 marks)
+3.  What is the latest release version of FreeBSD? (2
+    marks)
+4.  Briefly mention what the following commands are used for:
+    1.  kldstat
+    2.  disklabel
+    3.  limits
+    4.  vinum(4 x 2 marks)
+5.  You want to run some custom commands when the system is shutdown, which file
+    do you place these in? (2 marks)
+6.  Describe how to install an application from the ports system?
+    (2 marks)
+7.  Descibe what a disk slice is and its advantages over normal partitioning
+    schemes? (4 marks)
+8.  If you wanted to pre-load modules before the kernel is loaded, what file
+    would you edit? (2 marks)
+9.  How would you partition and format a new disk in a machine with a FAT
+    filesystem and mount it as /dos ? (4 marks)
+10. What is generally regarded as the quickest method for updating source and
+    port trees ? (1 mark)
+
+## 3\. Files & Filesystems (30 marks)
+
+1.  We'll start with an easy one. What's the difference between
+    /dev/rdsk/c0t0d0s0 and /dev/dsk/c0t0d0s0? (Explanation, not just a few
+    words) (3 marks)
+2.  You're looking at a directory listing, and you see the following items (from
+    ls -l) (7 marks):
+
+    
1: drwx------+  3 pixies   committe     512 Feb  4  2002 cia
+    2: -rw-------   1 pixies   committe    9319 Jul 11  2001 cv.pdf
+    3: prw-------   1 root     root           0 Mar 27 15:55 queue

+
+    1.  What file type are 1 and 2? (1 mark)
+    2.  What does the '+' in item 1 mean? How could you find out more about
+        this? (2 marks)
+    3.  Why does pixies have a file owned by root in his directory? (any
+        plausible explanation) (1 mark)
+    4.  What file type is item 3? How could one make such a file? What could it
+        be used for? (3 marks)
+
+3.  You've obtained the following output from a system command:
+
+    
/ on /dev/md/dsk/d0 read/write/setuid/intr/largefiles/logging/onerror=panic/dev=1540000 on Wed Dec 11 11:23:11 2002
+    /proc on /proc read/write/setuid/dev=3940000 on Wed Dec 11 11:23:04 2002
+    /dev/fd on fd read/write/setuid/dev=3a00000 on Wed Dec 11 11:23:16 2002
+    /etc/mnttab on mnttab read/write/setuid/dev=3b00000 on Wed Dec 11 11:23:21 2002
+    /var on /dev/md/dsk/d3 read/write/setuid/intr/largefiles/logging/onerror=panic/dev=1540003 on Wed Dec 11 11:23:43 2002
+    /var/run on swap read/write/nosuid/size=8M/dev=1 on Wed Dec 11 11:23:43 2002
+    /tmp on swap read/write/nosuid/size=256m/dev=2 on Wed Dec 11 11:24:12 2002
+    /local on /dev/md/dsk/d2 read/write/setuid/intr/largefiles/logging/onerror=panic/dev=1540002 on Wed Dec 11 11:24:12 2002
+    /home on /dev/md/dsk/d4 read/write/nosuid/intr/largefiles/logging/quota/onerror=panic/dev=1540004 on Wed Dec 11 11:24:12 2002
+    /snapshot/home on /dev/fssnap/0 read only/nosuid/intr/largefiles/logging/onerror=panic/dev=f00000 on Sun Mar 23 03:07:17 2003

+
+    1.  What command gives you this information? Also accepted is the file
+        containing it. (1 mark)
+    2.  What do the following represent:
+        1.  nosuid?
+        2.  quota?
+        3.  The first item in the output? (e.g. /, /tmp)?
+        4.  The second item? (e.g. /dev/md/dsk/d0, /proc)?(4
+            x 1 marks)
+    3.  What does the 'md' in lines such as '/dev/md/dsk/d0' mean? Name one
+        command related to it. (2 marks)
+    4.  How would I prevent people executing files located in /home?
+        (1 mark)
+    5.  Due to a disk problem, / has been mounted readonly. I need to change
+        root's password so I can log in, as I don't know the machine. What
+        should I do? (2 marks)
+
+4.  What tool can I use to check a filesystem for errors? (1
+    mark)
+5.  You have a corrupt superblock on an old disk. You know it was formatted
+    using default values. How can you determine the locations of backup
+    superblocks, with access to the tools used to format it?
+    (2 marks)
+6.  What are these filesystems usually used for?
+    1.  /proc
+    2.  /dev(2 x 1 marks)
+7.  You have just added a new drive to a system running your favourite
+    UNIX-a-like OS. It shows up in your /dev directory. Describe the steps
+    required to set it up for use as your /mp3s directory. (5
+    marks).
+
+## 4\. Hardware (30 marks)
+
+1.  Briefly describe RAID. (2 marks)
+2.  Describe 3 advantages of RAID. (3x2 marks)
+3.  What are the three most common RAID levels. (2
+    marks)
+4.  Redbrick buys a new server for production use, what RAID level would you use
+    for the boot device? Why? (3 marks)
+5.  What's the difference between RAID 1+0 and RAID 0+1? (1
+    mark)
+6.  Name 3 advantages of SCSI over IDE. (3x2 marks)
+7.  You attach a new SCSI disk to a machine, but it doesn't work. Name two
+    things to check. (2x2 marks)
+8.  Someone has donated a SparcStation, you have no Sun monitor or 13w3
+    convertor. Describe a means through which you could log into the machine?
+    (2 marks)
+9.  A machine has two hard-disks on the first IDE channel. Name two ways of
+    changing which is the master and which is the slave. (2x2
+    marks)
+
+## 5\. Networking (30 marks)
+
+1.  You want to scan the Redbrick network for unauthorised connections. Name a
+    tool you would use to do this. (2 marks)
+2.  What does SOA stand for? (1 marks)
+3.  Name a way to list all open TCP connections on a machine.
+    (1 mark)
+4.  How would you retrieve the mail servers for the redbrick.dcu.ie domain?
+    (2 marks)
+5.  Name two differences between a switch and a hub. (2 x 2
+    marks)
+6.  There are two network cards in one machine, but one starts malfunctioning.
+    How would you go about manually configuring the second to take the place of
+    the first. You are at the console of the machine. (2
+    marks)
+7.  Explain the concept of NAT? (3 marks)
+8.  Name a disadvantage of NAT. (1 marks)
+9.  You connect a machine with one NIC to the RedBrick subnet (136.206.15.0/24)
+    where the gateway is 136.206.15.254\. Output from ifconfig:
+
+    
eth0 Link encap:Ethernet  HWaddr 00:00:3B:E2:C9:DF
+    inet addr:136.206.15.90  Bcast:136.206.15.254  Mask:255.255.0.0
+    UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+    RX packets:13 errors:0 dropped:0 overruns:0 frame:0
+    TX packets:10 errors:0 dropped:0 overruns:0 carrier:0
+    collisions:0 txqueuelen:100
+    Interrupt:11

+
+    And the routing details are:
+
+    
Destination     Gateway         Genmask         Flags   MSS Window  irtt Iface
+    136.206.18.0    0.0.0.0         255.255.255.0   U        40 0          0 eth0

+
+    Identify the errors in the output and suggest a means of rectifing each one.
+
+    (9 marks)
+
+10. Ftp on Prodigy was recently removed from inetd and made standalone. Explain
+    what is meant by inetd and standalone and possible reasons for this change.
+    (3 marks)
+11. You start a daemon from the command line, but it complains "Cannot bind to
+    port". Suggest two possible causes for this. (2
+    marks)
+
+## 6\. Security (30 marks)
+
+Note: This section has quite a high answer to marks ratio. It's acceptable to
+resort to bullet points, if you feel they answer the question sufficiently. Not
+all questions are purely technical.
+
+1.  An oldie, but a goodie: why is telnet considered insecure, if we assume that
+    the telnet server and client are written without any security holes? Some
+    detail required. (2 marks)
+2.  You have 5 seconds at an unattended root shell (and can type at a rate of at
+    least 8 characters a second). Using only the /tmp directory and basic
+    commands, describe how you could give yourself a back door on the system.
+    You have an unprivileged shell account already. (2
+    marks).
+3.  Describe, in general terms, the function of a one-way/hash/signature
+    function such as MD5 or SHA1\. Explain how this can be used by tools such as
+    Tripwire to ensure your files are safe. (2 marks)
+4.  A guy comes up to you in the labs looking frantic. "Jaysus!" (he says) "I've
+    just lost me redbrick password, and me project is in it! I'm
+    cleverguy@redbrick, could you reset it to 'pleasegodidontwannafail'?" What
+    do you do? (2 marks)
+5.  What is a firewall? Describe roughly how it works, making reference to
+    TCP/IP, port numbers and protocol numbers, and why this is beneficial.
+    (3 marks)
+6.  Discuss, very briefly: "UNIX is immune to viruses and worms".
+    (2 marks)
+7.  What is wrong with the traditional UNIX security model regarding users and
+    files? i.e. how is it flawed. (2 marks)
+8.  RBAC is "Role Based Access Control" for Solaris. What does this mean?
+    (2 marks)
+9.  Somebody asks you "Hey, 136.206.15.171 is a RedBrick IP, what's that machine
+    do?". Your head explodes in panic, as that IP isn't in use by RedBrick.
+    After your head unexplodes, how do you proceed? Assume you can track down
+    the owner of the machine. (3 marks)
+
+## 7\. General (30 marks)
+
+1.  You have a program that requires "libfoo" and is dynamically linked against
+    it. However, there are two different versions of libfoo, one in
+    /usr/local/lib and one in /usr/local/foo/lib. How do you:
+    1.  Find out which library the program would normally use when run from your
+        shell? (2 marks)
+    2.  Force the program to use the library verison in /usr/local/foo/lib when
+        run from the shell? (2 marks)
+2.  What is the mechanism that a process (e.g. a shell) would use to allow the
+    suspension and resumation of other processes? (2
+    marks)
+3.  Give 1 advantage of using dump and 1 advantage of using tar for making
+    backups. (2 marks)
+4.  You have downloaded a compressed tarball, but don't know what program was
+    used to compress it. Give 2 methods for determining this.
+    (2 marks)
+5.  1.  Name the 2 different ways in which at jobs are typically automatically
+        launched by the system? (2 marks)
+    2.  Name the command and describe its use on how to remove jobs from the
+        'at' scheduler queue? (2 marks)
+6.  1.  What is a Mail Transfer Agent and name the one used on prodigy.
+        (2 marks)
+    2.  What is a Mail Delivery Agent and name the one used on prodigy.
+        (2 marks)
+7.  What is the mt command used for? Give an example of its use.
+    (3 marks)
+8.  The tape device 'st0' has three forms: st0, rst0 and nrst0, what is the
+    difference between these? (note that his applies to many UNIXes despite
+    different names for actual tape device) (3 marks)
+9.  You accidentally cat a binary file and it corrupts your terminal. Name 2
+    commands you would try to fix this? (4 marks)
+10. Where are C system header files usually located ? (2
+    marks)
+
+## 8\. Bonus Round! _ding ding_
+
+1.  Do you prefer Vi or Emacs? (Vi = 0 marks, Emacs = -10
+    marks)
+2.  What does this do?
+
+```
+    
@P=split//,".URRUU\c8R";@d=split//,"\nrekcah xinU / lreP rehtona tsuJ";sub p{
+    @p{"r$p","u$p"}=(P,P);pipe"r$p","u$p";++$p;($q*=2)+=$f=!fork;map{$P=$P[$f^ord
+    ($p{$_})&6];$p{$_}=/ ^$P/ix?$P:close$_}keys%p}p;p;p;p;p;map{$p{$_}=~/^[P.]/&&
+    close$_}%p;wait until$?;map{/^r/&&<$_>}%p;$_=$d[$q];sleep rand(2)if/\S/;print

+```
+
+3.  Rate these operating systems in order of preference:
+    - Solaris
+4.  You're stressed out with project work, your latest program doesn't work,
+    you've just spent an hour and a half running around DCU trying to get a
+    working printer, you have to write an admin test and someone heys you and
+    asks you for a Tomcat account. What do you do?
+5.  Write this in hex.
diff --git a/source/help/exams/admin-test-2004-agm-answers/index.md b/content/help/exams/admin-test-2004-agm-answers.md
similarity index 53%
rename from source/help/exams/admin-test-2004-agm-answers/index.md
rename to content/help/exams/admin-test-2004-agm-answers.md
index 09f6060..b48fa4a 100644
--- a/source/help/exams/admin-test-2004-agm-answers/index.md
+++ b/content/help/exams/admin-test-2004-agm-answers.md
@@ -1,12 +1,18 @@
 ---
-title: 'Admin Test 2004 AGM Answers'
+title: Admin Test 2004 AGM Answers
 ---
 
-All questions can be answered in the context of any version of UNIX (except for the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of UNIX you refer to in your answer is preferred but not required. Negative marking applies throughout for answers that are clearly incorrect or demonstrate incompetence.
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
 
-Humourous answers while appreciated gain no extra marks. **Keep answers short and concise** - don't waste time writing when one or two word answers will suffice.
+Humourous answers while appreciated gain no extra marks. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
 
-**ALL SECTIONS ARE *NOT* EQUALLY WEIGHTED**
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
 
 The test is marked out of 300.
 
@@ -18,26 +24,32 @@ Best of luck!
 
 **Rules:**
 
-*   You must be mesg n for duration of test. Any attempt to communicate with other users will result in immediate failure.
-*   You may only refer to system documentation (man & info pages) for help, i.e. no web access!
-*   You are free to use any shell or scripting language to write the scripts. Only system commands may be used, your own or other user scripts may not be referred to. Basically: no cheating!
-*   Make a directory ~/admintest and place scripts in there. Name each script by its question number. Humorous error messages make your scripts run faster.
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admintest and place scripts in there. Name each script by
+  its question number. Humorous error messages make your scripts run faster.
 
-**Whilst we hope your scripts run correctly, the emphasis is on the procedure rather than a perfectly working implmenetation.**
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implmenetation.**
 
 Here we go..
 
 1.  
#!/bin/bash
-
+    
     OUT=/var/admin/systemcheck
     TMP=/tmp/md5sum.$
-
+    
     if [ -e $OUT ]; then
             mv $OUT $OUT.old
     fi
-
+    
     find `echo $PATH | tr ':' ' '` -perm -111 -type f -maxdepth 1 -exec md5sum {} \; >> $OUT
-
+    
     if [ -e $OUT.old ]; then
             diff -u $OUT.old $OUT > $TMP
             if [ -s $TMP ]; then
@@ -50,87 +62,97 @@ Here we go..
             fi
             rm $TMP
     fi
-
+    
     

 
 2.  It didn't really have to mail the user just once, but it's nice.
 
     
#!/bin/bash
-
+    
     if [ $# -ne 1 ]; then
     	echo "Usage: $0 directory-name";
     	exit 1;
     fi
-
+    
     TMPDIR=/tmp/badusers.$/
-
+    
     COUNT=0
-
+    
     mkdir $TMPDIR
-
+    
     find $1 -type f -not user mark -printf "%s %u %p\n" | sort -rn | head -10 | while read SIZE NAME PATH
     do
     	if [ ! -e "$TMPDIR/$NAME" ]; then
-    		{	
+    		{
     			echo "You're using too much space in these files:"
     			echo
     		} > "$TMPDIR/$NAME"
     	fi
-
-    	echo $PATH >> "$TMPDIR/$NAME"		
+    
+    	echo $PATH >> "$TMPDIR/$NAME"
     done
-
+    
     for i in $TMPDIR/*
     do
     	cat $i | mail -s 'Files too large!" admins@redbrick.dcu.ie
     	rm -f $i
     done
-
+    
     rmdir $TMPDIR
     	

 
 3.  
#!/bin/bash
     find /home/associat -type f -exec md5sum {} \; 2>/dev/null > allsums.log
-
+    
     function doit {
     for CHECKSUM in `cat sums.log | awk {'print $1'}`
     do
             grep $CHECKSUM allsums.log | tee -a results.log
     done
     }
-
+    
     doit | mail admins@redbrick.dcu.ie
     

 
 ## 1\. Solaris (30 marks)
 
-1.  Contain platform specific libraries and binaries, all listed by platform type. Typically contains hardware/arch sensitive code.
-2.  Partition/Label a disk. Verify prints the current label. (3 marks)
+1.  Contain platform specific libraries and binaries, all listed by platform
+    type. Typically contains hardware/arch sensitive code.
+2.  Partition/Label a disk. Verify prints the current label.
+    (3 marks)
 3.  One is a block device, the other a character device.
-    *   c = controller
-    *   t = target/id
-    *   d = disk/partition
-    *   s = slice
+    - c = controller
+    - t = target/id
+    - d = disk/partition
+    - s = slice
 4.  netstat -rn
 5.  The former is an SPARC machine, the latter an intel one.  
     112233 patches the kernel.
-6.  Datastream and filesystem. Datastream packages are a single distributable file, filesystem type packages are like a directory structure of package files. pkgtrans converts the latter to the former, kind of like tarring to a very specific format.
+6.  Datastream and filesystem. Datastream packages are a single distributable
+    file, filesystem type packages are like a directory structure of package
+    files. pkgtrans converts the latter to the former, kind of like tarring to a
+    very specific format.
 7.  1.  pkginfo -l RBopenssh
     2.  # grep RBopenssh /var/sadm/install/contents
 8.  What do the following boot options do?
     1.  Reconfigure devices. (For hardware changes)
     2.  Single user mode
-9.  Halt will drop you at the OBP, poweroff will physically try and turn the machine off.
-10.  http://sunsolve.sun.com
-11.  Open Boot Prom. Press STOP+A or halt the machine. Or unplug a connected serial cable. Haha.
+9.  Halt will drop you at the OBP, poweroff will physically try and turn the
+    machine off.
+10. http://sunsolve.sun.com
+11. Open Boot Prom. Press STOP+A or halt the machine. Or unplug a connected
+    serial cable. Haha.
 
 ## 2\. FreeBSD (30 marks)
 
-1.  FreeBSD uses slices which are "sub-partitions" of physical partitions. Linux and DOS uses physical partitions.
-    *   a = root slice
-    *   b = swap
-    *   c = whole disk
-2.  Contains the primary system configuration information. /etc/defaults/rc.conf contain the default that is used, when an option is left out of /etc/rc.conf.
+1.  FreeBSD uses slices which are "sub-partitions" of physical partitions. Linux
+    and DOS uses physical partitions.
+    - a = root slice
+    - b = swap
+    - c = whole disk
+2.  Contains the primary system configuration information. /etc/defaults/rc.conf
+    contain the default that is used, when an option is left out of
+    /etc/rc.conf.
 3.  1.  Log server - Big var
     2.  Kernel build machine - Big /usr, / or /boot (if testing)
 4.  
cd /usr/src
@@ -138,17 +160,22 @@ Here we go..
     make INSTALLKERNEL KERNCONF=dizer.conf
     

 
-5.  
cd /usr/ports/editors/vim-lite; make install clean	
+5.  
cd /usr/ports/editors/vim-lite; make install clean
     

 
 6.  
cd /usr/ports; make search key='vnc'
     

 
-7.  cvsup to keep the ports themselves up to date, just cvs's off a primary server. portupgrade to update the installed ports.
-8.  netmask on the 15.4 should be 0xffffff00, broadcast should be 15.255 on the 15.64 and the prefixlen should be 64 on the local scope IPv6 link. (Two is enough)
+7.  cvsup to keep the ports themselves up to date, just cvs's off a primary
+    server. portupgrade to update the installed ports.
+8.  netmask on the 15.4 should be 0xffffff00, broadcast should be 15.255 on the
+    15.64 and the prefixlen should be 64 on the local scope IPv6 link. (Two is
+    enough)
 9.  rtsol
-10.  A piece of shit. "Logical Volume Manager Control Program". Software disk management, controls raiding and striping of disks. (Ala disksuite on Solaris)
-11.  ipfw
+10. A piece of shit. "Logical Volume Manager Control Program". Software disk
+    management, controls raiding and striping of disks. (Ala disksuite on
+    Solaris)
+11. ipfw
 
 ## 3\. Linux (30 marks)
 
@@ -159,22 +186,27 @@ Here we go..
 2.  /etc/apt/sources.list
 3.  
tar -xvjf linux-2.4.23.tar.bz2
     cd linux-2.4.23
-    patch -p1 	
+    patch -p1
     	

 
-4.  1.  Device name, mount point, file system, no suid binaries allowed, no device files allowed, no dumps, fsck check order
+4.  1.  Device name, mount point, file system, no suid binaries allowed, no
+        device files allowed, no dumps, fsck check order
     2.  A list of currently mounted file systems and their options.
 5.  route add default gw 136.206.15.254
-6.  Used to record information on processes. accton. Provided the kernel has been compiled with it.
-7.  How would you configure interface eth0 with the IP addresses 192.168.0.1 and 192.168.0.5?
+6.  Used to record information on processes. accton. Provided the kernel has
+    been compiled with it.
+7.  How would you configure interface eth0 with the IP addresses 192.168.0.1 and
+    192.168.0.5?
 
     
ifconfig eth0 inet 192.168.0.1 netmask 255.255.255.0
     ifconfig eth0:1 inet 192.168.0.5 netmask 255.255.255.255
     

 
-8.  1.  *   create a wrapper script for it in /etc/init.d which takes arguments start or stop.
-        *   create a symbolic link to it in /etc/rc3.d (e.g S99mysqlwatchd)
-        *   every other runlevel directory except rc3.d should contain a symbolic link to it preceeded by a K. (e.g K99mysqlwatchd)
+8.  1.  - create a wrapper script for it in /etc/init.d which takes arguments
+          start or stop.
+        - create a symbolic link to it in /etc/rc3.d (e.g S99mysqlwatchd)
+        - every other runlevel directory except rc3.d should contain a symbolic
+          link to it preceeded by a K. (e.g K99mysqlwatchd)
     2.  who -r
 9.  Use fuser or lsof to find the PID. kill -9 PID. umount /dev/cdrom
 
@@ -185,15 +217,17 @@ Here we go..
     3.  Common name
     4.  Distinguished name
     5.  Surname
-2.  
	$ ldapmodify -W -x -D cn=root,ou=ldap,o=redbrick 
+2.  
	$ ldapmodify -W -x -D cn=root,ou=ldap,o=redbrick
     	dn: uid=dizer,ou=accounts,o=redbrick
     	changeType: modify
     	replace: loginShell
     	loginShell: /usr/local/shells/bash
     	

 
-3.  Slapd controls the LDAP database, the access rules to it and answers all LDAP queries. Slurpd simply propogates changes from one slapd to another.
-4.  NSCD has died, which gives the illusion of LDAP problems. (slapd at 100% is often since it's overwhelmed with queries).
+3.  Slapd controls the LDAP database, the access rules to it and answers all
+    LDAP queries. Slurpd simply propogates changes from one slapd to another.
+4.  NSCD has died, which gives the illusion of LDAP problems. (slapd at 100% is
+    often since it's overwhelmed with queries).
 
     
	/etc/init.d/nscd start
     	

@@ -201,45 +235,74 @@ Here we go..
 5.  Quick fire:
     1.  Directory Access Protocol
     2.  X509
-    3.  A schema is a description of the data that the LDAP database will hold. It contains information such as datatypes and identifiers.
+    3.  A schema is a description of the data that the LDAP database will hold.
+        It contains information such as datatypes and identifiers.
     4.  core/cosine/corba/inetorgperson/java/nis
     5.  NIS/NIS+
 
 ## 5\. Files & Filesystems (30 marks)
 
-1.  ext2, ext3, xfs, ufs, reiserfs. Lots of possibilities. And no, I won't name the advantages of them all.
-2.  ramfs, a filesystem held entirely in memory. Good since continuous little writes are much more efficient when no physical disk is involved.
-3.  Takes a virtual (or sometimes real) copy of a filesystem, you get it's exact contents at a moment in time. How this operates varies, some have a copy-on-write mechanism. Dumping from a live filesystem is bad since the files can and do change while the dump is in progress, so you'd have to bring the machine to singleuser mode to reliably dump the filesystem. With a snapshot, you can dump straight from the snapshot.
+1.  ext2, ext3, xfs, ufs, reiserfs. Lots of possibilities. And no, I won't name
+    the advantages of them all.
+2.  ramfs, a filesystem held entirely in memory. Good since continuous little
+    writes are much more efficient when no physical disk is involved.
+3.  Takes a virtual (or sometimes real) copy of a filesystem, you get it's exact
+    contents at a moment in time. How this operates varies, some have a
+    copy-on-write mechanism. Dumping from a live filesystem is bad since the
+    files can and do change while the dump is in progress, so you'd have to
+    bring the machine to singleuser mode to reliably dump the filesystem. With a
+    snapshot, you can dump straight from the snapshot.
 4.  
# mt rewind
     # tar -cf /dev/rmt/1 /home
     

 
-5.  Grandfather, Father, Son backup scheme. Take incrementals every day, level 0s every weekend, rotate the dailys weekly, the weeklies monthly and the monthlies annually.
+5.  Grandfather, Father, Son backup scheme. Take incrementals every day, level
+    0s every weekend, rotate the dailys weekly, the weeklies monthly and the
+    monthlies annually.
 
     Any reasonable backup scheme is acceptable
 
-6.  An inode is a data structure for holding information about files on a UNIX file system. It contains permissions, devices, link counts, times, etc. Every file has an inode. Inode = "Index node". The name is not in the inode, this is stored in the directory. (One inode can have multiple names). There is a finite number of inodes, decided at filesystem creation, without a quota a user could render a system useless, by filling the disk with (usually) billions of tiny files. They'd remain under their block quota, though. So there's gotta be an inode quota too.
-7.  Access control list, controls access to a file on a much more granular level, you can have settings on a per-user/per-group basis.
+6.  An inode is a data structure for holding information about files on a UNIX
+    file system. It contains permissions, devices, link counts, times, etc.
+    Every file has an inode. Inode = "Index node". The name is not in the inode,
+    this is stored in the directory. (One inode can have multiple names). There
+    is a finite number of inodes, decided at filesystem creation, without a
+    quota a user could render a system useless, by filling the disk with
+    (usually) billions of tiny files. They'd remain under their block quota,
+    though. So there's gotta be an inode quota too.
+7.  Access control list, controls access to a file on a much more granular
+    level, you can have settings on a per-user/per-group basis.
 
     
		setfacl -m user:dizer:rw- foo.html
     	

 
 ## 6\. Hardware (30 marks)
 
-1.  A RAID 5 array has stripes, with segments of parity information on each of the disks. If you lose one disk, the system stays up and running, since the parity information can be used to retrieve the day. Two disks makes the data irrecoverable. As the system tried to write to the diks, it destroyed the integrity.
-2.  Scalable Processor ARChitecture. SPARC machines can support ridiculously large numbers of processors (8 and way up). SPARCs have an SBUS.
+1.  A RAID 5 array has stripes, with segments of parity information on each of
+    the disks. If you lose one disk, the system stays up and running, since the
+    parity information can be used to retrieve the day. Two disks makes the data
+    irrecoverable. As the system tried to write to the diks, it destroyed the
+    integrity.
+2.  Scalable Processor ARChitecture. SPARC machines can support ridiculously
+    large numbers of processors (8 and way up). SPARCs have an SBUS.
 3.  1.  Cable lengths
     2.  Active termination
     3.  ID conflicts
-4.  Very bad. Lose one disk, lose everything, since the data is stripped across all 4 disks and there is no parity information.
-5.  RAID 1+0 stripes data across a set of n mirrors . 0+1 mirrors two stripes (consisting of n disks). 1+0 good, 0+1 bad, each can take one failure, but 1+0 can potentially take much more. (Depending on how unlucky you are)
+4.  Very bad. Lose one disk, lose everything, since the data is stripped across
+    all 4 disks and there is no parity information.
+5.  RAID 1+0 stripes data across a set of n mirrors . 0+1 mirrors two stripes
+    (consisting of n disks). 1+0 good, 0+1 bad, each can take one failure, but
+    1+0 can potentially take much more. (Depending on how unlucky you are)
 6.  Roughly Compare and contrast IDE/SCSI/SATA under the following headings:
     1.  IDE 2, SCSI 7/15, SATA 1.
     2.  133M/sec, up to 160M/sec, SATA 150Mb/sec +
     3.  IDE 7200, SCSI 10K/15K, SATA 7200/10K
-    4.  IDE, nasty big bulky cables, short lengths. SCSI nasty bigger bulkier cables, long lengths. SATA, lovely tiny cables, longish lengths.(4 marks)
+    4.  IDE, nasty big bulky cables, short lengths. SCSI nasty bigger bulkier
+        cables, long lengths. SATA, lovely tiny cables, longish
+        lengths.(4 marks)
 7.  Cable select, the Master/Slave depends on it's position on the cable.
-8.  13w3 connectors are common on Sun boxes. Either buy a 13w3 to VGA connector, or just log in on a serial line.
+8.  13w3 connectors are common on Sun boxes. Either buy a 13w3 to VGA connector,
+    or just log in on a serial line.
 
 ## 7\. Networking (30 marks)
 
@@ -262,63 +325,101 @@ Here we go..
 
     
host -t aaaa carbon.redbrick.dcu.ie

 
-5.  Hub send packets through a connected subnet at half duplex, sending all inbound packets out on all links at the same time. Switch is full duplex, sends only to the correct line. Router routes packets between subnets.
-6.  It's an IP range that is not allocated to any external body, but that is free for anyone to use on their private network and not be routed onto the internet at large.
-    *   10.0.0.0 to 10.255.255.255
-    *   172.16.0.0 to 172.31.255.255
-    *   192.168.0.0 to 192.168.255.255
-7.  Nowait implies that once a query has been made the server is turn down again, until a new query comes in and the server is once again started. For something that gets as battered as LDAP, this is very very inefficient.
-8.  1.  Start of Authority, marks the start of a zone and who is responsible for it.
-    2.  Maximum transmissible unit, largest sized packet to send without fragmentation.
+5.  Hub send packets through a connected subnet at half duplex, sending all
+    inbound packets out on all links at the same time. Switch is full duplex,
+    sends only to the correct line. Router routes packets between subnets.
+6.  It's an IP range that is not allocated to any external body, but that is
+    free for anyone to use on their private network and not be routed onto the
+    internet at large.
+    - 10.0.0.0 to 10.255.255.255
+    - 172.16.0.0 to 172.31.255.255
+    - 192.168.0.0 to 192.168.255.255
+7.  Nowait implies that once a query has been made the server is turn down
+    again, until a new query comes in and the server is once again started. For
+    something that gets as battered as LDAP, this is very very inefficient.
+8.  1.  Start of Authority, marks the start of a zone and who is responsible for
+        it.
+    2.  Maximum transmissible unit, largest sized packet to send without
+        fragmentation.
     3.  Transmission Control Protocol, a reliable communication protocol.
-    4.  Mail exchange records, priority indicates which server is contacted first.
-9.  identd runs on the client, if you can't trust the client (like on the Internet), then the ident daemon could be sending any username. So to access your database all I have to do is say "Hi, I'm Diz, I mean...Mark, yes Mark". And I have access to his database.
+    4.  Mail exchange records, priority indicates which server is contacted
+        first.
+9.  identd runs on the client, if you can't trust the client (like on the
+    Internet), then the ident daemon could be sending any username. So to access
+    your database all I have to do is say "Hi, I'm Diz, I mean...Mark, yes
+    Mark". And I have access to his database.
 
 ## 8\. Security (30 marks)
 
-1.  Constructing an artifical root filesystem for the server by copying in the libraries, configuration files and spools it needs. Then just use the '-t' option to get named to automatically chroot in there. (3 marks)
-2.  Passphrased ssh keys, change your passwords, don't run CGIs. (4 marks)
-3.  pkill -9 -u spock, then disconnect Redbrick from the network immediately. Try to determine if system binaries are root-kit-stylee. (3 marks)
-4.  Ssh keys consist of a private and public part which can be used for system authentication. You can setup passphraseless ssh keys using ssh-keygen and not specifying a passphrase.
+1.  Constructing an artifical root filesystem for the server by copying in the
+    libraries, configuration files and spools it needs. Then just use the '-t'
+    option to get named to automatically chroot in there. (3
+    marks)
+2.  Passphrased ssh keys, change your passwords, don't run CGIs.
+    (4 marks)
+3.  pkill -9 -u spock, then disconnect Redbrick from the network immediately.
+    Try to determine if system binaries are root-kit-stylee.
+    (3 marks)
+4.  Ssh keys consist of a private and public part which can be used for system
+    authentication. You can setup passphraseless ssh keys using ssh-keygen and
+    not specifying a passphrase.
 
-    Passphraseless is good because it's quick, no typin required, automated scripts can do it. But it's bad because if one account is broken into to, so are all the accounts linked to it
+    Passphraseless is good because it's quick, no typin required, automated
+    scripts can do it. But it's bad because if one account is broken into to, so
+    are all the accounts linked to it
 
-    Passphrases never go over the wire, unlike passwords, making the system safer. They also take more than 8 characters into account.
+    Passphrases never go over the wire, unlike passwords, making the system
+    safer. They also take more than 8 characters into account.
 
     (4 marks)
-5.  Process accounting, IP accounting, log files. (4 marks)
+
+5.  Process accounting, IP accounting, log files. (4
+    marks)
 6.  
cp /bin/bash /tmp
     chmod 4755 /tmp/bash
     

 
 7.  Describe one of the following:
-    1.  Role based authentication, allows for a much finer grained control, by adding people/groups into arbitrary roles, then assigning permission to these roles. man rbac.
-    2.  Allows precision control over the faculties of a Linux system, the filesystems that can be access, the commands that can be exectuted. Can arbitrarily allow some processess access to /etc, but not others, etc.(2 marks)
-8.  Hiding something, so it's hard to find, but not well secured. If found, would be vulnerable. Storing the root password in a file called /etc/X11/gdm/Sessions/Xsession/fluxbox, leaving security bugs in a closed source project. (2 marks)
-9.  They're stored in /etc/shadow, which isn't word readable, so you can't do dictionary attacks on it.
-
-    So that for a dictionary attack each possible word has to be encrypted with the salt, then compared. This serves to slow the cracking process down.
+    1.  Role based authentication, allows for a much finer grained control, by
+        adding people/groups into arbitrary roles, then assigning permission to
+        these roles. man rbac.
+    2.  Allows precision control over the faculties of a Linux system, the
+        filesystems that can be access, the commands that can be exectuted. Can
+        arbitrarily allow some processess access to /etc, but not others,
+        etc.(2 marks)
+8.  Hiding something, so it's hard to find, but not well secured. If found,
+    would be vulnerable. Storing the root password in a file called
+    /etc/X11/gdm/Sessions/Xsession/fluxbox, leaving security bugs in a closed
+    source project. (2 marks)
+9.  They're stored in /etc/shadow, which isn't word readable, so you can't do
+    dictionary attacks on it.
+
+    So that for a dictionary attack each possible word has to be encrypted with
+    the salt, then compared. This serves to slow the cracking process down.
 
     (4 marks)
 
 ## 9\. General (30 marks)
 
-1.  Tunnel outbound irc traffic over ssh to a machine outside the blocked port range.
+1.  Tunnel outbound irc traffic over ssh to a machine outside the blocked port
+    range.
 
     
ssh -L 8000:irc.server.com:6667 machine.on.outside.com.

 
 2.  /var/run/utmp, remove the bogus entry, or close the non-closed entry.
-3.  A user resource limit has been exceeded. Check the users processes. Blow them away. Probably calling zsh from zsh.
+3.  A user resource limit has been exceeded. Check the users processes. Blow
+    them away. Probably calling zsh from zsh.
 4.  Give a brief description of the function of each of the following commands:
     1.  strace - trace system calls and signals
     2.  renice - alter priority of a running process
     3.  vmstat - report virtual memory statistics
     4.  ldd - print shared library dependencies
 5.  No stupid gay locking required.
-6.  To keep the UID to username translation exactly the same, otherwise the wrong people will have access to the wrong files.
+6.  To keep the UID to username translation exactly the same, otherwise the
+    wrong people will have access to the wrong files.
 7.  4
 
-## 10\. Bonus Round! *ding ding*
+## 10\. Bonus Round! _ding ding_
 
 1.  Solaris, I'm not wasting 100000000 marks
 2.  atlas@redbrick
diff --git a/content/help/exams/admin-test-2004-agm.md b/content/help/exams/admin-test-2004-agm.md
new file mode 100644
index 0000000..08be77d
--- /dev/null
+++ b/content/help/exams/admin-test-2004-agm.md
@@ -0,0 +1,477 @@
+---
+title: Admin Test 2004 AGM
+---
+
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
+
+Humourous answers while appreciated gain no extra marks. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
+
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
+
+The test is marked out of 300.
+
+Best of luck!
+
+> - dizer,tuama,prolix,mark(ie)
+
+## 0\. Scripting (40 marks)
+
+**Rules:**
+
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admintest and place scripts in there. Name each script by
+  its question number. Humorous error messages make your scripts run faster.
+
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implmenetation.**
+
+Here we go..
+
+1.  Write a script which makes a md5sum of every executable file in the system
+    path and stores it to a file. The script should check against a file left
+    the previous day for differences and report a change to admins via mail.
+
+    An example usage is:
+
+    
./systemcheck

+
+    (13.333 marks)
+
+2.  Due to Marks enormous porn collection, /home on Redbrick is rapidly filling
+    up. We need more space dammit.
+
+    Your job, should you choose to accept it, is to write a script that goes
+    through a directory and mails the owners of the top 10 largest files asking
+    them to free up some space.
+
+    Mark is good with his tongue though, so any of his files are to be ignored.
+
+    An example usage is:
+
+    
./toptenmail /home
+    

+
+    This will mail the owners of the top ten largest files in /home (but any
+    files owned by Mark are skipped).
+
+    .. or ..
+
+    
./toptenmail /webtree
+    

+
+    (13.333 marks)
+
+3.  Some of the committee mailing list archive files have been stolen! You don't
+    know which files have been taken. You do know the perpetrator is an
+    associate and also that he's clever enough to change the names of the files
+    he has copied. A list of md5sums of all of the committee archives is
+    contained in the file sums.log in the format
+
+    
d542034f417e7e4e45eeba42e2ec4884  2000-December.txt
+    fea5aeceaa5da313ec0c55e67fe5bd07  2001-December.txt
+    5c7c86ab526a4205d29f0536c834f737  2001-November.txt
+    f4f17acf4391126a00a89f9826f10c2c  2001-October.txt
+    ..
+    457dee0a0cc46961c2b13ef22983ba59  2004-January.txt
+    4c089e4be4e8e1f6a5133f3914db5b7b  2004-February.txt
+    
+    

+
+    Write a script that will search through /home/associat and record the full
+    path of any file which matches any of the md5sums in sum.log, in the file
+    results.log. A copy of this list should also be mailed to
+    admins@redbrick.dcu.ie.
+
+(13.333 marks)
+
+## 1\. Solaris (30 marks)
+
+1.  What is the purpose of the "platform" directories found in multiple places
+    on a Solaris machine? (3 marks)
+2.  What does the 'format' command do? In that context, what does it's 'verify'
+    command do? (3 marks)
+3.  What's the exact difference between /dev/dsk/c0t6d0s1 and
+    /dev/rdsk/c0t6d0s1? Explain each constituent part of each device name?
+    (5 marks)
+4.  On a Solaris system, how do I print the routing table? (1
+    marks)
+5.  If I install the 112233-11 patch on one machine, and 112234-11 patch on
+    another machine, what can you say about the two machines? (This is not
+    specific to that patch number). What does the '112233' series of patches
+    actually patch? (2 marks)
+6.  pkgadd can add two distinct types (formats) of packages to a Solaris system.
+    These "types" are converted between each other using the pkgtrans utility.
+    What are the two formats? (You don't need their exact Sun authorised names,
+    just roughly what each consists of). (3 marks)
+7.  On Prodigy, Redbrick's Sun machine, all our software is compiled from
+    source, then packaged, then installed using Solaris package installation
+    tools. If, you have a package, say, RBopenssh, how can I:
+    1.  Get information on the package, such as size, installation date,
+        intended architecture, etc.
+    2.  Get a listing of all files contained in the
+        package.(4 marks)
+8.  What do the following boot options do?
+
+    1.  -r
+    2.  -s(4 marks)
+
+9.  Explain the difference between 'halt' and 'poweroff'. (1
+    marks)
+10. You've just read on Bugtraq there's a vulnerability in ld.so, which website
+    would you visit to download the appropriate patch? (1
+    marks)
+11. What is the 'OBP'? You're sitting at a root prompt, with a Sun keyboard on
+    your lap. Name two ways of dropping to the OBP? (3
+    marks)
+
+## 2\. FreeBSD (30 marks)
+
+1.  Breify Explain FreeBSD disk slices and disk labels in comparison to Linux
+    paritions and DOS style partitions. Also make reference to the traditional
+    use of partition a, b and c in a FreeBSD slice. (5
+    marks)
+2.  What is rc.conf. What is it's relationship to /etc/defaults/rc.conf?
+    (1 marks)
+3.  You have a machine to dedicate to FreeBSD with a six Gigabyte harddrive.
+    Give a sample disk layout scheme if you were to use the machine for
+    1.  Log server
+    2.  Kernel build machine(2 marks)
+4.  I've already got the latest kernel code in the appropriate location. Now,
+    how do I compile and install the kernel? (2 marks)
+5.  How would I install vim from the ports? (3 marks)
+6.  How would I search for a vnc client in the ports system?
+    (3 marks)
+7.  What tool can I use to keep my ports collection up to date? How does it
+    work? (3 marks)
+8.  Examine the following ifconfig output on a FreeBSD machine, within the
+    Redbrick network (136.206.15.0/24).
+
+    
mark@enigma (~) $ ifconfig
+    [20:27]
+    vx0: flags=8843 mtu 1500
+            inet 192.168.0.4 netmask 0xffffff00 broadcast 192.168.0.255
+            inet6 fe80::220:afff:feef:33f1%vx0 prefixlen 64 scopeid 0x1
+            ether 00:20:af:ef:33:f1
+    xl0: flags=8843 mtu 1500
+            options=8
+            inet6 fe80::260:8ff:fe53:9a7c%xl0 prefixlen 128 scopeid 0x2
+            inet 136.206.15.4 netmask 0xfffffff0 broadcast 136.206.15.255
+            inet 136.206.15.64 netmask 0xffffffff broadcast 136.206.15.64
+            inet6 2001:770:107:15:260:8ff:fe53:9a7c prefixlen 64 autoconf
+            ether 00:60:08:53:9a:7c
+            media: Ethernet autoselect (100baseTX )
+            status: active
+    

+
+    What's wrong with this? (2 marks)
+
+9.  What FreeBSD tool would you use to accept IPv6 router advertisements and to
+    configure interfaces accordingly? (3 marks)
+10. What is vinum? (3 marks)
+11. Name the rather popular IP packet filter for FreeBSD? (3
+    marks)
+
+## 3\. Linux (30 marks)
+
+1.  You want to install a VNC client but you don't know the name of the package.
+
+    What apt commands could you use to find one and install it?
+
+    (3 marks)
+
+2.  Which file are the following lines taken from:
+
+    
	deb http://ftp.ie.debian.org/debian stable main non-free contrib
+    	deb-src http://ftp.ie.debian.org/debian stable main non-free contrib
+    	

+
+    (2 marks)
+
+3.  The below files exist:
+
+    
carbon (/usr/src/tu) # ls
+    linux-2.4.23.tar.bz2 xfs-2.4.23-all-i386
+    

+
+    List the commands you would use to apply the xfs patch, configure, build and
+    install the new kernel. Assume there are modules to be compiled. (Do this
+    either the Debian way, or the "normal" way).
+
+    (5 marks)
+
+4.  1.  Briefly describe each part of the following line taken from
+        /etc/fstab(don't go into detail on the device name):
+
+        
/dev/sda6       /var/tmp        ext3    nosuid,nodev            0       2
+        

+
+    2.  What does the /etc/mtab file contain?(6 marks)
+
+5.  How would you go about setting the default route to 136.206.15.254?
+    (3 marks)
+6.  What is process accounting? How would you enable it in Linux?
+    (2 marks)
+7.  How would you configure interface eth0 with the IP addresses 192.168.0.1 and
+    192.168.0.5? (2 marks)
+8.  The daemon /usr/local/bin/mysqlwatchd needs to be started on entering
+    runlevel 3 and stopped when the runlevel is anything but 3.
+    1.  How might you achieve this on a System V-style linux distribution?
+    2.  What command could you use to show the current
+        runlevel?(4 marks)
+9.  
root@aeon:~# umount /dev/cdrom
+    umount: /dev/cdrom: device is busy
+    
+    

+
+    Assuming you have no idea what process is accessing the drive, how would you
+    go about finding the PID of the process and then unmounting the drive?
+
+    (3 marks)
+
+## 4\. LDAP (20 marks)
+
+1.  Explain very very briefly, each of the following:
+    1.  o
+    2.  ou
+    3.  cn
+    4.  dn
+    5.  sn(5 x 1 marks)
+2.  Consider that POSIX account information is stored under LDAP (as it is on
+    Redbrick), how would I change a user's shell using the ldapmodify command.
+    Specifics just generally how one would go about using ldapmodify to make a
+    change. (5 marks)
+3.  Explain briefly the difference between slapd and slurpd.
+    (5 marks)
+4.  LDAP _appears_ to be broken. UIDs are not getting translated correctly,
+    resulting in "usernames" such as 7295, 1354 in programs such as ps and top.
+    You quickly realise that it's not LDAP that's broken, but something else.
+    What could that something else be? How would you rectify the situation?
+    (5 marks)
+5.  Quick fire:
+    1.  The L in LDAP stands for 'Lightweight'. What does the DAP stand for?
+    2.  When it says 'Lightweight', what is this "weight" in comparision to?
+    3.  What is an LDAP 'schema'?
+    4.  Name a "default" "built-in" LDAP schema.
+    5.  Name an alternative to LDAP for holding account and authentication
+        information?(5 x 1 mark)
+
+## 5\. Files & Filesystems (30 marks)
+
+1.  Name 4 different FS types and discuss their merits (we're looking for detail
+    here, and try and relate to Redbrick if you can). (8
+    marks)
+2.  What's tmpfs? Explain why it's a good idea in certain circumstances?
+    (4 marks)
+3.  Snapshotting, what's it all about. Why is it a good idea in some cases?
+    (3 marks)
+4.  I wanna backup /home, it has my porn collection. Burn it to DVD? Nah I'm old
+    school, porn belongs on tape. Describe how I would do this on either Linux,
+    BSD or Solaris. (4 marks)
+5.  Describe a backup scheme of your choice and discuss it's
+    advantages/disadvantages. (4 marks)
+6.  Discuss inodes, mention inode quotas and the inode-filesystem-relationship.
+    (4 marks)
+7.  What's an ACL and how would I set one on a file? (3
+    marks)
+
+## 6\. Hardware (30 marks)
+
+1.  Redbrick has an external disk array, configured in a RAID 5 array. The
+    controller card in it's infinite wisdom marked two disks 'offline' at the
+    same time, while the system was in use.
+
+    With reference to how RAID 5 works, explain why this is very very bad.
+
+    (5 marks)
+
+2.  Explain what is meant by SPARC? Name one way a SPARC system is different
+    from an Intel system. (3 marks)
+3.  You've just installed a SCSI disk. However it's not working correctly?
+    Explain two things to check. (4 marks)
+4.  You have 4 x 200Gb disks. You want to store /home on these disks. Is having
+    the 4 disks in a RAID 0 array a good idea or a bad idea? Explain why?
+    (4 marks)
+5.  My favourite: What's the difference between RAID 1+0 and RAID 0+1?
+    (4 marks)
+6.  Roughly Compare and contrast IDE/SCSI/SATA under the following headings:
+    1.  Number of devices per channel?
+    2.  Throughput (Figures not necessary, but I'd be impressed and strangely
+        aroused)
+    3.  Typical device RPM?
+    4.  Cable lengths and sizes?(4 marks)
+7.  You notice 'CS' marked at the back of a new IDE drive you buy. What on Earth
+    does that mean? (2 marks)
+8.  You've just bought a brand new Sun server. It claims to come equipped with a
+    video card. But con-sarn-it there doesn't seem to be a monitor connector
+    that'll fit your PC monitor. What gives? Explain two ways of getting around
+    this? (4 marks)
+
+## 7\. Networking (30 marks)
+
+1.  A routine nmap of Carbon shows that there's something listening on port
+    5666\. You telnet to this port and find:
+
+    
M1CK L33T FTP SERVER V1.0

+
+    How can you find out the PID of this unauthorised server and kill it off.
+
+    (2 marks)
+
+2.  sshd runs under the 'ssh' user, but you're not exactly familar with process
+    of starting sshd. You first 'su' to ssh, but upon starting it see the
+    following error message:
+
+    
Could not bind to port 22.

+
+    What's the problem? Why can't it bind? (Assuming nothing else is running on
+    port 22) (1 marks)
+
+3.  I want to setup an IP alias on a network interface, for 136.206.15.55.
+
+    Show the exact steps required to do this and to keep it persistent between
+    boots. You may answer in the context of FreeBSD, Solaris or Linux (one of
+    them), just me sure to specify which one.
+
+    (3 marks)
+
+4.  You want to look up the IPv6 address for carbon.redbrick.dcu.ie.
+
+    How do I do this, using the DNS query tool of your choice?
+
+    (3 marks)
+
+5.  What's the difference between a router, a switch and a hub?
+    (4 marks)
+6.  What is a private address range? (As described in rfc1918)
+
+    List 2 such ranges.
+
+    Why would you want to use one?
+
+    (3 marks)
+
+7.  One of your fellow admins suggests running LDAP from inetd using the nowait
+    flag. After you've beaten him to a pulp and he's being carried away by
+    paramedics, you explain, including details of how inetd works, why this is
+    such a bad idea... (3 marks)
+8.  Explain briefly each of the following:
+    1.  SOA
+    2.  MTU
+    3.  TCP
+    4.  MX and MX priority(8 marks)
+9.  Postgresql is a DBMS. Rebdrick have it setup to use ident authentication.
+    Currently, postgres is accessible only from within the Redbrick network.
+
+    If you were to change this, so that postgres was accessible from the world,
+    why would you _have_ to change the authentication mechanism in order to
+    ensure security?
+
+    (3 marks)
+
+## 8\. Security (30 marks)
+
+1.  Describe roughly what's involved in chrooting a Bind installation?
+    (3 marks)
+2.  Well done, you have just been elected and added to the root group. However,
+    you've just become a security threat to the system.
+
+    As a root group member, you have elevated privileges to that of a normal
+    user. Name 2 steps you can take to ensure your account is secure.
+
+    (4 marks)
+
+3.  RedBrick has been hacked. The website defaced, the boards deleted, spock is
+    heying you about 4 times a second. Describe what your first actions would
+    be? (3 marks)
+4.  Describe the usage of SSH public/private key pairs, and how you would setup
+    a passphraseless ssh key login. Discuss the merits and disadvantages of
+    this. In what ways are ssh keys more secure than traditionally password
+    authentication? (4 marks)
+5.  CSD, who, if elected you will be sleeping with, have emailed admins saying
+    they suspect that there is some malicious attacks eminating from the
+    RedBrick network. What investigative steps would you take?
+    (4 marks)
+6.  Assume the role of the hacker. You cross dress as a hot chick (if
+    nessassary), you bring Dizer to the bar and you're being very flirty.
+
+    There's alot of alcohol being consumed and well Dermot isn't eactly picky.
+    He invites you up to the server room, he want to show you his "root kit".
+
+    While your up there he passes out for 2 minutes leaving himself logged in as
+    root. How would you backdoor the system so that you can esclate your
+    privilages from your user account easily at a later time?
+
+    Dermot wakes up. You now have to "pay" for your deviance.
+
+    (4 marks)
+
+7.  Describe one of the following:
+    1.  RBAC the "Role Based Access Control" for Solaris
+    2.  LIDS - Linux intrusion dection system.(2
+        marks)
+8.  Explain what is meant by "Security through Obscurity". Give an example.
+    (2 marks)
+9.  Why are encrypted passwords not stored in /etc/passwd anymore?
+
+    Why are passwords encrypted with a salt?
+
+    (4 marks)
+
+## 9\. General (30 marks)
+
+1.  CSD accidentally cut off all outbound/inbound IRC access to Redbrick. It
+    appears port 6667 has become blocked. Suggest a means of getting around this
+    problem until CSD fix it? (5 marks)
+2.  Sometimes on Redbrick users aren't correctly logged off which can sometimes
+    lead to other users getting heys intended for the logged off person. What
+    file is responsible for this inaccurate information? How might you
+    (theoretically) go about fixing this? (4 marks)
+3.  When user jbloggs tries to connect they get the following error
+
+    
Server sent disconnect message
+    type 2(SSH_DISCONNECT_PROTOCOL_ERROR):
+    "fork failed: Resource temporarily unavailable"
+    

+
+    No one else has any problems logging in. What might the error indicate? How
+    would you resolve this? (4 marks)
+
+4.  Give a brief description of the function of each of the following commands:
+    1.  strace
+    2.  renice
+    3.  vmstat
+    4.  ldd(8 marks)
+5.  What's the main advantage of using the Maildir format over the traditional
+    mail spool file? (3 marks)
+6.  Why is a networked name service system _essiental_ when you're distributing
+    filesystems over NFS? (4 marks)
+7.  What's the very latest version of NFS? (2 marks)
+
+## 10\. Bonus Round! _ding ding_
+
+1.  Which of these operating systems do you prefer?
+    - Linux (-1000000000 marks)
+    - Solaris (0 marks)
+2.  If you could spin one Redbrick member, who would it be?
+3.  Tea or coffee? Answer carefully.
+4.  Would you actively support the upkeep and maintenance of pornographic
+    artwork in the server room?
+5.  Who owns _the_ cock?
+6.  To what organisation does the following insignia belong?
+
+    
:(soc

+
+7.  People keep heying you questions. It's really getting irritating. Describe
+    what you're doing to these people in your imagination.
diff --git a/content/help/exams/admin-test-2005-agm.md b/content/help/exams/admin-test-2005-agm.md
new file mode 100644
index 0000000..33c06bb
--- /dev/null
+++ b/content/help/exams/admin-test-2005-agm.md
@@ -0,0 +1,219 @@
+---
+title: Admin Test 2005 AGM
+---
+
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
+
+Humourous answers while appreciated gain no extra marks. Keep answers short and
+concise - don't waste time writing when one or two word answers will suffice.
+
+ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED
+
+The test is marked out of 300.
+
+Best of luck!
+
+- phaxx, mickeyd, halenger, dizer
+
+0.  Scripting (40 marks) Rules:
+
+You must be mesg n for duration of test. Any attempt to communicate with other
+users will result in immediate failure. You may only refer to system
+documentation (man & info pages) for help, i.e. no web access! You are free to
+use any shell or scripting language to write the scripts. Only system commands
+may be used, your own or other user scripts may not be referred to. Basically:
+no cheating! Make a directory ~/admintest and place scripts in there. Name each
+script by its question number. Humorous error messages make your scripts run
+faster. Whilst we hope your scripts run correctly, the emphasis is on the
+procedure rather than a perfectly working implementation.
+
+Here we go..
+
+Redbrick has started receiving letters from the various Irish organisations who
+deal like to complain about illegal material being available on the internet.
+The webmaster has...forgotten...to pay much attention to this situation. Write a
+script to find all files in /webtree with the following extensions: "mp3, wma,
+wmv, rm, ra, ogg, avi, mov, m4a, mpg, mpeg". Make sure the search is case
+insensitive. Write this to a file (as we will need it to find "culprits") and
+present it in the form: username :: group -:- chmod_of_file :-:
+size_in_kilobytes - path Write to the file "omfg_busted_zing.txt" (13 marks)
+Process this list so that it generates a report. The report should be as
+follows: chmod :: number_of_files :-: size_in_kilobytes_in_total -:-
+number_of_members (13 marks) Also process the list so that the top 10 users with
+the largest combined file sizes are listed as: username :: group :-:
+total_file_size -:- largest_file with a full list written to "fscking_users.txt"
+(14 marks)
+
+1.  Solaris - with thanks to dizer (30 marks) Listen up maggots, as part of this
+    job you're going to be anally gang raped by Sun Microsystems. And you're
+    going to have to learn to like it, soliders. With time, you'll enjoy the
+    feeling of a cool hard E450 on your ass cheeks.
+
+Now pay attention you slimey cunt fucks.
+
+You commie bastards think you're so fuckin' smart eh? Then tell me what
+'logging' means on Solaris UFS. (4 marks) WHAT DID YOU SAY! /usr and / on
+separate partitions on a Solaris system? Either you tell me why this is a bad
+idea, or I'll teach your sister all about 'partitioning'. (4 marks) Ah not
+again. Some anal sucking mommas boy left the air conditioning off again. Your
+Sun system is probably overheating like your Dad on a cheap Thai hooker. What
+command can I use to find out the temperature of your system? (2 marks) Sun in
+their infinite wisdom left a nasty little kernel bug in a version of Solaris
+running on Redbrick. What online resource do you use to patch against this? Your
+mommy can't help you now fagboy. (1 marks) Describe the steps involved in
+attaching my dick to your mother. Replace 'dick' with 'disk' and 'mother' with
+'father'. Now replace' father' with 'Sun box'. (5 marks) America, fuck yeah. Sun
+Microsystems, fuck yeah. Bed, Bath and Beyond, fuck yeah. Metastat, what the
+fuck does it do? (1 marks) Your commander in chief has just given you a new
+Solaris package named 'YERma'. Your orders are to get a list of everything in
+'YERma'. (2 marks) What's the difference between /bin/sh on Solaris and on
+Linux? Unlike your mother and your sister, they are actually different. (2
+marks) I don't know but I've been told, Eskimo pussy is mighty cold. Here are a
+list of director-ies, tell me what they're for as it sure ain't sleaze. /devices
+/dev /kernel /opt /platform (5 marks) Stop interfacing with your hand and
+interface with the network. You need to setup a network alias on a running
+network interface (say hme0) and ensure it is persistent across reboots. How do
+you go about this, with emphasis on the persistency. (4 marks)
+
+2.  FreeBSD (30 marks) What does sysctl do? (3 marks) What partition type does
+    FreeBSD usually use? (3 marks) What does FreeBSD normally use these
+    partitions for? /dev/ad0s1a /dev/ad0s1b (2 marks) What command would you use
+    to display the routing table? (3 marks) Assume your DNS server is down.
+    Looking up the hostnames for displaying the routing table is taking all
+    freakin' day. What option (to the answer for the previous question) turns
+    this off? (1 mark) You've just installed a BSD system, but neglected to
+    include the ports collection when prompted. List two ways you could install
+    it. (4 marks) You'd like to upgrade your system without using a crappy ol'
+    CD. What do you do? (3 marks) In what situation would you use vinum? Name an
+    alternative to using vinum. (3 marks) New kernel time! Assuming you have the
+    kernel sources installed, how do you go about this? (5 marks)
+    /etc/defaults/rc.conf? What the heck is that? Why shouldn't you edit it? (2
+    marks) Whats LINT? (hint: not related to fabric or paper ;) (1 marks)
+
+3)  Linux (30 marks) What command would you use to change or print terminal line
+    settings? How would you use this command to fix a terminal after catting a
+    binary file? How would you use this command to set backspace to ^? (3x1
+    marks)
+
+You run ps on a user. How do you find the full path to the executable of any of
+the user's processes? (3 marks) What device is represented by /dev/kmem?
+/dev/lp1? (2 marks) What are major and minor device numbers? (2 marks) What
+command would you use to make a block or character device? (2 marks) You install
+a new network card but the driver is not installed by default. Give the steps
+you would take to set up the new card (you have the driver and the network card
+is installed). (4 marks) Name two linux boot managers. For each one, show how
+you would make a change to the configuration. (4 marks) In what file might you
+set a proxy for apt to use? (2 marks) If you don't want to set a proxy in that
+file, how else might you make apt use a proxy? (2 marks) What command and option
+would you use to do a non-destructive read/write scan for bad blocks on a file
+system? (2 marks) You've just compiled a new kernel and you reboot. Everything
+seems to be going ok until you get the dreaded KERNEL PANIC message. You notice
+messages about ext3 filesystems not being mounted. What might be the cause of
+this? (4 marks)
+
+4.  LDAP (20 marks) Sometimes LDAP needs to be reindexed. The main part of the
+    reindexing process is stopping LDAP, exporting the LDAP database to an LDIF
+    file, readding all the entries from the file and restarting LDAP. Give the
+    commands to do this on RedBrick without using the slapindex command (you can
+    assume the database is cleared after you export the database). (6 marks)
+    What does ldapmodrdn do? (2 marks) When usernames start appearing as
+    numbers, its usually a problem with nscd rather than LDAP, but what is nscd
+    and what is it used for? (4 marks) What commands are used to a) change and
+    b) remove an LDAP entry. (2 marks) slurpd provides replication of an LDAP
+    database. Name three benefits of doing this. (3 marks) What are LDAP
+    attributes? List and explain 3 of them. (3 marks)
+
+5)  Files & Filesystems (30 marks) [ mickeyd@carbon:~ ]\$ ls -ld /tmp drwxrwxrwt
+    35 root root 1080 Apr 8 11:52 /tmp ^ What does the t mean? Why might this be
+    set on a directory like /tmp? (5 marks) What is the difference between a
+    character and block device? (2 marks) Give an example of a character and a
+    block device (you can use FreeBSD/Linux/Solaris but both examples must be
+    from the same OS). Provide device names. (2 marks) Filesystem 1k-blocks Used
+    Available Use% Mounted on /dev/sda2 4901956 3334036 1318916 72% / none
+    102400 284 102116 1% /tmp /dev/sda3 4901956 2214024 2438928 48% /var
+    /dev/sda5 8649544 1204144 7006024 15% /local /dev/sda6 4901924 2523936
+    2128984 55% /var/tmp /dev/sda7 186299092 91005928 95293164 49% /home
+    192.168.0.3:/webtree 173810112 62530848 111279264 36% /webtree
+    192.168.0.4:/jibber/webtree 192872352 152488544 24954016 86% /backup/webtree
+    192.168.0.4:/jabber/home 192872352 129194080 48248480 73% /backup/home What
+    command was used to display the above output? What can you say about the
+    last three filesystems? (3 marks) What is the traditional difference between
+    /bin and /sbin? (2 marks) Show how you would write a bootable floppy image
+    'boot.img' to a floppy disk (assuming the image fits on the disk). (3 marks)
+    Explain what is meant by the following mount options: noauto nouser suid
+    sync (4x1 marks) Journaling filesystems - good or bad? Why? Name 2
+    journaling and 2 non-journaling file systems. (6 marks) On an NFS mount,
+    what does all_squash do? (3 marks)
+
+6.  Hardware (30 marks) What does RAID stand for? What is it? (4 marks) Give
+    reasons for and against using RAID. (4 marks) The most common RAID levels
+    are 0, 1 and 5. Explain how these work. (4 marks) Give some advantages of
+    using software RAID over hardware RAID. (4 marks) You attach a new IDE drive
+    to a system. Its not working properly. Name 3 things you check before
+    shipping it back. (3 marks) What is DVI? (2 marks) What is ECC memory and
+    why would a server use it? (2 marks) The pentium 4 Xeon inside carbon has
+    the following capabilites: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr
+    pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid
+    Explain 6 of these flags. (6x0.5 marks) What does UPS stand for and why is
+    it A Good Thing [TM]? (4 marks)
+
+7)  Networking (30 marks) Whats a CIDR netmask? Give an example of the other
+    type. (2 marks) tun0/tap0. What the feck are they? (don't just say 'network
+    interfaces' :) (2 marks) Explain briefly each of the following: MTU FQN ARP
+    TBH SOA UDP MAC (12 marks) Why is the loopback device important? (2 marks)
+    How would you add a default route for a linux machine? How would you verify
+    it worked? (2 marks) screen 4587 awol 3u IPv4 0xc3dafcf0 0t0 TCP
+    192.168.0.4:65070->192.168.0.1:ldap (ESTABLISHED) What program generated the
+    line above? Summarise this line in plain english. Why might 'screen' be
+    doing that? Look at the fields with the IPs and ports. One of the ports has
+    been replaced with it's actual name, 'ldap'. How does it know? What controls
+    this? (8 marks) RedBrick has been delegated two subnets by DCU. (15 & 16).
+    Are they class A, B, C or D? (1 mark) ...and finally for Networking, a nice
+    simple one: Hubs and Switches. Whats the big difference? (1 mark)
+
+8.  Security (30 marks) chroot! Whats it good for? What problems might you face
+    when trying to use it? (4 marks) -rwsr-x--- 1 root root 23112 Nov 2 19:56
+    /bin/spork You find a mysterious binary in /bin/. You don't know what it is
+    or how it got there. Name three things you can do to safely try to see what
+    it does. (6 marks) Look at the permissions string for /bin/spork above -
+    what does that 's' mean? How would you both add and remove that 's'? (4
+    marks) The file above turns out to be a copy of 'bash'. Shit. What do you do
+    next? (detailed answer - six marks for this!) (6 marks) Er, how is it that
+    something like apache can run as the user 'www', yet be listening on port
+    80? Aren't ports below 1024 priviledged? (3 marks) Apart from something one
+    might do with your nose, whats snort? (3 marks) Whats a VPN? Give one
+    situation in which one might want to use one. (2 marks) Whats SUEXEC good
+    for? (2 marks)
+
+9)  General (30 marks) Redbrick's lagged to hell. You check top and there's
+    "sshd"s everywhere. Lower down there's some "sftp-server"s listed.
+    What...the...hell...?? How do I find out what these sftp things are doing?
+    (3 marks) 'hey' is telling you that some users don't exist. Something
+    definately up, but what might it be? (3 marks) When editing important files
+    as a Redbrick admin, RCS is often employed. What is RCS? How do I use it?
+    What do I do when that tool phaxx leaves the file "in use"? (3 marks) Whats
+    wtmp for? (2 marks) I'm tired of this. Please write the remainder of the
+    test yourself.
+
+Just kidding. Describe the steps in mounting something over NFS. Both client and
+server steps are required. (6 marks) What are all of the following for: renice
+wtmp dig (3x2 marks) Currect version of: Carbon's kernel Deathray's kernel
+Enigma's FreeBSD (3x1 marks) What's the optimal temperature for a server room's
+air conditioning system? (2 marks) tsocks seems to be unresponsive. Any attempts
+to use it just hang there and eventually time out. The proxy seems to be the
+most likely culprit so changing it seems like a good idea. It's set to proxy3.
+How do I change it and get tsocks working again? (2 marks)
+
+10. skyhawk's mother (Bonus round, zero marks, be nice!) (0 marks)
+
+Name? Do you think she'd approve of you being an admin? If so, why? (sorry dec,
+had to make good on my threats. ;)
+
+Bonus Bonus question: What member /var/tmped something that ground Redbrick to a
+halt lately? How did he make people aware of what he had put there and how big a
+tit do you think he is? (Please display ability to abuse members who make a
+general balls of Redbrick)
diff --git a/source/help/exams/admin-test-2005-egm/index.md b/content/help/exams/admin-test-2005-egm.md
similarity index 55%
rename from source/help/exams/admin-test-2005-egm/index.md
rename to content/help/exams/admin-test-2005-egm.md
index 0a9bbc5..18bdafe 100644
--- a/source/help/exams/admin-test-2005-egm/index.md
+++ b/content/help/exams/admin-test-2005-egm.md
@@ -1,12 +1,18 @@
 ---
-title: 'Admin Test 2005 EGM'
+title: Admin Test 2005 EGM
 ---
 
-All questions can be answered in the context of any version of UNIX (except for the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of UNIX you refer to in your answer is preferred but not required. Negative marking applies throughout for answers that are clearly incorrect or demonstrate incompetence.
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
 
-Humourous answers while appreciated gain no extra marks. **Keep answers short and concise** - don't waste time writing when one or two word answers will suffice.
+Humourous answers while appreciated gain no extra marks. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
 
-**ALL SECTIONS ARE *NOT* EQUALLY WEIGHTED**
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
 
 The test is marked out of 300.
 
@@ -18,24 +24,35 @@ Best of luck!
 
 **Rules:**
 
-*   You must be mesg n for duration of test. Any attempt to communicate with other users will result in immediate failure.
-*   You may only refer to system documentation (man & info pages) for help, i.e. no web access!
-*   You are free to use any shell or scripting language to write the scripts. Only system commands may be used, your own or other user scripts may not be referred to. Basically: no cheating!
-*   Make a directory ~/admintest and place scripts in there. Name each script by its question number. Humorous error messages make your scripts run faster.
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admintest and place scripts in there. Name each script by
+  its question number. Humorous error messages make your scripts run faster.
 
-**Whilst we hope your scripts run correctly, the emphasis is on the procedure rather than a perfectly working implementation.**
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implementation.**
 
 Here we go..
 
-1.  One of the admins made a silly mistake in the exim config. For a few hours, new mail was delivered to ~/MaildirX rather than ~/Maildir. A couple of hundred users have been affected. No mail has been lost, but it's sitting in the wrong directory.
+1.  One of the admins made a silly mistake in the exim config. For a few hours,
+    new mail was delivered to ~/MaildirX rather than ~/Maildir. A couple of
+    hundred users have been affected. No mail has been lost, but it's sitting in
+    the wrong directory.
 
-    Write a quick script to move everybody's mail in MaildirX into their normal Maildir.
+    Write a quick script to move everybody's mail in MaildirX into their normal
+    Maildir.
 
     An example usage is:
 
     
# ./fixmail

 
     (16 marks)
+
 2.  For some reason, a bunch of users don't have a quota.
 
     Write a script to set the default quota for users with none set.
@@ -45,9 +62,11 @@ Here we go..
     
# ./fixzeroquotas

 
     (17 marks)
+
 3.  Plenty of users have world-writable files in their webspace.
 
-    Write a script to produce a list of group and world writable files in /webtree, sorted by username.
+    Write a script to produce a list of group and world writable files in
+    /webtree, sorted by username.
 
     Example usage:
 
@@ -65,15 +84,26 @@ Here we go..
 
 ## 1\. Solaris (30 marks)
 
-1.  Solaris patches. Where can you find the latest? (3 marks)
-2.  Explain the difference between using a patch cluster and using a utility such as PatchPro to manage the patches on your system. (3 marks)
-3.  What is 'logging', with regard to a Solaris filesystem? (3 marks)
-4.  What filesystem does Solaris use? How compatible is this filesystem with Linux? (3 marks)
-5.  There's one very important difference between Solaris 'tar' and GNU 'tar'. What is it? (3 marks)
+1.  Solaris patches. Where can you find the latest? (3
+    marks)
+2.  Explain the difference between using a patch cluster and using a utility
+    such as PatchPro to manage the patches on your system. (3
+    marks)
+3.  What is 'logging', with regard to a Solaris filesystem?
+    (3 marks)
+4.  What filesystem does Solaris use? How compatible is this filesystem with
+    Linux? (3 marks)
+5.  There's one very important difference between Solaris 'tar' and GNU 'tar'.
+    What is it? (3 marks)
 6.  What is the OBP? How can you get to it? (4 marks)
-7.  Explain each component of /dev/dsk/c1t2d1s2\. What if the 'dsk' was changed to 'rdsk', what difference would that make? What's special about 's2', relative to any other value of 's'? (3 marks)
-8.  You have a Sun system with a spare drive bay. You have a suitable drive in your hand. You'd like to mount this new disk as /not_porn. List the steps you would take. (6 marks)
-9.  Solaris 10 offers many new features. Name two. (2 marks)
+7.  Explain each component of /dev/dsk/c1t2d1s2\. What if the 'dsk' was changed
+    to 'rdsk', what difference would that make? What's special about 's2',
+    relative to any other value of 's'? (3 marks)
+8.  You have a Sun system with a spare drive bay. You have a suitable drive in
+    your hand. You'd like to mount this new disk as /not_porn. List the steps
+    you would take. (6 marks)
+9.  Solaris 10 offers many new features. Name two. (2
+    marks)
 
 ## 2\. FreeBSD (30 marks)
 
@@ -81,25 +111,37 @@ Here we go..
 
     
echo 1 > /proc/sys/net/ipv4/ip_forward

 
-    Roughly, whats the *BSD equivalent? (3 marks)
-2.  What file is usually responsible for starting a service like sshd on boot? (2 marks)
-3.  The kernel sources are installed. List the steps in building a new kernel. (4 marks)
-4.  What file lists *every* kernel config option? (3 marks)
+    Roughly, whats the \*BSD equivalent? (3 marks)
+
+2.  What file is usually responsible for starting a service like sshd on boot?
+    (2 marks)
+3.  The kernel sources are installed. List the steps in building a new kernel.
+    (4 marks)
+4.  What file lists _every_ kernel config option? (3
+    marks)
 5.  How would I install vim from the ports? (3 marks)
-6.  What if I want to install vim from ports on a system WITHOUT X11? (3 marks)
-7.  What is the preferred method of keeping a FreeBSD system up to date reguarly? (3 marks)
-8.  What is vinum? How would you make it give you an overview of it's config and status right now? (3 marks)
-9.  What is FreeBSD's packet filter, and where is it's config file? (2 marks)
-10.  What is the kernel compile option to enable it? (2 marks)
-11.  How about logging for it? (2 marks)
+6.  What if I want to install vim from ports on a system WITHOUT X11?
+    (3 marks)
+7.  What is the preferred method of keeping a FreeBSD system up to date
+    reguarly? (3 marks)
+8.  What is vinum? How would you make it give you an overview of it's config and
+    status right now? (3 marks)
+9.  What is FreeBSD's packet filter, and where is it's config file?
+    (2 marks)
+10. What is the kernel compile option to enable it? (2
+    marks)
+11. How about logging for it? (2 marks)
 
 ## 3\. Linux (30 marks)
 
-1.  You just installed a package via apt, but you're not sure what the executable is called.
+1.  You just installed a package via apt, but you're not sure what the
+    executable is called.
 
-    What command could you use to list all the files associated with that package?
+    What command could you use to list all the files associated with that
+    package?
 
     (3 marks)
+
 2.  What file is the following taken from?
 
     
	*               soft    core            0
@@ -117,45 +159,73 @@ Here we go..
     	

 
     (3 marks)
-3.  On a system with apt, you'd like to know what package installed a particular file. What command AND option do you use to find this? (3 marks)
-4.  What utility do you use to check an ext2/3 filesystem for problems? (1 marks)
-5.  How can you find the temperature of your CPU(s) on a Linux system? (1 marks)
-6.  How do you list the routing table? What option do you use to make sure it doesn't attempt to resolve IPs to hostnames? (slow) (4 marks)
-7.  What Linux utility can you use to see what system calls a program is making? (2 marks)
-8.  With regard to a network interface in Linux, what is an alias? How would you set one up? (4 marks)
-9.  How do you list all processes who have files open under a particular directory? (3 marks)
-10.  You'd like to not only remove a package with apt, but erase everything associated with it. What apt command do you use? (3 marks)
-11.  What device is represented by /dev/sdb2 ? (3 marks)
+
+3.  On a system with apt, you'd like to know what package installed a particular
+    file. What command AND option do you use to find this? (3
+    marks)
+4.  What utility do you use to check an ext2/3 filesystem for problems?
+    (1 marks)
+5.  How can you find the temperature of your CPU(s) on a Linux system?
+    (1 marks)
+6.  How do you list the routing table? What option do you use to make sure it
+    doesn't attempt to resolve IPs to hostnames? (slow) (4
+    marks)
+7.  What Linux utility can you use to see what system calls a program is making?
+    (2 marks)
+8.  With regard to a network interface in Linux, what is an alias? How would you
+    set one up? (4 marks)
+9.  How do you list all processes who have files open under a particular
+    directory? (3 marks)
+10. You'd like to not only remove a package with apt, but erase everything
+    associated with it. What apt command do you use? (3
+    marks)
+11. What device is represented by /dev/sdb2 ? (3
+    marks)
 
 ## 4\. LDAP (20 marks)
 
-1.  What does LDAP stand for, and what is it used for on RedBrick? (4)
-2.  How would you search an LDAP database for an entry whose uid field is 'mickeyd'? (4 marks)
-3.  What is an LDIF file? How would you generate one? What command does the opposite of that? (4 marks)
-4.  When you run the command 'ps -fu mickeyd' you get the error: 'No such user: mickeyd'. Assuming the LDAP daemons are running, how would you fix this? (Specific commands/steps not required) (4 marks)
-5.  What LDAP implementation does RedBrick use? Name another LDAP implementation from another vendor. (4 marks)
+1.  What does LDAP stand for, and what is it used for on RedBrick?
+    (4)
+2.  How would you search an LDAP database for an entry whose uid field is
+    'mickeyd'? (4 marks)
+3.  What is an LDIF file? How would you generate one? What command does the
+    opposite of that? (4 marks)
+4.  When you run the command 'ps -fu mickeyd' you get the error: 'No such user:
+    mickeyd'. Assuming the LDAP daemons are running, how would you fix this?
+    (Specific commands/steps not required) (4 marks)
+5.  What LDAP implementation does RedBrick use? Name another LDAP implementation
+    from another vendor. (4 marks)
 
 ## 5\. Files & Filesystems (30 marks)
 
-1.  List four filesystems, and a pro and con of each. (8 marks)
-2.  How would you delete a file named "-boobie-"? (2 marks)
+1.  List four filesystems, and a pro and con of each. (8
+    marks)
+2.  How would you delete a file named "-boobie-"? (2
+    marks)
 3.  How about "boobie!"? (2 marks)
 4.  
-rwsr-x---    1 root     root        23112 Nov  2 19:56 /bin/su
        ^   ^^^

 
-    Explain why the pointed-to sections are that way. (2 marks)
-5.  What does the 'sync' command do on Linux/BSD? When might one use it? (4 marks)
+    Explain why the pointed-to sections are that way. (2
+    marks)
+
+5.  What does the 'sync' command do on Linux/BSD? When might one use it?
+    (4 marks)
 6.  Explain all the options in bold on the following line:
 
     
/dev/sda6 on /var/tmp type ext3 (**rw,nosuid,nodev,errors=remount-ro**)

 
     (4marks)
-7.  What is an inode? Why should a user only be allowed to use a certain amount of them? (2 marks)
-8.  Why would one choose to have a filesystem with 1k inode blocks? What about larger (like 4k) inode blocks? (2 marks)
+
+7.  What is an inode? Why should a user only be allowed to use a certain amount
+    of them? (2 marks)
+8.  Why would one choose to have a filesystem with 1k inode blocks? What about
+    larger (like 4k) inode blocks? (2 marks)
 9.  1.  What is an ACL?
     2.  How would you see any are attached to a particular file?
     3.  How would you set one?
-    4.  Name a filesystem in use by RedBrick that supports them.(4 marks)
+    4.  Name a filesystem in use by RedBrick that supports
+        them.(4 marks)
 
 ## 6\. Hardware (30 marks)
 
@@ -164,25 +234,35 @@ Here we go..
     2.  RAID 0?
     3.  RAID 1?
     4.  RAID 5?(4x1 marks)
-2.  Whats SPARC and PPC? Who makes systems using SPARC, and who makes PPC systems? (3 marks)
+2.  Whats SPARC and PPC? Who makes systems using SPARC, and who makes PPC
+    systems? (3 marks)
 3.  What is a SCSI terminator? (4 marks)
 4.  Which of RAID 0 or RAID 1 is suitable for: (Give one reason why)
     1.  Backups
     2.  /home(4 marks)
-5.  Which is more reliable, RAID 1+0 or 0+1? Why? (5 marks)
+5.  Which is more reliable, RAID 1+0 or 0+1? Why? (5
+    marks)
 6.  What is SCA? (2 marks)
-7.  If you were to put three 18gb disks in RAID 5, roughly how much usable disk space would you expect? (4 marks)
-8.  What are the advantages of using hardware RAID over software RAID? (4 marks)
+7.  If you were to put three 18gb disks in RAID 5, roughly how much usable disk
+    space would you expect? (4 marks)
+8.  What are the advantages of using hardware RAID over software RAID?
+    (4 marks)
 
 ## 7\. Networking (30 marks)
 
-1.  192.168.0.0/16 is a private IP range. Explain what is meant by a private IP range and list TWO others. (4 marks)
-2.  Convert the netmask 255.255.255.0 into a netmask in CIDR notation. (2 marks)
-3.  What is a privileged port? Name one service that usually uses one, and what port it usually runs on. (3 marks)
+1.  192.168.0.0/16 is a private IP range. Explain what is meant by a private IP
+    range and list TWO others. (4 marks)
+2.  Convert the netmask 255.255.255.0 into a netmask in CIDR notation.
+    (2 marks)
+3.  What is a privileged port? Name one service that usually uses one, and what
+    port it usually runs on. (3 marks)
 4.  IPv6, eh? Whats it good for? (1 marks)
 5.  Hubs are bad. Why? (TWO reasons) (4 marks)
-6.  Why does RedBrick have both an external and internal network? What types of traffic would you expect to pass over our internal network? (1 marks)
-7.  You want to keep a log of all outgoing IRC connections from a particular machine. Name two ways of doing this. (4 marks)
+6.  Why does RedBrick have both an external and internal network? What types of
+    traffic would you expect to pass over our internal network?
+    (1 marks)
+7.  You want to keep a log of all outgoing IRC connections from a particular
+    machine. Name two ways of doing this. (4 marks)
 8.  Explain briefly each of the following:
     1.  TTL
     2.  CNAME
@@ -197,59 +277,86 @@ Here we go..
 
 ## 8\. Security (30 marks)
 
-1.  What is a root kit, and what use would it be? (3 marks)
-2.  A common type of root kit is in the form of an LKM. What does LKM stand for? (1 marks)
-3.  Name a utility that can be used to scan for root kits. (1 marks)
-4.  You've noticed a bunch of websites are defaced. What do you do?! (4 marks)
-5.  As part of your term as an admin, it's likely the admin team will have to audit a small piece of code, probably something RedBrick-specific written by an admin.
+1.  What is a root kit, and what use would it be? (3
+    marks)
+2.  A common type of root kit is in the form of an LKM. What does LKM stand for?
+    (1 marks)
+3.  Name a utility that can be used to scan for root kits. (1
+    marks)
+4.  You've noticed a bunch of websites are defaced. What do you do?!
+    (4 marks)
+5.  As part of your term as an admin, it's likely the admin team will have to
+    audit a small piece of code, probably something RedBrick-specific written by
+    an admin.
 
-    With that in mind, examine the following snippet of C code, and explain why it sucks, from a security point of view. Why would it be worse for it to be setuid-root?
+    With that in mind, examine the following snippet of C code, and explain why
+    it sucks, from a security point of view. Why would it be worse for it to be
+    setuid-root?
 
     
	char buf[10];
     	strcpy(buf, argv[1]);

 
     (4 marks)
-6.  What is a checksum-based IDS? Can you name one? (2 marks)
-7.  Name a security mailing list you should be subscribed to. (2 marks)
-8.  Name two places user login activity is logged to. (2 marks)
-9.  Why is the RedBrick webserver set up to run CGI scripts under SUEXEC? (4 marks)
-10.  How can you get a list of all processes (and their owner) listening on network ports? (4 marks)
-11.  Why shouldn't you ever run any of shadow's utilities? (for example) (3 marks)
+
+6.  What is a checksum-based IDS? Can you name one? (2
+    marks)
+7.  Name a security mailing list you should be subscribed to.
+    (2 marks)
+8.  Name two places user login activity is logged to. (2
+    marks)
+9.  Why is the RedBrick webserver set up to run CGI scripts under SUEXEC?
+    (4 marks)
+10. How can you get a list of all processes (and their owner) listening on
+    network ports? (4 marks)
+11. Why shouldn't you ever run any of shadow's utilities? (for example)
+    (3 marks)
 
 ## 9\. General (30 marks)
 
-1.  Describe the steps you'd take if you wanted to mount deathray's /not_porn onto carbon via NFS. Both server and client steps are required. (5 marks)
-2.  Apart from changing somebody's shell to disusered and writing an appropriate message, what else might you have to do when disusering somebody? (4 marks)
-3.  How can you ensure a backgrounded process continues running after you logout? (not 'screen'!) (4 marks)
+1.  Describe the steps you'd take if you wanted to mount deathray's /not_porn
+    onto carbon via NFS. Both server and client steps are required.
+    (5 marks)
+2.  Apart from changing somebody's shell to disusered and writing an appropriate
+    message, what else might you have to do when disusering somebody?
+    (4 marks)
+3.  How can you ensure a backgrounded process continues running after you
+    logout? (not 'screen'!) (4 marks)
 4.  Explain:
     1.  SIGHUP
     2.  xargs
     3.  Accounting(6 marks)
-5.  How would you view/grep/etc a gzipped log file without actually decompressing it to disk? (3 marks)
-6.  Why is a networked name service system *essiental* when you're distributing filesystems over NFS? (4 marks)
+5.  How would you view/grep/etc a gzipped log file without actually
+    decompressing it to disk? (3 marks)
+6.  Why is a networked name service system _essiental_ when you're distributing
+    filesystems over NFS? (4 marks)
 7.  Latest version of:
     1.  Linux 2.4
     2.  Linux 2.6
     3.  FreeBSD(3 marks)
-8.  If you turn the airconditioning off for any reason, what do you do afterwards? (1 marks)
+8.  If you turn the airconditioning off for any reason, what do you do
+    afterwards? (1 marks)
 
-## 10\. Bonus Round! *ding ding*
+## 10\. Bonus Round! _ding ding_
 
 (0 marks)
 
-1.  Think of a use RedBrick might have for a 15" CRT monitor, where the VGA connector is missing the 'red' pin, creating an image with no red component.
+1.  Think of a use RedBrick might have for a 15" CRT monitor, where the VGA
+    connector is missing the 'red' pin, creating an image with no red component.
 2.  Which of these operating systems do you prefer?
-    *   Linux (0 marks)
-    *   Solaris (-1000000000 marks)(Take that, Duffy)
+    - Linux (0 marks)
+    - Solaris (-1000000000 marks)(Take that, Duffy)
 3.  BOFH?
     1.  [   ] Yes.
     2.  [   ] No.
     3.  [   ] I put some C4 in your powersupply.
-4.  Things break horribly at 4am. Deathray crashes, carbon is slowly grinding to a halt. You're warm and cosy, you're ten minutes from DCU, and it's fucking howling outside. What do you do?
+4.  Things break horribly at 4am. Deathray crashes, carbon is slowly grinding to
+    a halt. You're warm and cosy, you're ten minutes from DCU, and it's fucking
+    howling outside. What do you do?
 5.  
/dev/sda7             178G  163G  15G  92% /home

 
     Who?
-6.  Complete the sentence, but say something nice: IRC is a load of b_______
+
+6.  Complete the sentence, but say something nice: IRC is a load of b**\_\_\_**
 7.  Which of these manufacturers provides the shittiest case to work inside?
     1.  Compaq
     2.  Packard Bell
diff --git a/content/help/exams/admin-test-2006-agm.md b/content/help/exams/admin-test-2006-agm.md
new file mode 100644
index 0000000..da4948e
--- /dev/null
+++ b/content/help/exams/admin-test-2006-agm.md
@@ -0,0 +1,358 @@
+---
+title: Admin Test 2006 AGM
+---
+
+All questions can be answered in the context of any version of UNIX (except for
+the Solaris, FreeBSD and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
+
+Humourous answers while appreciated gain no extra marks. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
+
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
+
+The test is marked out of 300.
+
+Best of luck!
+
+> - phaxx, mickeyd, halenger, dizer
+
+## 0\. Scripting (40 marks)
+
+**Rules:**
+
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admintest and place scripts in there. Name each script by
+  its question number. Humorous error messages make your scripts run faster.
+
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implementation.**
+
+Here we go..
+
+1.  Redbrick has started receiving letters from the various Irish organisations
+    who deal like to complain about illegal material being available on the
+    internet. The webmaster has...forgotten...to pay much attention to this
+    situation. Write a script to find all files in /webtree with the following
+    extensions: "mp3, wma, wmv, rm, ra, ogg, avi, mov, m4a, mpg, mpeg". Make
+    sure the search is case insensitive. Write this to a file (as we will need
+    it to find "culprits") and present it in the form:
+
+    
username :: group -:- chmod_of_file :-: size_in_kilobytes - path

+
+    Write to the file "omfg_busted_zing.txt"  
+    (13 marks)
+
+2.  Process this list so that it generates a report. The report should be as
+    follows:
+
+    
chmod :: number_of_files :-: size_in_kilobytes_in_total -:- number_of_members

+
+    (13 marks)
+
+3.  Also process the list so that the top 10 users with the largest combined
+    file sizes are listed as:
+
+    
username :: group :-: total_file_size -:- largest_file

+
+    with a full list written to "fscking_users.txt"  
+    (14 marks)
+
+## 1\. Solaris - with thanks to dizer (30 marks)
+
+Listen up maggots, as part of this job you're going to be anally gang raped by
+Sun Microsystems. And you're going to have to learn to like it, soliders. With
+time, you'll enjoy the feeling of a cool hard E450 on your ass cheeks.
+
+Now pay attention you slimey cunt fucks.
+
+1.  You commie bastards think you're so fuckin' smart eh? Then tell me what
+    'logging' means on Solaris UFS. (4 marks)
+2.  WHAT DID YOU SAY! /usr and / on separate partitions on a Solaris system?
+    Either you tell me why this is a bad idea, or I'll teach your sister all
+    about 'partitioning'. (4 marks)
+3.  Ah not again. Some anal sucking mommas boy left the air conditioning off
+    again. Your Sun system is probably overheating like your Dad on a cheap Thai
+    hooker. What command can I use to find out the temperature of your system?
+    (2 marks)
+4.  Sun in their infinite wisdom left a nasty little kernel bug in a version of
+    Solaris running on Redbrick. What online resource do you use to patch
+    against this? Your mommy can't help you now fagboy. (1
+    marks)
+5.  Describe the steps involved in attaching my dick to your mother. Replace
+    'dick' with 'disk' and 'mother' with 'father'. Now replace' father' with
+    'Sun box'. (5 marks)
+6.  America, fuck yeah. Sun Microsystems, fuck yeah. Bed, Bath and Beyond, fuck
+    yeah. Metastat, what the fuck does it do? (1
+    marks)
+7.  Your commander in chief has just given you a new Solaris package named
+    'YERma'. Your orders are to get a list of everything in 'YERma'.
+    (2 marks)
+8.  What's the difference between /bin/sh on Solaris and on Linux? Unlike your
+    mother and your sister, they are actually different. (2
+    marks)
+9.  I don't know but I've been told, Eskimo pussy is mighty cold. Here are a
+    list of director-ies, tell me what they're for as it sure ain't sleaze.
+    - /devices
+    - /dev
+    - /kernel
+    - /opt
+    - /platform(5 marks)
+10. Stop interfacing with your hand and interface with the network. You need to
+    setup a network alias on a running network interface (say hme0) and ensure
+    it is persistent across reboots. How do you go about this, with emphasis on
+    the persistency. (4 marks)
+
+## 2\. FreeBSD (30 marks)
+
+1.  What does sysctl do? (3 marks)
+2.  What partition type does FreeBSD usually use? (3
+    marks)
+3.  What does FreeBSD normally use these partitions for?
+    - /dev/ad0s1a
+    - /dev/ad0s1b(2 marks)
+4.  What command would you use to display the routing table?
+    (3 marks)
+5.  Assume your DNS server is down. Looking up the hostnames for displaying the
+    routing table is taking all freakin' day. What option (to the answer for the
+    previous question) turns this off? (1 mark)
+6.  You've just installed a BSD system, but neglected to include the ports
+    collection when prompted. List two ways you could install it.
+    (4 marks)
+7.  You'd like to upgrade your system without using a crappy ol' CD. What do you
+    do? (3 marks)
+8.  In what situation would you use vinum? Name an alternative to using vinum.
+    (3 marks)
+9.  New kernel time! Assuming you have the kernel sources installed, how do you
+    go about this? (5 marks)
+10. /etc/defaults/rc.conf? What the heck is that? Why shouldn't you edit it?
+    (2 marks)
+11. Whats LINT? (hint: not related to fabric or paper ;) (1
+    marks)
+
+## 3\. Linux (30 marks)
+
+1.  What command would you use to change or print terminal line settings?  
+    How would you use this command to fix a terminal after catting a binary
+    file?  
+    How would you use this command to set backspace to ^?
+
+(3x1 marks)
+
+1.  You run ps on a user. How do you find the full path to the executable of any
+    of the user's processes? (3 marks)
+2.  What device is represented by /dev/kmem? /dev/lp1? (2
+    marks)
+3.  What are major and minor device numbers? (2 marks)
+4.  What command would you use to make a block or character device?
+    (2 marks)
+5.  You install a new network card but the driver is not installed by default.
+    Give the steps you would take to set up the new card (you have the driver
+    and the network card is installed). (4 marks)
+6.  Name two linux boot managers. For each one, show how you would make a change
+    to the configuration. (4 marks)
+7.  In what file might you set a proxy for apt to use? (2
+    marks)
+8.  If you don't want to set a proxy in that file, how else might you make apt
+    use a proxy? (2 marks)
+9.  What command and option would you use to do a non-destructive read/write
+    scan for bad blocks on a file system? (2 marks)
+10. You've just compiled a new kernel and you reboot. Everything seems to be
+    going ok until you get the dreaded KERNEL PANIC message. You notice messages
+    about ext3 filesystems not being mounted. What might be the cause of this?
+    (4 marks)
+
+## 4\. LDAP (20 marks)
+
+1.  Sometimes LDAP needs to be reindexed. The main part of the reindexing
+    process is stopping LDAP, exporting the LDAP database to an LDIF file,
+    readding all the entries from the file and restarting LDAP. Give the
+    commands to do this on RedBrick without using the slapindex command (you can
+    assume the database is cleared after you export the database).
+    (6 marks)
+2.  What does ldapmodrdn do? (2 marks)
+3.  When usernames start appearing as numbers, its usually a problem with nscd
+    rather than LDAP, but what is nscd and what is it used for?
+    (4 marks)
+4.  What commands are used to a) change and b) remove an LDAP entry.
+    (2 marks)
+5.  slurpd provides replication of an LDAP database. Name three benefits of
+    doing this. (3 marks)
+6.  What are LDAP attributes? List and explain 3 of them. (3
+    marks)
+
+## 5\. Files & Filesystems (30 marks)
+
+1.  
[ mickeyd@carbon:~ ]$ ls -ld /tmp
+    drwxrwxrwt   35 root     root         1080 Apr  8 11:52 /tmp
+             ^

+
+    What does the t mean?  
+    Why might this be set on a directory like /tmp?  
+    (5 marks)
+
+2.  What is the difference between a character and block device?
+    (2 marks)
+3.  Give an example of a character and a block device (you can use
+    FreeBSD/Linux/Solaris but both examples must be from the same OS). Provide
+    device names. (2 marks)
+4.  
Filesystem           1k-blocks      Used Available Use% Mounted on
+    /dev/sda2              4901956   3334036   1318916  72% /
+    none                    102400       284    102116   1% /tmp
+    /dev/sda3              4901956   2214024   2438928  48% /var
+    /dev/sda5              8649544   1204144   7006024  15% /local
+    /dev/sda6              4901924   2523936   2128984  55% /var/tmp
+    /dev/sda7            186299092  91005928  95293164  49% /home
+    192.168.0.3:/webtree 173810112  62530848 111279264  36% /webtree
+    192.168.0.4:/jibber/webtree
+                         192872352 152488544  24954016  86% /backup/webtree
+    192.168.0.4:/jabber/home
+                         192872352 129194080  48248480  73% /backup/home
+    

+
+    What command was used to display the above output? What can you say about
+    the last three filesystems? (3 marks)
+
+5.  What is the traditional difference between /bin and /sbin?
+    (2 marks)
+6.  Show how you would write a bootable floppy image 'boot.img' to a floppy disk
+    (assuming the image fits on the disk). (3 marks)
+7.  Explain what is meant by the following mount options:
+    1.  noauto
+    2.  nouser
+    3.  suid
+    4.  sync(4x1 marks)
+8.  Journaling filesystems - good or bad? Why? Name 2 journaling and 2
+    non-journaling file systems. (6 marks)
+9.  On an NFS mount, what does all_squash do? (3
+    marks)
+
+## 6\. Hardware (30 marks)
+
+1.  What does RAID stand for? What is it? (4 marks)
+2.  Give reasons for and against using RAID. (4 marks)
+3.  The most common RAID levels are 0, 1 and 5\. Explain how these work.
+    (4 marks)
+4.  Give some advantages of using software RAID over hardware RAID.
+    (4 marks)
+5.  You attach a new IDE drive to a system. Its not working properly. Name 3
+    things you check before shipping it back. (3
+    marks)
+6.  What is DVI? (2 marks)
+7.  What is ECC memory and why would a server use it? (2
+    marks)
+8.  The pentium 4 Xeon inside carbon has the following capabilites:
+
+    
fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid

+
+    Explain 6 of these flags. (6x0.5 marks)
+
+9.  What does UPS stand for and why is it A Good Thing [TM]?
+    (4 marks)
+
+## 7\. Networking (30 marks)
+
+1.  Whats a CIDR netmask? Give an example of the other type.
+    (2 marks)
+2.  tun0/tap0\. What the feck are they? (don't just say 'network interfaces' :)
+    (2 marks)
+3.  Explain briefly each of the following:
+    1.  MTU
+    2.  FQN
+    3.  ARP
+    4.  TBH
+    5.  SOA
+    6.  UDP
+    7.  MAC(12 marks)
+4.  Why is the loopback device important? (2 marks)
+5.  How would you add a default route for a linux machine? How would you verify
+    it worked? (2 marks)
+6.  
screen    4587     awol    3u  IPv4 0xc3dafcf0      0t0  TCP 192.168.0.4:65070->192.168.0.1:ldap (ESTABLISHED)

+
+    1.  What program generated the line above?
+    2.  Summarise this line in plain english.
+    3.  Why might 'screen' be doing that?
+    4.  Look at the fields with the IPs and ports. One of the ports has been
+        replaced with it's actual name, 'ldap'. How does it know? What controls
+        this?(8 marks)
+
+7.  RedBrick has been delegated two subnets by DCU. (15 & 16). Are they class A,
+    B, C or D? (1 mark)
+8.  ...and finally for Networking, a nice simple one: Hubs and Switches. Whats
+    the big difference? (1 mark)
+
+## 8\. Security (30 marks)
+
+1.  chroot! Whats it good for? What problems might you face when trying to use
+    it? (4 marks)
+2.  
-rwsr-x---    1 root     root        23112 Nov  2 19:56 /bin/spork

+
+    You find a mysterious binary in /bin/. You don't know what it is or how it
+    got there. Name three things you can do to safely try to see what it does.
+    (6 marks)
+
+3.  Look at the permissions string for /bin/spork above - what does that 's'
+    mean? How would you both add and remove that 's'? (4
+    marks)
+4.  The file above turns out to be a copy of 'bash'. Shit. What do you do next?
+    (detailed answer - six marks for this!) (6 marks)
+5.  Er, how is it that something like apache can run as the user 'www', yet be
+    listening on port 80? Aren't ports below 1024 priviledged?
+    (3 marks)
+6.  Apart from something one might do with your nose, whats snort?
+    (3 marks)
+7.  Whats a VPN? Give one situation in which one might want to use one.
+    (2 marks)
+8.  Whats SUEXEC good for? (2 marks)
+
+## 9\. General (30 marks)
+
+1.  Redbrick's lagged to hell. You check top and there's "sshd"s everywhere.
+    Lower down there's some "sftp-server"s listed. What...the...hell...?? How do
+    I find out what these sftp things are doing? (3
+    marks)
+2.  'hey' is telling you that some users don't exist. Something definately up,
+    but what might it be? (3 marks)
+3.  When editing important files as a Redbrick admin, RCS is often employed.
+    What is RCS? How do I use it? What do I do when that tool phaxx leaves the
+    file "in use"? (3 marks)
+4.  Whats wtmp for? (2 marks)
+5.  I'm tired of this. Please write the remainder of the test yourself.Just
+    kidding. Describe the steps in mounting something over NFS. Both client and
+    server steps are required. (6 marks)
+6.  What are all of the following for:
+    - renice
+    - wtmp
+    - dig(3x2 marks)
+7.  Currect version of:
+    - Carbon's kernel
+    - Deathray's kernel
+    - Enigma's FreeBSD(3x1 marks)
+8.  What's the optimal temperature for a server room's air conditioning system?
+    (2 marks)
+9.  tsocks seems to be unresponsive. Any attempts to use it just hang there and
+    eventually time out. The proxy seems to be the most likely culprit so
+    changing it seems like a good idea. It's set to proxy3\. How do I change it
+    and get tsocks working again? (2 marks)
+
+## 10\. skyhawk's mother (Bonus round, zero marks, be nice!)
+
+(0 marks)
+
+1.  Name?
+2.  Do you think she'd approve of you being an admin?
+3.  If so, why?
+
+4.  What member /var/tmped something that ground Redbrick to a halt lately? How
+    did he make people aware of what he had put there and how big a tit do you
+    think he is? (Please display ability to abuse members who make a general
+    balls of Redbrick)
diff --git a/content/help/exams/admin-test-2006-egm.md b/content/help/exams/admin-test-2006-egm.md
new file mode 100644
index 0000000..d745b56
--- /dev/null
+++ b/content/help/exams/admin-test-2006-egm.md
@@ -0,0 +1,268 @@
+---
+title: Admin test 2006 EGM
+---
+
+# DCU Networking Society System Administrator Test 2006
+
+All questions can be answered in the context of any version of UNIX (except for
+the FreeBSD and Linux sections obviously!). Indicating which version of UNIX you
+refer to in your answer is preferred but not required. Negative marking applies
+throughout for answers that are clearly incorrect or demonstrate incompetence.
+
+Humourous answers while appreciated gain no extra marks. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
+
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
+
+The test is marked out of an arbitrary number equal to the sum of the marks
+written beside each sections. Usually.
+
+Best of luck!
+
+> - atlas, svan, and a little bit of phaxx.
+
+## Scripting (40 marks)
+
+**Rules:**
+
+- You must be mesg n for duration of test. Any attempt to communicate with other
+  users will result in immediate failure.
+- You may only refer to system documentation (man & info pages) for help, i.e.
+  no web access!
+- You are free to use any shell or scripting language to write the scripts. Only
+  system commands may be used, your own or other user scripts may not be
+  referred to. Basically: no cheating!
+- Make a directory ~/admintest and place scripts in there. Name each script by
+  its question number. Humorous error messages make your scripts run faster.
+
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implementation.**
+
+Here we go..
+
+1.  OH NOEZ! Someone has started writing rubbish to any world writable files on
+    the system! We need to write a mail to all our users to warn them... But
+    wait! Some associates get tetchy when they get too many mails in one week.  
+    Write a script that scans through / ( but ignores /dev and /proc, we don't
+    want to go reading /dev/kmem now, do we (: ), and finds any world writable
+    files. Mail each user a list of all their writable files. Oh. And write them
+    to /var/tmp/naughty-users-with-writable-files in the formaat:
+
+    
username - path to file - permissions

+
+    (13.333333333334 marks)
+
+2.  Redbrick have started trying to be organised and stuff. We now use nagios to
+    monitor whether things are broken or not. Your mission, should you chose to
+    accept it ( you don't have a choice, no ) is to write a shell script that
+    downloads the contents of the two webmail login screens and compares them to
+    /tmp/roundcube.html and /tmp/squirrellmail.html  
+    ( The login pages are at:
+    https://webmail.redbrick.dcu.ie/squirrelmail/src/login.php and
+    https://webmail.redbrick.dcu.ie/roundcube/ )  
+    The script should exit with an exit status of 0 if the two are correct, 1 if
+    either of them is different, and 2 if it can't connect to
+    webmail.redbrick.dcu.ie (13.333333333334 marks)
+3.  You just downloaded a killer web-app for redbrick. But! It doesn't have the
+    hashbang or correct permissions on any of the php files. Write a script to
+    insert "#!/usr/local/bin/php" into each file with the suffix of .php in a
+    directory, and change its permission to 755\. (14 -
+    0.66666666666599994 marks)
+
+## FreeBSD (30 marks)
+
+1.  What is the latest FreeBSD release? (1 marks)
+2.  What are jails and why would we want to use them? (3 marks)
+3.  Give the command to list currently loaded pf rules? (3 marks)
+4.  Where are non-base start up scripts stored in? (3 marks)
+5.  Give a command to find mutt packages in ports (1 marks)
+6.  Now install mutt by:
+    - ports (1 marks)
+    - remote prebuilt package (2 marks)
+7.  - Give command to update ports (2 marks)
+    - Gice command to update base system (2 marks)
+8.  Give exact instructions on how you would build and install a kernel and
+    world (3 marks)
+9.  What would be the first document you would check if you're unsure about
+    anything? (2 marks)
+10. "/dev/ad1s1" is mounted on "/jibber" - explain what each part of the disk
+    device "ad1s1" means.(3 marks)
+11. Whats the difference between FreeBSD' network interface naming and Linux'?
+    (3 marks)
+12. "/dev/ad1s1" is mounted on "/jibber" - explain what each part of the disk (3
+    marks)
+
+## Linux (30 marks)
+
+1.  Some filthy greasemonkey has removed apt-get. How would you reinstall it? (4
+    marks.)
+2.  apt-get doesn't work inside DCU without going through the proxy. How do you
+    make it do this. There are two ways. (3 marks.)
+3.  OH NOEZ. DEATHRAY WON"T BOOT!!!!11eleven. It gets as far as LI and then
+    stops. What's wrong? How would you fix it without reinstalling? What admins
+    had to stay in the redbrick room for 3 hours trying to make this work? (3
+    marks.)
+4.  You just built a nice new kernel. It's going great... Until you try and boot
+    it. You get errors about the root filesystem not found. BUT IT'S SITTING
+    RIGHT THERE! What driver might you have forgotten? (3 marks.)
+5.  I'm sick of those associates who think emacs is better than vim. Remove
+    emacs. That'll shut them up. ( Don't get cheeky and use rm, or mv. ) (3
+    marks.)
+6.  You want to unmount /webtree but some flangewallet has left a process open
+    that's reading a file. How do you find out who, what file, and stop it?
+    Alternatively, how do you unmount it ignoring open files? (3 marks.)
+7.  What is this? Explain what it does, and how it does it:  
+    a(){a|a&;};a (3 marks.)
+8.  You have no CD drive. You have no floppy drive. You have no tape drive.
+    Please install linux and tell me how you would do it ( just name the process
+    )? (2 marks.)
+9.  You have 4 network cards. There are only 2 showing up when you run ifconfig.
+    How do you show the others? ( Note, they may be marked as ifdown ) (3
+    marks.).
+10. /dev/hda and /dev/sda. What are the differences? (3 marks.)
+
+## General (30 marks)
+
+1.  DCU' core router engine has failure, what do you do? what do **you** do? (2
+    marks)
+2.  What are:
+    - nscd (1 marks)
+    - monit (1 marks)
+    - nagios(1 marks)
+    - mailman(1 marks)
+3.  What is rcs and why would you want to use it on important config files (3
+    marks)?
+4.  What is 'expect' and what would you use it for? (2 marks)
+5.  What MTA does redbrick use? (2 marks)
+6.  A user complains that when they use tsocks they get an error message:
+
+    
"You don't exist, go away!"
+    

+
+    What is a possible cause for this? (3 marks)
+
+7.  You accidentally cat a binary file and it corrupts your terminal. Give a
+    command to fix it. (3 marks)
+8.  What is RPC? What is it used for? (3 marks)
+9.  A daemon/service is misbehaving, give 2 ways you could find out why (2
+    marks)
+10. What's the main advantage of using the Maildir format over the traditional
+    mail spool file? (3 marks)
+11. What's the optimal temperature for a server room's air conditioning system?
+    (3 marks)
+
+## Files & Filesystems (30 marks)
+
+1.  Whats rsync? And why is it nice for backups? (2 marks)
+2.  Give a command determine file type. (2 marks)
+3.  The filesystem is corrupted, and 'ls' cannot be read; you need to list the
+    contents of your pr0n dir fast, give a command you could use. (3 marks)
+4.  You just installed a new hard drive to carbon and created few ext3
+    partitions. df reports that the size of one of the partitions is 100GB and
+    there is 95GB available, explain where the 5GB are gone. (3 marks)
+5.  Logical volume management, what it is, and name what its called in FreeBSD
+    and Linux. (3 marks)
+6.  asl? I mean ACL, what is it? (3 marks)
+7.  Whats a snapshot? (3 marks)
+8.  Whats the difference between softlink and a hardlink? Give commands to
+    create them. (3 marks)
+9.  What is an inode? (3 marks)
+10. What is a command to edit quota? (3 marks)
+11. Give a command to create a file called "-[ hax0r ]-". (2 marks)
+
+## Hardware (30 marks)
+
+1.  How do the SAS hardrives differ from SCSI? (3 marks)
+2.  Give 2 advantages for using 2.5" hard drives instead of 3.5" in servers (2
+    marks)
+3.  What is RAID 0, RAID 1 and RAID 5 and briefly explain how they work. (7
+    marks)
+4.  What is ALOM and BMC(hint, ALOM is on Sun servers, BMC on Intel servers;
+    both do pretty much the same job) (3 marks)
+5.  What is KVM and why would you want to use it in server enviroments? (3
+    marks)
+6.  Some very nice people are donating a server to redbrick, they say it is '1U'
+    what does that mean? (3 marks)
+7.  What is UPS? And why do we use them? (3 marks)
+8.  Give 3 advantages of SATA over IDE. (3 marks)
+9.  Explain what 'serial console' means. (3 marks)
+
+## Networking ( 30 marks )
+
+Answer section A or B. Each are worth the same amount of marks.
+
+1.  Draw an ascii diagram of an IPv4 header packet and an IPv6 header packet.
+    Show all fields and explain what they are used for. Give 3 advantages and
+    disadvantages of using IPv6 over IPv4\. (30 marks. Yes, atlas is a bastard)
+2.  1.  Listen up Soldier! Some filthy maggot has put the wrong IP address on
+        your server. Change it. While you're at it, change the default route as
+        well. Pick whatever address and route you want. NOW DROP AND GIVE ME
+        20\. (3 marks)
+    2.  I don't know what I've been told, a switch is new, a hub is old. Give me
+        2 reasons why a switch is better than a hub. (2 mark)
+    3.  Ten-HUT. Preseeent ... a list of all TCP ports that a server is
+        listening on. Without using nmap. (1 mark)
+    4.  What do these stand for, and give a very brief explanation of what each
+        is for. ( 10 marks, 2 each )
+        1.  ARP
+        2.  MX
+        3.  WAF
+        4.  SOA
+        5.  MTU
+    5.  Class based addressing is for Commies. What is the alternative called?
+        (1 mark)
+    6.  How many IP addresses are in a /24, /16, and for a bonus mark, /25
+        subnets? Double time. Hut hut hut. (3 marks, 1 possible bonus)
+
+## LDAP (20 marks)
+
+1.  What _is_ LDAP? What does it do on Redbrick? How important is it? How easy
+    is it to break it? (3 marks)
+2.  How would you search LDAP for someone with the username 'flangewallet'? (3
+    marks)
+3.  
:~$ hey atlas
+    hey: warning - atlas does not exist
+    :~$ id atlas
+    id: atlas: No such user

+
+    OH NOEZ. LDAP is running. You can search it. What's wrong? (4 marks)
+
+4.  What is a Schema? (3 marks)
+5.  slapd is the LDAP daemon. What's slurpd? Explain what it does. (4 marks)
+6.  Give an alternative to LDAP? (3 marks)
+7.  What is an LDAP reindex? Give a brief description of the process. (5 marks)
+8.  What are LDAP attributes? (2 marks)
+9.  What do the following stand for? (3x1 marks)
+    - ou
+    - dn
+    - cn
+
+## Security (30 marks)
+
+1.  Why is this really _really_ bad:
+
+    
~ # echo $PATH
+    	.:/bin:/sbin:local/bin:/bin::/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin

+
+2.  Telnet, ftp, pop, imap, are all insecure for the same reason. What is it?
+3.  Explain what 'chroot' does. Why is it useful for securing daemons?
+4.  What is identd? What is it for?
+5.  "Linux is like totally secure". Discuss briefly.
+6.  The website has been defaced. What do you do? What _do_ you do?
+7.  You suspect a rootkit being on the system. How do you check if your gut is
+    right.
+8.  Why do we use SUEXEC in apache?
+9.  You find a root terminal unattended. You're feeling particularly leet today
+    How do you give yourself a backdoor?
+
+## Bonus! (0 marks)
+
+1.  Why are there no questions marked '6'?
+2.  How many marks is this section worth?
+3.  Given the answer above, why are you bothering?
+4.  What is an etherkiller?
+5.  Emacs or Vim? Answer very carefully. ( Answering with 'nano' or 'pico' will
+    result in an instant 0... Emacs, instant -500 )
+6.  Why has question number 6 suddenly made a comeback?
+7.  Complete the sentance: #lobby is full of \***\*\_\_\_\_\*\***
diff --git a/source/help/exams/admin-test-2007-agm/index.md b/content/help/exams/admin-test-2007-agm.md
similarity index 58%
rename from source/help/exams/admin-test-2007-agm/index.md
rename to content/help/exams/admin-test-2007-agm.md
index 5172946..cdb3372 100644
--- a/source/help/exams/admin-test-2007-agm/index.md
+++ b/content/help/exams/admin-test-2007-agm.md
@@ -1,23 +1,40 @@
 ---
-title: 'Admin test 2007 AGM'
+title: Admin test 2007 AGM
 ---
 
-All questions can be answered in the context of any version of UNIX (except for the FreeBSD and Linux sections obviously!). Indicating which version of UNIX you refer to in your answer is preferred but not required. Negative marking applies throughout for answers that are clearly incorrect or demonstrate incompetence.
+All questions can be answered in the context of any version of UNIX (except for
+the FreeBSD and Linux sections obviously!). Indicating which version of UNIX you
+refer to in your answer is preferred but not required. Negative marking applies
+throughout for answers that are clearly incorrect or demonstrate incompetence.
 
-Humourous answers while appreciated gain no extra marks*. **Keep answers short and concise** - don't waste time writing when one or two word answers will suffice.  
+Humourous answers while appreciated gain no extra marks\*. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
 
-* - Although, it will put us in a better mood while correcting.
+\* - Although, it will put us in a better mood while correcting.
 
-**ALL SECTIONS ARE *NOT* EQUALLY WEIGHTED**
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
 
-The test is marked out of an arbitrary number equal to two times the bisection of the set of available marks, as outlined by the numbers beside the questions and sections (they're not just there to look pretty).
+The test is marked out of an arbitrary number equal to two times the bisection
+of the set of available marks, as outlined by the numbers beside the questions
+and sections (they're not just there to look pretty).
 
 ### The Rules
 
-*   You ***must*** be mesg n for the duration of the test. Any attempt to communicate with other users will result in immediate disqualification. Big Brother is watching you.
-*   During the scripting section ***only***, you may refer to the system documentation (man & info pages) for help. You ***may not*** use any external documentation, i.e. no web access! Don't forget, Big Brother is still watching you.
-*   You are free to use whatever shell or scripting language you wish to write the scripts (except brainfuck and whitespace. Admins are people too!). Only system commands may be used: yours or other users' scripts ***may not*** be referred to. Basically: No cheating! Big Brother will be checking.
-*   Make a directory called ~/admintest, and place scripts and answers in there. Name each script by its question number. Don't forget: Humorous error messages make your scripts run faster. Big Brother likes humorous error messages.
+- You **_must_** be mesg n for the duration of the test. Any attempt to
+  communicate with other users will result in immediate disqualification. Big
+  Brother is watching you.
+- During the scripting section **_only_**, you may refer to the system
+  documentation (man & info pages) for help. You **_may not_** use any external
+  documentation, i.e. no web access! Don't forget, Big Brother is still watching
+  you.
+- You are free to use whatever shell or scripting language you wish to write the
+  scripts (except brainfuck and whitespace. Admins are people too!). Only system
+  commands may be used: yours or other users' scripts **_may not_** be referred
+  to. Basically: No cheating! Big Brother will be checking.
+- Make a directory called ~/admintest, and place scripts and answers in there.
+  Name each script by its question number. Don't forget: Humorous error messages
+  make your scripts run faster. Big Brother likes humorous error messages.
 
 Best of luck!
 
@@ -25,29 +42,41 @@ Best of luck!
 
 ## Scripting (40 marks)
 
-**Whilst we hope your scripts run correctly, the emphasis is on the procedure rather than a perfectly working implementation.** (That and humorous error messages...)
+**Whilst we hope your scripts run correctly, the emphasis is on the procedure
+rather than a perfectly working implementation.** (That and humorous error
+messages...)
 
 Here we go..
 
-1.  Help! Help! Big Brother turned his back for a minute, and someone's gone and written "OMG WAF TBH" at the end of every world-writable file on the system. Write a script that prints out a list of all world-writable files on the system and removes "OMG WAF TBH" from the file. For a bonus mark, mail the user with the name of the file, and call them a big OMG WAF for having world-writable files.
+1.  Help! Help! Big Brother turned his back for a minute, and someone's gone and
+    written "OMG WAF TBH" at the end of every world-writable file on the system.
+    Write a script that prints out a list of all world-writable files on the
+    system and removes "OMG WAF TBH" from the file. For a bonus mark, mail the
+    user with the name of the file, and call them a big OMG WAF for having
+    world-writable files.
 
 13.333333333334 marks
 
-1.  Write a script that takes a username as a parameter, and every 30 seconds checks to see how many processes they're running. If they're running more than 15 processes, kill them all
+1.  Write a script that takes a username as a parameter, and every 30 seconds
+    checks to see how many processes they're running. If they're running more
+    than 15 processes, kill them all
 
 13.333333333334 marks
 
-1.  What the fudge?! You don't seem to have pgrep, pkill, or killall, but you need to kill all instances of screen (don't ask!). How do you do it?
+1.  What the fudge?! You don't seem to have pgrep, pkill, or killall, but you
+    need to kill all instances of screen (don't ask!). How do you do it?
 
 14 - 0.66666666666599994 marks
 
 ## FreeBSD (30 marks)
 
-1.  An enterprise system (root disk) is failing, list the steps and commands to transfer files to a new disk.
+1.  An enterprise system (root disk) is failing, list the steps and commands to
+    transfer files to a new disk.
 
 6 marks
 
-1.  Where do applications installed via ports typically store their configuration files?
+1.  Where do applications installed via ports typically store their
+    configuration files?
 
 3 marks
 
@@ -63,7 +92,8 @@ Here we go..
 
 2 marks
 
-1.  How would I install jumpgate from the ports using a remote package and from source?
+1.  How would I install jumpgate from the ports using a remote package and from
+    source?
 
 5 marks
 
@@ -82,14 +112,16 @@ Here we go..
 ## Linux (30 marks)
 
 1.  What commands would you use for the following:
-    *   Find the amount of free disk space
-    *   Find the size of a specific file
-    *   Search for a specific package that you want to install
-    *   Install a package
+    - Find the amount of free disk space
+    - Find the size of a specific file
+    - Search for a specific package that you want to install
+    - Install a package
 
 4 x 1 marks
 
-1.  You've just installed a new kernel, but it's not booting. You see an error message fly by about the root partition not mountable. What are the possible causes?
+1.  You've just installed a new kernel, but it's not booting. You see an error
+    message fly by about the root partition not mountable. What are the possible
+    causes?
 
 4 marks
 
@@ -97,24 +129,27 @@ Here we go..
 
 2 marks
 
-1.  You want to unmount a disk, but when you try to do it, you get this:  
+1.  You want to unmount a disk, but when you try to do it, you get this:
 
     
	carbon:~# umount /webtree
     	umount: /webtree: device is busy
     	

 
-    How would you:  
+    How would you:
 
-    1.  Find the process (assume just one) that is accessing the drive, and kill it?
+    1.  Find the process (assume just one) that is accessing the drive, and kill
+        it?
     2.  Unmount the drive without having to kill any processes
 
 2 x 4 marks
 
-1.  How would you configure eth0 to have the addresses 10.0.0.1 and 10.0.0.2 simultaneously?
+1.  How would you configure eth0 to have the addresses 10.0.0.1 and 10.0.0.2
+    simultaneously?
 
 3 marks
 
-1.  How would you install Linux on a machine that doesn't have a CD/DVD/Floppy drive?
+1.  How would you install Linux on a machine that doesn't have a CD/DVD/Floppy
+    drive?
 
 2 marks
 
@@ -132,23 +167,27 @@ Here we go..
 
 ## General (30 marks)
 
-1.  What is RCS and why would you want to use it on important config files? 3 marks
-2.  What architecture is murphy? And how does that architecture help to leverage collaborative enterprise systems(read: what thing is it really good at)?
+1.  What is RCS and why would you want to use it on important config files?
+    3 marks
+2.  What architecture is murphy? And how does that architecture help to leverage
+    collaborative enterprise systems(read: what thing is it really good at)?
 3.  3 marks
 4.  What is chkrootkit?
 5.  3 marks
-6.  What is rsync and why would you want to use it for plethora of pr0n (read: backups)?
+6.  What is rsync and why would you want to use it for plethora of pr0n (read:
+    backups)?
 7.  3 marks
 8.  What is strace and why would you want to use it?
 9.  3 marks
-10.  What is a 'nice' value and how could you change it?
-11.  4 marks
-12.  You accidentally cat a binary file and it corrupts your terminal. Give a command to fix it.
-13.  4 marks
-14.  How would you edit a users quota?
-15.  3 marks
-16.  How would you suspend a process and then resume it later?
-17.  4 marks
+10. What is a 'nice' value and how could you change it?
+11. 4 marks
+12. You accidentally cat a binary file and it corrupts your terminal. Give a
+    command to fix it.
+13. 4 marks
+14. How would you edit a users quota?
+15. 3 marks
+16. How would you suspend a process and then resume it later?
+17. 4 marks
 
 ## Files & Filesystems (30 marks)
 
@@ -172,7 +211,8 @@ Here we go..
 
 6 x .5 marks
 
-1.  You try to unmount /webtree, but it says that the device is busy and can't be unmounted. How can you force it to unmount?
+1.  You try to unmount /webtree, but it says that the device is busy and can't
+    be unmounted. How can you force it to unmount?
 
 4 marks
 
@@ -198,41 +238,53 @@ Here we go..
 
 3 marks
 
-1.  A hard disk is giving you I/O errors, you need to check is it under the warranty, but for that you need to get the serial number. And of course you're to lazy to take out the disk out of the box. Give a command which can give you the serial number of the disk(along with other disk related things).
+1.  A hard disk is giving you I/O errors, you need to check is it under the
+    warranty, but for that you need to get the serial number. And of course
+    you're to lazy to take out the disk out of the box. Give a command which can
+    give you the serial number of the disk(along with other disk related
+    things).
 
 3 marks
 
-1.  Its not late 80s anymore, we don't have physical serial consoles anymore. Give a command which you would use to connect to a machine via a serial port.
+1.  Its not late 80s anymore, we don't have physical serial consoles anymore.
+    Give a command which you would use to connect to a machine via a serial
+    port.
 
 3 marks
 
-1.  You notice 'CS' marked beside a jumper on a new IDE drive you buy. What on Earth does that mean?
+1.  You notice 'CS' marked beside a jumper on a new IDE drive you buy. What on
+    Earth does that mean?
 
 3 marks
 
-1.  What is UPS? And why do we use them? Typically there is only 1 serial/usb port on the UPS. So how the hell other machines will know when to shut down?
+1.  What is UPS? And why do we use them? Typically there is only 1 serial/usb
+    port on the UPS. So how the hell other machines will know when to shut down?
 
 5 marks
 
-1.  Its 7am, write your own question.  
+1.  Its 7am, write your own question.
 
-    (What is RAID 0, RAID 1 and RAID 5 and briefly explain their stellar storage management capabilities(how they work)
+    (What is RAID 0, RAID 1 and RAID 5 and briefly explain their stellar storage
+    management capabilities(how they work)
 
 7 marks
 
-1.  I'm eating my breakfast righ now, What is the meaning of life?  
+1.  I'm eating my breakfast righ now, What is the meaning of life?
 
-    (What is software RAID? Why is it better to use hardware RAID to leverage enterprise applications?)
+    (What is software RAID? Why is it better to use hardware RAID to leverage
+    enterprise applications?)
 
 3 marks
 
 ## Networking ( 30 marks )
 
-1.  First off, an easy one. What's the difference between a switch and a hub? Just give a brief overview.
+1.  First off, an easy one. What's the difference between a switch and a hub?
+    Just give a brief overview.
 
 5 marks
 
-1.  How would you find out the default route on a linux machine? How would you set it?
+1.  How would you find out the default route on a linux machine? How would you
+    set it?
 
 2 x 3 marks
 
@@ -244,15 +296,20 @@ Here we go..
 
 3 marks
 
-1.  What would happen if you plug a hub into itself? (As in, take a cable, plug one end into one port on the hub, plug the other end into another port).
+1.  What would happen if you plug a hub into itself? (As in, take a cable, plug
+    one end into one port on the hub, plug the other end into another port).
 
 3 marks
 
-1.  Someone's running an FTP server on Redbrick, and distributing warez. You can see the process, but before you kill it, you want to see what he's got. What command would you use to find out what port it's running on (assuming you can't get it from ps)?
+1.  Someone's running an FTP server on Redbrick, and distributing warez. You can
+    see the process, but before you kill it, you want to see what he's got. What
+    command would you use to find out what port it's running on (assuming you
+    can't get it from ps)?
 
 3 marks
 
-1.  Classless addressing is dead and gone, but what's the CIDR equivalent of a class A, class B and a class C network?
+1.  Classless addressing is dead and gone, but what's the CIDR equivalent of a
+    class A, class B and a class C network?
 
 3 x 1 marks
 
@@ -266,7 +323,8 @@ Here we go..
 
 ## LDAP (20 marks)
 
-1.  What is LDAP? What is it used for? What does it stand for? Y'know, the basics.
+1.  What is LDAP? What is it used for? What does it stand for? Y'know, the
+    basics.
 
 3 marks
 
@@ -278,7 +336,8 @@ Here we go..
 
 3 marks
 
-1.  So. LDAP is running, but people are still having problems? Give a possible cause, and how you would diagnose it?
+1.  So. LDAP is running, but people are still having problems? Give a possible
+    cause, and how you would diagnose it?
 
 2 marks
 
@@ -290,7 +349,8 @@ Here we go..
 
 2 marks
 
-1.  What is an LDIF file? What command generates one? What command imports it back into the LDAP database?
+1.  What is an LDIF file? What command generates one? What command imports it
+    back into the LDAP database?
 
 3 marks
 
@@ -300,15 +360,19 @@ Here we go..
 
 ## Security (30 marks)
 
-1.  You've gone and left your root terminal unattended, and you reckon someone might have done something nasty. Since they've gone and deleted the history file, what do you do next? (Be detailed!)
+1.  You've gone and left your root terminal unattended, and you reckon someone
+    might have done something nasty. Since they've gone and deleted the history
+    file, what do you do next? (Be detailed!)
 
 7 marks
 
-1.  Let's turn the tables. You find a root terminal unattended. How would you give yourself a backdoor?
+1.  Let's turn the tables. You find a root terminal unattended. How would you
+    give yourself a backdoor?
 
 4 marks
 
-1.  Why do we use suexec on CGI scripts, and not apache modules, like mod_php, mod_perl or mod_python
+1.  Why do we use suexec on CGI scripts, and not apache modules, like mod_php,
+    mod_perl or mod_python
 
 3 marks
 
@@ -316,7 +380,8 @@ Here we go..
 
 3 marks
 
-1.  If apache runs as the user 'www', but only root can bind to ports below 1024, how is this happening?
+1.  If apache runs as the user 'www', but only root can bind to ports below
+    1024, how is this happening?
 
 3 marks
 
@@ -324,17 +389,21 @@ Here we go..
 
 3 marks
 
-1.  Someone asks you in the labs to change their password because they have important project stuff to do and oh my god they need it lol. They tell you what they want the password to be. What do you do?
+1.  Someone asks you in the labs to change their password because they have
+    important project stuff to do and oh my god they need it lol. They tell you
+    what they want the password to be. What do you do?
 
 3 marks
 
-1.  How are ssh keys used? What are they? How would you go about setting them up so you don't need to put in a password? Why is this good/bad?
+1.  How are ssh keys used? What are they? How would you go about setting them up
+    so you don't need to put in a password? Why is this good/bad?
 
 4 marks
 
-## Bonus! (1060 marks)*
+## Bonus! (1060 marks)\*
 
-* Note - Marks may not be available
+\* Note - Marks may not be
+available
 
 1.  Vim, emacs or nano?
 
@@ -344,16 +413,18 @@ Here we go..
 
 3 marks
 
-1.  Rate the following operating systems by order of most fantastical:  
+1.  Rate the following operating systems by order of most fantastical:
     - Debian
 
 3 marks
 
-1.  01010111011010000110000101110100001000000110100101110011001000000011000100100000 00101011001000000011000100111111?
+1.  01010111011010000110000101110100001000000110100101110011001000000011000100100000
+    00101011001000000011000100111111?
 
 30 marks
 
-1.  Will you actively continue to upkeep the exhibition of posters depicting attractive women in the Redbrick server room?
+1.  Will you actively continue to upkeep the exhibition of posters depicting
+    attractive women in the Redbrick server room?
 
 10 marks
 
@@ -361,14 +432,18 @@ Here we go..
 
 4 marks
 
-1.  Complete the sentance: "Bebo is for ____________"
+1.  Complete the sentance: "Bebo is for \***\*\_\_\_\_\*\***"
 
 4 marks
 
-1.  carbon's just crashed. deathray's following closely behind, because peoples' home directories have disappeared. A user is heying you every 30 seconds looking for an update as to what is happening. What would you do to him if you had the chance?
+1.  carbon's just crashed. deathray's following closely behind, because peoples'
+    home directories have disappeared. A user is heying you every 30 seconds
+    looking for an update as to what is happening. What would you do to him if
+    you had the chance?
 
 4 marks
 
-1.  Who is the most sarcastic member of Redbrick? (Answer carefully, he's in the room watching you.)
+1.  Who is the most sarcastic member of Redbrick? (Answer carefully, he's in the
+    room watching you.)
 
 2 marks
diff --git a/source/help/exams/admin-test-2008-agm-answers/index.md b/content/help/exams/admin-test-2008-agm-answers.md
similarity index 52%
rename from source/help/exams/admin-test-2008-agm-answers/index.md
rename to content/help/exams/admin-test-2008-agm-answers.md
index da314d7..2f8c0f1 100644
--- a/source/help/exams/admin-test-2008-agm-answers/index.md
+++ b/content/help/exams/admin-test-2008-agm-answers.md
@@ -1,29 +1,41 @@
 ---
-title: 'Admin test 2008 AGM Answers'
+title: Admin test 2008 AGM Answers
 ---
 
 Admin test for 2008 AGM
 
 # Admin test 2008 AGM
 
-220 marks total. All rounds are weighted equally, at 30 marks, except for scripting which is worth 40 marks.
+220 marks total. All rounds are weighted equally, at 30 marks, except for
+scripting which is worth 40 marks.
 
-The first half hour is for scripting. During this time, man and info pages (along with perldoc, etc - anything that's **preinstalled on redbrick**, no external docs allowed!) may be accessed. After this time, you may not access anything other then your text editor. We're watching you. Cian has a gun.
+The first half hour is for scripting. During this time, man and info pages
+(along with perldoc, etc - anything that's **preinstalled on redbrick**, no
+external docs allowed!) may be accessed. After this time, you may not access
+anything other then your text editor. We're watching you. Cian has a gun.
 
-Answers are marked in Red. Some answers are just links and/or just mad, this means you should read it for yourself. For many questions there could be other valid answers not listed.
+Answers are marked in Red. Some answers are just links and/or just mad, this
+means you should read it for yourself. For many questions there could be other
+valid answers not listed.
 
-* * *
+---
 
 ### Scripting
 
 ###### 40 marks
 
-1.  It's the year 2017, and we've finally run out of disk space on Minerva. Write a script to look for PHP files (ending in .php) and check whether or not a hash line (#!/usr/local/bin/php) exists. If it does, remove the line (to free disk space
-2.  Another one related to internets. Write a script that scans for PHP files that are world readable, and contain the string "$mysql_password = "(anything)";. For every file found, automagically insult the owner via email, and mail the string found to zyox@redbrick.dcu.ie.
+1.  It's the year 2017, and we've finally run out of disk space on Minerva.
+    Write a script to look for PHP files (ending in .php) and check whether or
+    not a hash line (#!/usr/local/bin/php) exists. If it does, remove the line
+    (to free disk space
+2.  Another one related to internets. Write a script that scans for PHP files
+    that are world readable, and contain the string "\$mysql_password =
+    "(anything)";. For every file found, automagically insult the owner via
+    email, and mail the string found to zyox@redbrick.dcu.ie.
 3.  
#!/bin/bash
-
+    
     files=`find /webtree -name "*.php" -perm -a+r `
-
+    
     for file in $files; do
         pwcount=`grep -c "$mysql_password = " $file`
         if [ "$pwcount" -gt 0 ]; then
@@ -34,22 +46,26 @@ Answers are marked in Red. Some answers are just links and/or just mad, this mea
     done
     

 
-4.  Write a script that generates the md5 sum of every file under /etc, and saves it, along with the filename, to /root/md5sums. Then have it compare /root/md5sums to /root/md5sums.old, and email any changes to rb-admins@lists.redbrick.dcu.ie. Extra marks if you can make this suitable for cron (i.e rotates md5sum and md5sum.old automatically).
+4.  Write a script that generates the md5 sum of every file under /etc, and
+    saves it, along with the filename, to /root/md5sums. Then have it compare
+    /root/md5sums to /root/md5sums.old, and email any changes to
+    rb-admins@lists.redbrick.dcu.ie. Extra marks if you can make this suitable
+    for cron (i.e rotates md5sum and md5sum.old automatically).
 5.  
#!/bin/bash
-
+    
     #move the old one if it exists
     if [ -f ~/md5sums ]; then
         mv ~/md5sums ~/md5sums.old
     fi
-
+    
     #make a list of all files in /etc/
     files=`find /etc/ -type f`
-
+    
     #generate md5sums for all the files.
     for file in $files; do
         md5sum $file >> ~/md5sums
     done
-
+    
     #magic
     cat ~/md5sums ~/md5sums.old ~/md5sums.old | sort | uniq -u|mutt -s "changed files" admins
     

@@ -58,9 +74,12 @@ Answers are marked in Red. Some answers are just links and/or just mad, this mea
 
 ###### 30 marks
 
-1.  What is RCS? Why do we use it? What do you do to people who leave files locked?
+1.  What is RCS? Why do we use it? What do you do to people who leave files
+    locked?
 
-Revision Control System. To revert n00bed config files. The same thing you do when someone presses CTRL+ALT+DEL on carbon when it's running your only LDAP server.
+Revision Control System. To revert n00bed config files. The same thing you do
+when someone presses CTRL+ALT+DEL on carbon when it's running your only LDAP
+server.
 
 1.  What's a crontab? How does one edit yours?
 
@@ -76,27 +95,32 @@ edquota -u
 
 1.  What are
 
-    *   Nagios?
+    - Nagios?
 
-    Monitoring system for machines/services that sends annoying alerts so you have to fix stuff at 3am
+    Monitoring system for machines/services that sends annoying alerts so you
+    have to fix stuff at 3am
 
-    *   Munin?
+    - Munin?
 
     Makes pretty graphs
 
-    *   NSCD?
+    - NSCD?
 
-    Name Service Caching Daemon. Caches results from LDAP locally to reduce the ldap load.
+    Name Service Caching Daemon. Caches results from LDAP locally to reduce the
+    ldap load.
 
-    *   exim?
+    - exim?
 
     Mail Transfer Agent
 
-2.  Someone keeps complaining that tsocks tells them "You don't exist, go away". Why is this?
+2.  Someone keeps complaining that tsocks tells them "You don't exist, go away".
+    Why is this?
 
-LDAP could be broken. Once upon a time, it could be that that screen wasn't logged, in, but this seems to be fixed now
+LDAP could be broken. Once upon a time, it could be that that screen wasn't
+logged, in, but this seems to be fixed now
 
-1.  What temperature should the server room be kept at? (Fucking freezing, while true, isn't what we're looking for)
+1.  What temperature should the server room be kept at? (Fucking freezing, while
+    true, isn't what we're looking for)
 
 16C
 
@@ -116,99 +140,119 @@ apt-get clean
 
 chkconfig --level 3 postgresql off
 
-1.  You've just royally screwed your shell by catting a binary. How do you fix this?
+1.  You've just royally screwed your shell by catting a binary. How do you fix
+    this?
 
 reset
 
 1.  Where does apt expect to find details on it's proxy?
 
-*   $http_proxy
-*   apt.conf
+- \$http_proxy
+- apt.conf
 
 3.  What's the difference between /dev/hda, /dev/sda and /dev/md?
 
-*   hda - first IDE disk on older kernels
-*   sda - first IDE, SATA or SCSI disk
-*   md - software raid device
+- hda - first IDE disk on older kernels
+- sda - first IDE, SATA or SCSI disk
+- md - software raid device
 
 5.  What's Swap for?
 
 Stopping asplosions when you run out of ram
 
-1.  You're trying to unmount /storage, but it keeps complaining about being busy. How do you find out what/who is using it, and kill the process/user? Also, how do you unmount without killing the user/process?
+1.  You're trying to unmount /storage, but it keeps complaining about being
+    busy. How do you find out what/who is using it, and kill the process/user?
+    Also, how do you unmount without killing the user/process?
 
-*   lsof
-*   fuser/kill
-*   umount -fl
+- lsof
+- fuser/kill
+- umount -fl
 
 3.  What's /dev/kmem? What's /dev/mem? Explain the difference?
 
-/dev/kmem is the memory, as currently mapped by the kernel. /dev/mem is the memory as it actually is. These days, /dev/kmem isn't used by much, and has mostly been replaced by /proc
+/dev/kmem is the memory, as currently mapped by the kernel. /dev/mem is the
+memory as it actually is. These days, /dev/kmem isn't used by much, and has
+mostly been replaced by /proc
 
 1.  What's the difference between a character and a block device?
 
-a character device expects a stream of 0 or more bytes of input/output. A block device expects a series of fixed size chunks of input/output. It's actually far more complicated than this, and you should read a good book on operating systems. But we'd accept this answer
+a character device expects a stream of 0 or more bytes of input/output. A block
+device expects a series of fixed size chunks of input/output. It's actually far
+more complicated than this, and you should read a good book on operating
+systems. But we'd accept this answer
 
 ### Generic Unix round
 
 ###### 30 marks
 
-1.  In a default Solaris install, /home cannot be written to. Why is this? How would you fix it?
+1.  In a default Solaris install, /home cannot be written to. Why is this? How
+    would you fix it?
 
-*   Solaris expects /home to be a network mount, and for a local /home to be kept in /export/home
-*   Make /home an nfs mount, or a symlink to somewhere else, or turn off the automount service
+- Solaris expects /home to be a network mount, and for a local /home to be kept
+  in /export/home
+- Make /home an nfs mount, or a symlink to somewhere else, or turn off the
+  automount service
 
 3.  Where are the GNU tools held in a default solaris install?
 
 /opt/sfw/bin/
 
-1.  How do I make sshd reread it's config file?(the solaris specific way please :-))
+1.  How do I make sshd reread it's config file?(the solaris specific way please
+    :-))
 
 svcadm -v reload svc:/network/ssh:default
 
 1.  What does killall do on solaris? How is differnt from linux?
 
-*   Solaris: killall is used by shutdown to kill EVERYTHING
-*   Linux: kill all processes that match a name argument
+- Solaris: killall is used by shutdown to kill EVERYTHING
+- Linux: kill all processes that match a name argument
 
 3.  /dev/dsk/c0t1d0s2\. Explain each bit of this. What is it?
 
-*   /dev/dsk - it's a disk device
-*   c0 - on controller 0
-*   t1 - in tray 1
-*   /dev/kmem is the memory, as currently mapped by the kernel. /dev/mem is the memory as it actually is. These days, /dev/kmem isn't used by much, and has mostly been replaced by /proc
+- /dev/dsk - it's a disk device
+- c0 - on controller 0
+- t1 - in tray 1
+- /dev/kmem is the memory, as currently mapped by the kernel. /dev/mem is the
+  memory as it actually is. These days, /dev/kmem isn't used by much, and has
+  mostly been replaced by /proc
 
-*   d0 - it's disk 0
-*   s2 - slice 2
+- d0 - it's disk 0
+- s2 - slice 2
 
 5.  What's a port? Why would you use one?
 
-Ports is a system for compiling software not packaged on BSD systems. You would use ports when there is no package available
+Ports is a system for compiling software not packaged on BSD systems. You would
+use ports when there is no package available
 
-1.  What command would you use to see the list of packages installed on your system?
+1.  What command would you use to see the list of packages installed on your
+    system?
 
 pkg_info -A (OpenBSD)
 
 1.  What's vinium? What's sysctl? (a brief explanation is all that's needed)
 
-*   Vinum is a block device driver which implements virtual disk drives capable of RAID. Vinium is a typo.
-*   [http://en.wikipedia.org/wiki/Sysctl](http://en.wikipedia.org/wiki/Sysctl)
+- Vinum is a block device driver which implements virtual disk drives capable of
+  RAID. Vinium is a typo.
+- [http://en.wikipedia.org/wiki/Sysctl](http://en.wikipedia.org/wiki/Sysctl)
 
 3.  What's a Jail? Why Would I use one?
 
-Jails are an OS level virtualisation system for limiting access to services/users
+Jails are an OS level virtualisation system for limiting access to
+services/users
 
 1.  What do the following boot flags do in freeBSD -s, -a, -c?
 
-*   -s: Single User Mode
-*   -a: Causes the kernel to ask for the root device to use
-*   -c: Causes the kernel to go into boot_config(8) before performing autoconf(4) procedures.
+- -s: Single User Mode
+- -a: Causes the kernel to ask for the root device to use
+- -c: Causes the kernel to go into boot_config(8) before performing autoconf(4)
+  procedures.
 
 ### LDAP (harhar)
 
 ###### 30 marks
 
-1.  What does ldap stand for? "Evil bastard authentication system from hell" is not the right answer.
+1.  What does ldap stand for? "Evil bastard authentication system from hell" is
+    not the right answer.
 
 Lightweight Directory Access Protocol
 
@@ -222,12 +266,13 @@ It's an LDAP server
 
 1.  What's an ldif file?
 
-LDAP Data Interchange Format. It's a plain text format for holding data for an ldap server.
+LDAP Data Interchange Format. It's a plain text format for holding data for an
+ldap server.
 
 1.  Name two ways of producing an ldif file.
 
-*   slapcat
-*   ldapsearch
+- slapcat
+- ldapsearch
 
 3.  Which of these would you use while the server was still running?
 
@@ -241,9 +286,12 @@ Forwarding changes to slave servers
 
 Exactly what it says on the tin
 
-1.  OpenLDAP uses BerkeleyDB, but BerkeleyDB sucks giant donkey balls. Name one step you can take when it gets confused, crashes and leaves the database in an unusable inconsistent state.
+1.  OpenLDAP uses BerkeleyDB, but BerkeleyDB sucks giant donkey balls. Name one
+    step you can take when it gets confused, crashes and leaves the database in
+    an unusable inconsistent state.
 
-bdb_recover on the data file (switching it on and off again will do this. It won't get you marks though
+bdb_recover on the data file (switching it on and off again will do this. It
+won't get you marks though
 
 1.  What is a schema?
 
@@ -255,33 +303,37 @@ A definition of the objects/attributes in an LDAP system
 
 1.  Briefly explain what the following terms stand for/mean
 
-    *   SOA
+    - SOA
 
     Start Of Authority
 
-    *   A
+    - A
 
     A Record: Points to an ipv4 address
 
-    *   AAAA
+    - AAAA
 
     AAAA Record: Points to an ipv6 address
 
-    *   CNAME
+    - CNAME
 
     CNAME: An alias to another record
 
-    *   MX
+    - MX
 
     MX: Mail exchange record. Points to a mail server
 
-    *   TTL
+    - TTL
 
-    Time To Live, the number of seconds remaining on a cached record before it is purged. For authoritative records the TTL is fixed at a specific length. If a record is cached, the server providing the record will provide the time remaining on the TTL rather then the original length it was given.
+    Time To Live, the number of seconds remaining on a cached record before it
+    is purged. For authoritative records the TTL is fixed at a specific length.
+    If a record is cached, the server providing the record will provide the time
+    remaining on the TTL rather then the original length it was given.
 
 2.  Why is changing the serial number of a zone file important?
 
-Because the serial number is used by slave servers to determine if changes have been made. If the serial is not changed then changes will not be replicated
+Because the serial number is used by slave servers to determine if changes have
+been made. If the serial is not changed then changes will not be replicated
 
 1.  How do you display the routing table on an operating system of your choice?
 
@@ -289,17 +341,19 @@ route show (OpenBSD)
 
 1.  What's a default route?
 
-A routing table entry which is used to direct packets addressed to networks not explicitly listed in the routing table.
+A routing table entry which is used to direct packets addressed to networks not
+explicitly listed in the routing table.
 
 1.  Give us three commands to query DNS?
 
-*   dig
-*   host
-*   nslookup
+- dig
+- host
+- nslookup
 
 3.  What's inetd? Why is running some things from it silly?
 
-Inetd launches a specified program when the server is contacted on a specified port.
+Inetd launches a specified program when the server is contacted on a specified
+port.
 
 1.  What is Nmap? give two uses of it?
 
@@ -307,7 +361,10 @@ Nmap uses raw packets to determine information about the network
 
 1.  What's the difference between a switch and a hub?
 
-A switch is layer two, so doesn't know about ip address or the like. It also forwards broadcasts everywhere. A hub forwards everything everywhere, and doesn't know about any addressing. A router knows about layer three addressing, and only forwards stuff to the correct network
+A switch is layer two, so doesn't know about ip address or the like. It also
+forwards broadcasts everywhere. A hub forwards everything everywhere, and
+doesn't know about any addressing. A router knows about layer three addressing,
+and only forwards stuff to the correct network
 
 1.  What's an arp cache? How would you clear it on the OS of your choice?
 
@@ -327,29 +384,34 @@ So user code exceutes as the user, rather than as www-user
 
 1.  Why does the following piece of code fail at life?
 
-    
   #include 
-
+    
   #include
+    
        int main(int argc,char * argv[]) {
           char name[80];
-
+    
           printf("Enter your name lol: ");
-
+    
           gets(name);
-
+    
           printf("Your name lol is %s\n",name);
-
+    
           return 0;
        }

 
 BUFFER OVERFLOW LOL
 
-1.  You notice somebody keeps trying to log into severus and failing (through /var/log/auth.log) - they seem to be trying to guess the password. It's likely they'll fail, because the password is so horribly..horrible, but how would you block connections from their IP just in case? Extra marks if you can give the entire command.
+1.  You notice somebody keeps trying to log into severus and failing (through
+    /var/log/auth.log) - they seem to be trying to guess the password. It's
+    likely they'll fail, because the password is so horribly..horrible, but how
+    would you block connections from their IP just in case? Extra marks if you
+    can give the entire command.
 
 iptables. (Note: we now do this automatically with fail2ban)
 
 1.  What is chroot good for?
 
-Running a processes within an isolated set of directories. Used for BIND among other things
+Running a processes within an isolated set of directories. Used for BIND among
+other things
 
 1.  What is chkrootkit good for?
 
@@ -357,17 +419,21 @@ Checking for rootkits (Bet you didn't see that coming)
 
 1.  What is fakeroot good for?
 
-Certain things (eg. making debian packages) want you to be root. fakeroot lets you do this wihtout being root
+Certain things (eg. making debian packages) want you to be root. fakeroot lets
+you do this wihtout being root
 
-1.  Redbrick is firewalled to hell by DCU, but there is a way to get full access to our network from outside without an account. How?
+1.  Redbrick is firewalled to hell by DCU, but there is a way to get full access
+    to our network from outside without an account. How?
 
 IPv6
 
-1.  Apache runs on port 80, but it runs as www-data. Omghow? (bet you didn't see this one coming)
+1.  Apache runs on port 80, but it runs as www-data. Omghow? (bet you didn't see
+    this one coming)
 
 It gets started as root
 
-1.  You see something about GPG flying up the screen while apt is updating stuff. What could apt possibly use GPG for?
+1.  You see something about GPG flying up the screen while apt is updating
+    stuff. What could apt possibly use GPG for?
 
 Checking package integrity
 
@@ -377,60 +443,78 @@ Checking package integrity
 
 1.  What does the +i attribute do in linux?
 
-A file with the 'i' attribute cannot be modified: it cannot be deleted or renamed, no link can be created to this file and no data can be written to the file. Only the superuser or a process possessing the CAP_LINUX_IMMUTABLE capability can set or clear this attribute.
+A file with the 'i' attribute cannot be modified: it cannot be deleted or
+renamed, no link can be created to this file and no data can be written to the
+file. Only the superuser or a process possessing the CAP_LINUX_IMMUTABLE
+capability can set or clear this attribute.
 
-1.  What's a journal? Why would a file system want to keep a journal? Feckin emo file systems.
+1.  What's a journal? Why would a file system want to keep a journal? Feckin emo
+    file systems.
 
-[Go Read](http://en.wikipedia.org/wiki/Journaling_file_system)You're feeling leet, and format your storage disk as ZFS. To use this in Linux you need to use a thing called FUSE. What the hell is FUSE? Name an advantage and a disadvantage of it.
+[Go Read](http://en.wikipedia.org/wiki/Journaling_file_system)You're feeling
+leet, and format your storage disk as ZFS. To use this in Linux you need to use
+a thing called FUSE. What the hell is FUSE? Name an advantage and a disadvantage
+of it.
 
 FUSE: Filesystem in Userspace
 
-*   Name 3 file systems. ZFS doesn't count, I just told you about it.
-*   ext3
-*   fat32
-*   ReiserFS
-*   etc.
+- Name 3 file systems. ZFS doesn't count, I just told you about it.
+- ext3
+- fat32
+- ReiserFS
+- etc.
 
-*   Explain what an inode is.
+- Explain what an inode is.
 
 [READ ME](http://en.wikipedia.org/wiki/Inode)
 
-*   A crazy woman just handed me a lollipop and chocolate. Eoghan (yes you, the guy taking it) looks amused. I vowed to make this test easier in return for said lollipop and chocolate. Unfortunately I lied. What do rsize and wsize do in NFS mount options?
+- A crazy woman just handed me a lollipop and chocolate. Eoghan (yes you, the
+  guy taking it) looks amused. I vowed to make this test easier in return for
+  said lollipop and chocolate. Unfortunately I lied. What do rsize and wsize do
+  in NFS mount options?
+
+The maximum number of bytes in each network Read/Write request that the NFS
+client can receive when reading data from a file on an NFS server.
 
-The maximum number of bytes in each network Read/Write request that the NFS client can receive when reading data from a file on an NFS server.
+- The following line appears somewhere on murphy:
 
-*   The following line appears somewhere on murphy:  
+  
192.168.0.3:/fast-storage /fast-storage nfs     rw,nosuid,nodev,soft,intr,rsize=32768,wsize=32768       0       2

 
-    
192.168.0.3:/fast-storage /fast-storage nfs     rw,nosuid,nodev,soft,intr,rsize=32768,wsize=32768       0       2

+  - What file is this from?
 
-    *   What file is this from?
+  /etc/fstab
 
-    /etc/fstab
+  - Explain 3 components of it (mention what they do)
 
-    *   Explain 3 components of it (mention what they do)
-*   192.168.0.3:/fast-storage - source location
-*   /fast-storage - mount point
-*   nfs - fs type
-*   rw - read/write
-*   nosuid - any suid attributes on files on the source fs are ignored
-*   nodev - any dev attributes on files on the source fs are ignored
-*   soft - "If the soft option is specified, then the NFS client fails an NFS request after retrans retransmissions have been sent, causing the NFS client to return an error to the calling application.
-*   intr - allow system calls to interrupt file operations on this fs
+- 192.168.0.3:/fast-storage - source location
+- /fast-storage - mount point
+- nfs - fs type
+- rw - read/write
+- nosuid - any suid attributes on files on the source fs are ignored
+- nodev - any dev attributes on files on the source fs are ignored
+- soft - "If the soft option is specified, then the NFS client fails an NFS
+  request after retrans retransmissions have been sent, causing the NFS client
+  to return an error to the calling application.
+- intr - allow system calls to interrupt file operations on this fs
 
-*   werdz@murphy:~$ chmod g+s moo  
-    What does this command do?
+- werdz@murphy:~\$ chmod g+s moo  
+  What does this command do?
 
 sgid moo
 
-*   -rwxrwxrwt  
-    You see this in an ls -l listing. What does the "t" mean? Does it make a difference under linux?
+- -rwxrwxrwt  
+  You see this in an ls -l listing. What does the "t" mean? Does it make a
+  difference under linux?
 
-It's a [Sticky Bit](http://en.wikipedia.org/wiki/Sticky_bit). Sticky bits have no effect on files...
+It's a [Sticky Bit](http://en.wikipedia.org/wiki/Sticky_bit). Sticky bits have
+no effect on files...
 
-*   There's three hours to go until the exam and it's not written yet. Time for the oh shit I can't think of any more filesystems questions question. Give three reasons why FAT32 is bollox.
-*   The maximum file size is 4Gb, and I have HD porn movies bigger than this
-*   No permissions support
-*   Patent encumbered
+- There's three hours to go until the exam and it's not written yet. Time for
+  the oh shit I can't think of any more filesystems questions question. Give
+  three reasons why FAT32 is bollox.
+- The maximum file size is 4Gb, and I have HD porn movies bigger than this
+- No permissions support
+- Patent encumbered
 
 ### Hardware
 
@@ -438,55 +522,67 @@ It's a [Sticky Bit](http://en.wikipedia.org/wiki/Sticky_bit). Sticky bits have n
 
 1.  What architecture is murphy? What's Deathray?
 
-*   Murphy: Sparc (Niagra Sun_4v)
-*   Deathray: x86 (Intel i686)
+- Murphy: Sparc (Niagra Sun_4v)
+- Deathray: x86 (Intel i686)
 
 3.  Explain what is meant by the following?
 
-    *   RAID 0
+    - RAID 0
 
     Disk striping, no redundancy
 
-    *   RAID 1
+    - RAID 1
 
     Disk mirroring
 
-    *   JBOD
+    - JBOD
 
     Just a bunch of disks. No striping, no redundancy
 
-    *   RAID 5
+    - RAID 5
 
-    Striped disks with parity, an array of 3 or more disks that can survive a single disk failure.
+    Striped disks with parity, an array of 3 or more disks that can survive a
+    single disk failure.
 
 4.  What's the difference between SATA and SAS?
 
-*   SATA: Serial ATA
-*   SAS: Serial attached scsi
+- SATA: Serial ATA
+- SAS: Serial attached scsi
 
 6.  What's a KVM? What's the benefit of an IP-KVM? Why are these handy?
 
-KVM allows multiple machines to be connected to a single keyboard, video & mouse. An IP-KVM is accessable over the internet, so handy for fixing broken stuff from bed at 3am
+KVM allows multiple machines to be connected to a single keyboard, video &
+mouse. An IP-KVM is accessable over the internet, so handy for fixing broken
+stuff from bed at 3am
 
 1.  Why is Hardware RAID? What is Software RAID? Which is better? Why?
 
-*   Hardware RAID: Has a dedicated hardware RAID controller the disks are connected to.
-*   Software RAID: Disks are connected to a normal controller, and RAID fuctionality is implemented in software
-*   Hardware tends to be faster. Software lacks a RAID controller to die on you though
+- Hardware RAID: Has a dedicated hardware RAID controller the disks are
+  connected to.
+- Software RAID: Disks are connected to a normal controller, and RAID
+  fuctionality is implemented in software
+- Hardware tends to be faster. Software lacks a RAID controller to die on you
+  though
 
-3.  Why Do we want a UPS? Our UPS only has one serial port, how do we make it shut down all the machines?
+3.  Why Do we want a UPS? Our UPS only has one serial port, how do we make it
+    shut down all the machines?
 
-The UPS gives you time to shut down cleanly in the event of a power cut". The serial port isn't connected to anything, so you'll have to shut them down manually. Were it connected, you'd run a daemon called apcd to do it though.
+The UPS gives you time to shut down cleanly in the event of a power cut". The
+serial port isn't connected to anything, so you'll have to shut them down
+manually. Were it connected, you'd run a daemon called apcd to do it though.
 
 1.  Explain what a server being 1U means?
 
 It refers to the height of it. (it's about 1.75 inches)
 
-1.  What is TFTP? What do we use it for (specifically, regarding our Cisco switch).
+1.  What is TFTP? What do we use it for (specifically, regarding our Cisco
+    switch).
 
-Trivial File Transfer Protocol. It's used for copying stuff to/from the Cisco switch.
+Trivial File Transfer Protocol. It's used for copying stuff to/from the Cisco
+switch.
 
-1.  You have no serial console, and a horrily irritating sun box with no VGA or PS/2 ports. What program would you use to connect from another server?
+1.  You have no serial console, and a horrily irritating sun box with no VGA or
+    PS/2 ports. What program would you use to connect from another server?
 
 minicom
 
@@ -496,12 +592,14 @@ minicom
 
 1.  Is your hair long?
 2.  Why not?
-3.  Why is solaris shit? What does using it make you want to do to Sun?(less than 10,000 words please)
+3.  Why is solaris shit? What does using it make you want to do to Sun?(less
+    than 10,000 words please)
 4.  What do you think of lil_cain's hair cut?
-5.  It's 6 in the morning, the morning after you disabled unpaid a/cs. Someone just rang you to complain that their a/c was disabled. What do you do?
+5.  It's 6 in the morning, the morning after you disabled unpaid a/cs. Someone
+    just rang you to complain that their a/c was disabled. What do you do?
 6.  Why?
 7.  Why are computers better than people?
 8.  What is the Java Trap?
 9.  Compare and contrast the CDDL and the GPL v.3.
-10.  life.redbrick.dcu.ie. What should we do with this domain, and why?
-11.  Why is Fedora crap?
+10. life.redbrick.dcu.ie. What should we do with this domain, and why?
+11. Why is Fedora crap?
diff --git a/source/help/exams/admin-test-2008-agm/index.md b/content/help/exams/admin-test-2008-agm.md
similarity index 59%
rename from source/help/exams/admin-test-2008-agm/index.md
rename to content/help/exams/admin-test-2008-agm.md
index 7217440..3435e3c 100644
--- a/source/help/exams/admin-test-2008-agm/index.md
+++ b/content/help/exams/admin-test-2008-agm.md
@@ -1,36 +1,53 @@
 ---
-title: 'Admin test 2008 AGM'
+title: Admin test 2008 AGM
 ---
 
-220 marks total. All rounds are weighted equally, at 30 marks, except for scripting which is worth 40 marks.
+220 marks total. All rounds are weighted equally, at 30 marks, except for
+scripting which is worth 40 marks.
 
-The first half hour is for scripting. During this time, man and info pages (along with perldoc, etc - anything that's **preinstalled on redbrick**, no external docs allowed!) may be accessed. After this time, you may not access anything other then your text editor. We're watching you. Cian has a gun.
+The first half hour is for scripting. During this time, man and info pages
+(along with perldoc, etc - anything that's **preinstalled on redbrick**, no
+external docs allowed!) may be accessed. After this time, you may not access
+anything other then your text editor. We're watching you. Cian has a gun.
 
-* * *
+---
 
 ### Scripting
 
 ###### 40 marks
 
-1.  It's the year 2017, and we've finally run out of disk space on Minerva. Write a script to look for PHP files (ending in .php) and check whether or not a hash line (#!/usr/local/bin/php) exists. If it does, remove the line (to free disk space
-2.  Another one related to internets. Write a script that scans for PHP files that are world readable, and contain the string "$mysql_password = "(anything)";. For every file found, automagically insult the owner via email, and mail the string found to zyox@redbrick.dcu.ie.
-3.  Write a script that generates the md5 sum of every file under /etc, and saves it, along with the filename, to /root/md5sums. Then have it compare /root/md5sums to /root/md5sums.old, and email any changes to rb-admins@lists.redbrick.dcu.ie. Extra marks if you can make this suitable for cron (i.e rotates md5sum and md5sum.old automatically).
+1.  It's the year 2017, and we've finally run out of disk space on Minerva.
+    Write a script to look for PHP files (ending in .php) and check whether or
+    not a hash line (#!/usr/local/bin/php) exists. If it does, remove the line
+    (to free disk space
+2.  Another one related to internets. Write a script that scans for PHP files
+    that are world readable, and contain the string "\$mysql_password =
+    "(anything)";. For every file found, automagically insult the owner via
+    email, and mail the string found to zyox@redbrick.dcu.ie.
+3.  Write a script that generates the md5 sum of every file under /etc, and
+    saves it, along with the filename, to /root/md5sums. Then have it compare
+    /root/md5sums to /root/md5sums.old, and email any changes to
+    rb-admins@lists.redbrick.dcu.ie. Extra marks if you can make this suitable
+    for cron (i.e rotates md5sum and md5sum.old automatically).
 
 ### General
 
 ###### 30 marks
 
-1.  What is RCS? Why do we use it? What do you do to people who leave files locked?
+1.  What is RCS? Why do we use it? What do you do to people who leave files
+    locked?
 2.  What's a crontab? How does one edit yours?
 3.  What's a nice value? How would you change it?
 4.  How do you edit someone's quota?
 5.  What are
-    *   Nagios?
-    *   Munin?
-    *   NSCD?
-    *   exim?
-6.  Someone keeps complaining that tsocks tells them "You don't exist, go away". Why is this?
-7.  What temperature should the server room be kept at? (Fucking freezing, while true, isn't what we're looking for)
+    - Nagios?
+    - Munin?
+    - NSCD?
+    - exim?
+6.  Someone keeps complaining that tsocks tells them "You don't exist, go away".
+    Why is this?
+7.  What temperature should the server room be kept at? (Fucking freezing, while
+    true, isn't what we're looking for)
 8.  What's Xen? What could Redbrick use it for?
 
 ### The Stallman round (Linux)
@@ -39,11 +56,14 @@ The first half hour is for scripting. During this time, man and info pages (alon
 
 1.  What's the apt command to remove already downloaded package files?
 2.  How do you stop postgresql from starting on entering run level 3?
-3.  You've just royally screwed your shell by catting a binary. How do you fix this?
+3.  You've just royally screwed your shell by catting a binary. How do you fix
+    this?
 4.  Where does apt expect to find details on it's proxy?
 5.  What's the difference between /dev/hda, /dev/sda and /dev/md?
 6.  What's Swap for?
-7.  You're trying to unmount /storage, but it keeps complaining about being busy. How do you find out what/who is using it, and kill the process/user? Also, how do you unmount without killing the user/process?
+7.  You're trying to unmount /storage, but it keeps complaining about being
+    busy. How do you find out what/who is using it, and kill the process/user?
+    Also, how do you unmount without killing the user/process?
 8.  What's /dev/kmem? What's /dev/mem? Explain the difference?
 9.  What's the difference between a character and a block device?
 
@@ -51,22 +71,26 @@ The first half hour is for scripting. During this time, man and info pages (alon
 
 ###### 30 marks
 
-1.  In a default Solaris install, /home cannot be written to. Why is this? How would you fix it?
+1.  In a default Solaris install, /home cannot be written to. Why is this? How
+    would you fix it?
 2.  Where are the GNU tools held in a default solaris install?
-3.  How do I make sshd reread it's config file?(the solaris specific way please :-))
+3.  How do I make sshd reread it's config file?(the solaris specific way please
+    :-))
 4.  What does killall do on solaris? How is differnt from linux?
 5.  /dev/dsk/c0t1d0s2\. Explain each bit of this. What is it?
 6.  What's a port? Why would you use one?
-7.  What command would you use to see the list of packages installed on your system?
+7.  What command would you use to see the list of packages installed on your
+    system?
 8.  What's vinium? What's sysctl? (a brief explanation is all that's needed)
 9.  What's a Jail? Why Would I use one?
-10.  What do the following boot flags do in freeBSD -s, -a, -c?
+10. What do the following boot flags do in freeBSD -s, -a, -c?
 
 ### LDAP (harhar)
 
 ###### 30 marks
 
-1.  What does ldap stand for? "Evil bastard authentication system from hell" is not the right answer.
+1.  What does ldap stand for? "Evil bastard authentication system from hell" is
+    not the right answer.
 2.  What version of ldap does Redbrick use?
 3.  What does slapd do?
 4.  What's an ldif file?
@@ -74,20 +98,22 @@ The first half hour is for scripting. During this time, man and info pages (alon
 6.  Which of these would you use while the server was still running?
 7.  What would slurpd be used for?
 8.  What does it mean to "reindex" OpenLDAP's database?
-9.  OpenLDAP uses BerkeleyDB, but BerkeleyDB sucks giant donkey balls. Name one step you can take when it gets confused, crashes and leaves the database in an unusable inconsistent state.
-10.  What is a schema?
+9.  OpenLDAP uses BerkeleyDB, but BerkeleyDB sucks giant donkey balls. Name one
+    step you can take when it gets confused, crashes and leaves the database in
+    an unusable inconsistent state.
+10. What is a schema?
 
 ### Networking
 
 ###### 30 marks
 
 1.  Briefly explain what the following terms stand for/mean
-    *   SOA
-    *   A
-    *   AAAA
-    *   CNAME
-    *   MX
-    *   TTL
+    - SOA
+    - A
+    - AAAA
+    - CNAME
+    - MX
+    - TTL
 2.  Why is changing the serial number of a zone file important?
 3.  How do you display the routing table on an operating system of your choice?
 4.  What's a default route?
@@ -105,49 +131,66 @@ The first half hour is for scripting. During this time, man and info pages (alon
 2.  Why do we bother with suexec and suPHP on our apache installations?
 3.  Why does the following piece of code fail at life?
 
-    
   #include 
-
+    
   #include
+    
        int main(int argc,char * argv[]) {
           char name[80];
-
+    
           printf("Enter your name lol: ");
-
+    
           gets(name);
-
+    
           printf("Your name lol is %s\n",name);
-
+    
           return 0;
        }

 
-4.  You notice somebody keeps trying to log into severus and failing (through /var/log/auth.log) - they seem to be trying to guess the password. It's likely they'll fail, because the password is so horribly..horrible, but how would you block connections from their IP just in case? Extra marks if you can give the entire command.
+4.  You notice somebody keeps trying to log into severus and failing (through
+    /var/log/auth.log) - they seem to be trying to guess the password. It's
+    likely they'll fail, because the password is so horribly..horrible, but how
+    would you block connections from their IP just in case? Extra marks if you
+    can give the entire command.
 5.  What is chroot good for?
 6.  What is chkrootkit good for?
 7.  What is fakeroot good for?
-8.  Redbrick is firewalled to hell by DCU, but there is a way to get full access to our network from outside without an account. How?
-9.  Apache runs on port 80, but it runs as www-data. Omghow? (bet you didn't see this one coming)
-10.  You see something about GPG flying up the screen while apt is updating stuff. What could apt possibly use GPG for?
+8.  Redbrick is firewalled to hell by DCU, but there is a way to get full access
+    to our network from outside without an account. How?
+9.  Apache runs on port 80, but it runs as www-data. Omghow? (bet you didn't see
+    this one coming)
+10. You see something about GPG flying up the screen while apt is updating
+    stuff. What could apt possibly use GPG for?
 
 ### Files and Filesystems
 
 ###### 30 marks
 
 1.  What does the +i attribute do in linux?
-2.  What's a journal? Why would a file system want to keep a journal? Feckin emo file systems.
-3.  You're feeling leet, and format your storage disk as ZFS. To use this in Linux you need to use a thing called FUSE. What the hell is FUSE? Name an advantage and a disadvantage of it.
+2.  What's a journal? Why would a file system want to keep a journal? Feckin emo
+    file systems.
+3.  You're feeling leet, and format your storage disk as ZFS. To use this in
+    Linux you need to use a thing called FUSE. What the hell is FUSE? Name an
+    advantage and a disadvantage of it.
 4.  Name 3 file systems. ZFS doesn't count, I just told you about it.
 5.  Explain what an inode is.
-6.  A crazy woman just handed me a lollipop and chocolate. Eoghan (yes you, the guy taking it) looks amused. I vowed to make this test easier in return for said lollipop and chocolate. Unfortunately I lied. What do rsize and wsize do in NFS mount options?
-7.  The following line appears somewhere on murphy:  
+6.  A crazy woman just handed me a lollipop and chocolate. Eoghan (yes you, the
+    guy taking it) looks amused. I vowed to make this test easier in return for
+    said lollipop and chocolate. Unfortunately I lied. What do rsize and wsize
+    do in NFS mount options?
+7.  The following line appears somewhere on murphy:
 
     
192.168.0.3:/fast-storage /fast-storage nfs     rw,nosuid,nodev,soft,intr,rsize=32768,wsize=32768       0       2

 
-    *   What file is this from?
-    *   Explain 3 components of it (mention what they do)
-8.  werdz@murphy:~$ chmod g+s moo  
+    - What file is this from?
+    - Explain 3 components of it (mention what they do)
+
+8.  werdz@murphy:~\$ chmod g+s moo  
     What does this command do?
 9.  -rwxrwxrwt  
-    You see this in an ls -l listing. What does the "t" mean? Does it make a difference under linux?
-10.  There's three hours to go until the exam and it's not written yet. Time for the oh shit I can't think of any more filesystems questions question. Give three reasons why FAT32 is bollox.
+    You see this in an ls -l listing. What does the "t" mean? Does it make a
+    difference under linux?
+10. There's three hours to go until the exam and it's not written yet. Time for
+    the oh shit I can't think of any more filesystems questions question. Give
+    three reasons why FAT32 is bollox.
 
 ### Hardware
 
@@ -155,17 +198,20 @@ The first half hour is for scripting. During this time, man and info pages (alon
 
 1.  What architecture is murphy? What's Deathray?
 2.  Explain what is meant by the following?
-    *   RAID 0
-    *   RAID 1
-    *   JBOD
-    *   RAID 5
+    - RAID 0
+    - RAID 1
+    - JBOD
+    - RAID 5
 3.  What's the difference between SATA and SAS?
 4.  What's a KVM? What's the benefit of an IP-KVM? Why are these handy?
 5.  Why is Hardware RAID? What is Software RAID? Which is better? Why?
-6.  Why Do we want a UPS? Our UPS only has one serial port, how do we make it shut down all the machines?
+6.  Why Do we want a UPS? Our UPS only has one serial port, how do we make it
+    shut down all the machines?
 7.  Explain what a server being 1U means?
-8.  What is TFTP? What do we use it for (specifically, regarding our Cisco switch).
-9.  You have no serial console, and a horrily irritating sun box with no VGA or PS/2 ports. What program would you use to connect from another server?
+8.  What is TFTP? What do we use it for (specifically, regarding our Cisco
+    switch).
+9.  You have no serial console, and a horrily irritating sun box with no VGA or
+    PS/2 ports. What program would you use to connect from another server?
 
 ### Bonus round (only 5% more horrible than the LDAP round)
 
@@ -173,12 +219,14 @@ The first half hour is for scripting. During this time, man and info pages (alon
 
 1.  Is your hair long?
 2.  Why not?
-3.  Why is solaris shit? What does using it make you want to do to Sun?(less than 10,000 words please)
+3.  Why is solaris shit? What does using it make you want to do to Sun?(less
+    than 10,000 words please)
 4.  What do you think of lil_cain's hair cut?
-5.  It's 6 in the morning, the morning after you disabled unpaid a/cs. Someone just rang you to complain that their a/c was disabled. What do you do?
+5.  It's 6 in the morning, the morning after you disabled unpaid a/cs. Someone
+    just rang you to complain that their a/c was disabled. What do you do?
 6.  Why?
 7.  Why are computers better than people?
 8.  What is the Java Trap?
 9.  Compare and contrast the CDDL and the GPL v.3.
-10.  life.redbrick.dcu.ie. What should we do with this domain, and why?
-11.  Why is Fedora crap?
+10. life.redbrick.dcu.ie. What should we do with this domain, and why?
+11. Why is Fedora crap?
diff --git a/source/help/exams/admin-test-2008-egm/index.md b/content/help/exams/admin-test-2008-egm.md
similarity index 89%
rename from source/help/exams/admin-test-2008-egm/index.md
rename to content/help/exams/admin-test-2008-egm.md
index ad10f98..ff1fe1b 100644
--- a/source/help/exams/admin-test-2008-egm/index.md
+++ b/content/help/exams/admin-test-2008-egm.md
@@ -1,45 +1,45 @@
 ---
-title: 'Admin test 2008 EGM'
+title: Admin test 2008 EGM
 ---
 
-
ll questions can be answered in the context of any version of UNIX 
-(except for the FreeBSD and Linux sections obviously!). Indicating which 
-version of UNIX you refer to in your answer is preferred but not required. 
-Negative marking applies throughout for answers that are clearly incorrect 
+
ll questions can be answered in the context of any version of UNIX
+(except for the FreeBSD and Linux sections obviously!). Indicating which
+version of UNIX you refer to in your answer is preferred but not required.
+Negative marking applies throughout for answers that are clearly incorrect
 or demonstrate incompetence.
 
 Humourous answers while appreciated gain no extra marks*. Keep answers short
-and concise - don't waste time writing when one or two word answers will 
+and concise - don't waste time writing when one or two word answers will
 suffice.
 
 * - Although, it will put us in a better mood while correcting.
 
 ALL SECTIONS ARE *NOT* EQUALLY WEIGHTED
 
-The test is marked out of an arbitrary number equal to two times the 
-bisection of the set of available marks, as outlined by the numbers beside 
+The test is marked out of an arbitrary number equal to two times the
+bisection of the set of available marks, as outlined by the numbers beside
 the questions and sections (they're not just there to look pretty).
 
 The Rules
 
-    * You *must* be mesg n for the duration of the test. Any attempt to 
-    communicate with other users will result in immediate disqualification. 
+    * You *must* be mesg n for the duration of the test. Any attempt to
+    communicate with other users will result in immediate disqualification.
     Big Brother is watching you.
 
-    * During the scripting section *only*, you may refer to the system 
-    documentation (man & info pages) for help. You *may not* use any external 
-    documentation, i.e. no web access! Don't forget, Big Brother is still 
+    * During the scripting section *only*, you may refer to the system
+    documentation (man & info pages) for help. You *may not* use any external
+    documentation, i.e. no web access! Don't forget, Big Brother is still
     watching you.
 
-    * You are free to use whatever shell or scripting language you wish to 
-    write the scripts (except brainfuck and whitespace. Admins are people 
-    too!). Only system commands may be used: yours or other users' scripts 
-    *may not* be referred to. Basically: No cheating! Big Brother will be 
+    * You are free to use whatever shell or scripting language you wish to
+    write the scripts (except brainfuck and whitespace. Admins are people
+    too!). Only system commands may be used: yours or other users' scripts
+    *may not* be referred to. Basically: No cheating! Big Brother will be
     checking.
 
-    * Make a directory called ~/admintest, and place scripts and answers in 
-    there. Name each script by its question number. Don't forget: Humorous 
-    error messages make your scripts run faster. Big Brother likes humorous 
+    * Make a directory called ~/admintest, and place scripts and answers in
+    there. Name each script by its question number. Don't forget: Humorous
+    error messages make your scripts run faster. Big Brother likes humorous
     error messages.
 
 All questions that don't have marks next to them are marked equally.
@@ -47,7 +47,7 @@ All questions that don't have marks next to them are marked equally.
 =======[ Scripting (40 marks) ]=======
 
 1\. Write a script or command, in the scripting language or shell of your
- choice, to search every file in every members home directory (ignore 
+ choice, to search every file in every members home directory (ignore
  associates, cos they're too nice) for the string "i hate ". If the string is found, wipe the user's home directory
  and make their terminal print "GTFO" and exit when they attempt to log in.
  (13 marks)
@@ -56,16 +56,16 @@ All questions that don't have marks next to them are marked equally.
  to another certain unnamed 3.26TB array. Write a script to give each user a
  1GB quota on that new array (call it /dev/sda1, mounted as /storage). If the
  user's old quota (on 192.168.0.3:/home) was greater than 1GB, then just let
- them keep their old quota. (Ignore /webtree - for the purpose of this question, 
+ them keep their old quota. (Ignore /webtree - for the purpose of this question,
  it doesn't exist. I know, I know, I'm far too nice). (13 marks)
 
-3\. You've just installed Ubuntu Server, and found that it's default groups are 
- all screwey. When you mount /storage, you notice that member's home directories 
- are in the group "syslog". Oh noes! You rectify this by swapping the syslog 
- and member GIDs in /etc/group, but you want to make sure that none of the files 
- in the default installation belonged to syslog ('cos they'd now belong to "member"). 
- Write a script that scans the filesystem (excluding /storage), lists any files 
- now in the group "member", changes the group to syslog, and then prints a report 
+3\. You've just installed Ubuntu Server, and found that it's default groups are
+ all screwey. When you mount /storage, you notice that member's home directories
+ are in the group "syslog". Oh noes! You rectify this by swapping the syslog
+ and member GIDs in /etc/group, but you want to make sure that none of the files
+ in the default installation belonged to syslog ('cos they'd now belong to "member").
+ Write a script that scans the filesystem (excluding /storage), lists any files
+ now in the group "member", changes the group to syslog, and then prints a report
  of how many files it had to modify at the end. (14 marks)
 
 =======[ Linux (30 marks) ]=======
@@ -73,30 +73,30 @@ All questions that don't have marks next to them are marked equally.
 1 - What's the command to show the routing table in linux?
 2 - What's the command to remove all files associated with a program using apt?
 3 - What is /etc/nsswitch.conf used for? When would you need to edit this file?
-4 - Where are changelogs stored when you upgrade a program with apt? What program 
+4 - Where are changelogs stored when you upgrade a program with apt? What program
 would you use to show these before you upgrade?
 5 - (a) What does /etc/mtab do?
 	(b) What does the following line mean? Where is it from? Explain the options to it?
 	 192.168.0.3:/fast-storage /fast-storage nfs nosuid,nodev,soft,intr,rsize=32768,wsize=32768,rw       0   0
-6 - What linux system utility would you use the see the system calls a program is 
+6 - What linux system utility would you use the see the system calls a program is
 making?
-7 - How would you install linux on your PC, given that you just dropped your CD drive, 
+7 - How would you install linux on your PC, given that you just dropped your CD drive,
 and it's making funny noises and eating your cds?
 8 - What does /dev/hda1 mean? What's different between it and /dev/sdb2?
 9 - What program runs Redbrick's boards?
-10 - You're looking to unmount /home, but some idiot has left a file open. How do you 
+10 - You're looking to unmount /home, but some idiot has left a file open. How do you
 find the process? How would you go about unmounting the file anyway?
 
 =======[ Networking (30 marks) ]=======
-1 - Name the three private IP ranges. What are they used for, and how do they differ 
+1 - Name the three private IP ranges. What are they used for, and how do they differ
 from normal IP ranges?
-2 - What is the netmask for 192.168.1.14/27? How many valid IP addresses would there 
+2 - What is the netmask for 192.168.1.14/27? How many valid IP addresses would there
 in the network? How many of these can you use for hosts?
-3 - Explain the difference between a switch, a hub, and a router? Give an example of 
+3 - Explain the difference between a switch, a hub, and a router? Give an example of
 where you'd use each? Why is a switch better than a hub?
 4 -  What's STP? What's RSTP? Why is RSTP better than STP?
 4 - what's a VLAN? What would you use one for?
-5 - What's an arp cache? How would you display this on linux, and for a bonus point, 
+5 - What's an arp cache? How would you display this on linux, and for a bonus point,
 on IOS?
 6 - Explain Jitter?
 7 - What's the serial number of a zone file used for?
@@ -107,13 +107,13 @@ on IOS?
 
 =======[ General Unix/FreeBSD/Solaris/etc (30 marks) ]=======
 1 - What's a Jail? What would you use one for?
-2 - What is PF? What command would you use to activate it? How would you load a rule 
+2 - What is PF? What command would you use to activate it? How would you load a rule
 set from a file?
-3 - How would you go about building a new kernel for source (for any non-Linux Unixy 
+3 - How would you go about building a new kernel for source (for any non-Linux Unixy
 type OS), assuming you already had said source?
-4 - You want to install Weechat from ports. Give the command to search ports for it, 
+4 - You want to install Weechat from ports. Give the command to search ports for it,
 and having found it, how would you go about installing it?
-5 - What are solaris containers? What command is used to show resource allocation within 
+5 - What are solaris containers? What command is used to show resource allocation within
 these?
 6 - What command is used to change kernel options on a freeBSD system?
 7 - By default, where can you login as root to a Solaris machine?
@@ -124,12 +124,12 @@ these?
     How would you retrieve these?
     Give an advantage of enabling the "noatime" mount option?
 2\. What is an inode?
-   	Given an arbitrary inode number for a filesystem, how do you find the name of the 
+   	Given an arbitrary inode number for a filesystem, how do you find the name of the
 		corresponding file(s)?
-    How do you find the number of total and free inodes on a filesystem? 
+    How do you find the number of total and free inodes on a filesystem?
 3\. What are these filesystems used for, on your average unix box?
     /proc
-    /dev 
+    /dev
 4\. 5 different file systems plz? And a little bit of what's good about them?
 5\. What does no_squash_root mean on an NFS system?
 6\. Logical volume management, what it is, and name what its called in FreeBSD and Linux?
@@ -138,40 +138,40 @@ these?
 1\. Give the architectures of murphy, minerva. (2 marks)
 2\. Describe the advantages and disadvantages of hardware RAID. (4 marks)
 3\. Describe the difference between RAID 1 and RAID 5\. (3 marks)
-4\. Why is it generally a bad idea to use RAID 0 in a server/production environment? 
+4\. Why is it generally a bad idea to use RAID 0 in a server/production environment?
 (1 mark)
 5\. Describe RAID 1+0\. (5 marks)
-6\. What's the difference between SATA and PATA? Why is one better then the other? 
+6\. What's the difference between SATA and PATA? Why is one better then the other?
 (3 marks)
 7\. Why is an IP KVM a really, really good thing to have? (1 mark)
 8\. Describe the differences between PCI-X and PCI-Ex. (6 marks)
 9\. Why does Redbrick use ALOMs and DRACs? (2 marks)
-10\. You type /proc/cpuinfo on minerva, and under the flags section you see "vmx". What 
-does this mean? How does this help us deliver a higher quality vector and push the 
+10\. You type /proc/cpuinfo on minerva, and under the flags section you see "vmx". What
+does this mean? How does this help us deliver a higher quality vector and push the
 envelope of our enterprise appliances? (3 marks)
 
 =======[ LDAP (30 marks) ]=======
 1\. What is LDAP? (3 marks)
 2\. What are slapd and slurpd? (4 marks)
 3\. What is nscd? Why is it a Good Thing(tm)? (4 marks)
-4\. LDAP is being incredibly slow and CPU usage on our LDAP machine is going through the 
+4\. LDAP is being incredibly slow and CPU usage on our LDAP machine is going through the
 roof. Suggest a course of action. Assume that we've already tried the prodding-it-with-
 a-stick approach. (4 marks)
-5\. How would you search an LDAP directory for a given user? (Assume simple 
+5\. How would you search an LDAP directory for a given user? (Assume simple
 authentication) (4 marks)
 6\. How would you add a user to a group using LDAP? (4 marks)
 7\. What is a schema? (3 marks)
-8\. What is an LDIF file? List the possible ways that you can think of to generate one. 
+8\. What is an LDIF file? List the possible ways that you can think of to generate one.
 (4 marks)
 
 =======[ General (30 marks) ]=======
-1\. You've just recompiled weechat, because you want more shiny plugin support than you 
-can get from the repository version. It was compiled on carbon, but for some reason 
+1\. You've just recompiled weechat, because you want more shiny plugin support than you
+can get from the repository version. It was compiled on carbon, but for some reason
 minerva refuses to run it.Why? (2 marks)
-2\. We're currently in the process of moving Apache to murphy. Explain why it makes far 
+2\. We're currently in the process of moving Apache to murphy. Explain why it makes far
 more sense to run it here, rather then on deathray. (3 marks)
-3\. Why is it generally seen as a good idea to purchase hardware from companies like 
-Encom/Sun/Dell if possible, as opposed to building stuff ourself? (Aside from the extra 
+3\. Why is it generally seen as a good idea to purchase hardware from companies like
+Encom/Sun/Dell if possible, as opposed to building stuff ourself? (Aside from the extra
 effort of building it). (2 marks)
 4\. What is a nice value? How would you change a nice value? (3 marks)
 5\. How would you edit a user's quota? Give all the ways you can think of. (3 marks)
@@ -179,21 +179,21 @@ effort of building it). (2 marks)
 7\. What is chkrootkit? (1 marks)
 8\. What is a crontab? How would you edit such a thing? (2 marks)
 9\. What is RCS? Why do we use it? (2 marks)
-10\. A program is generating segmentation faults, and you don't know why. You download 
+10\. A program is generating segmentation faults, and you don't know why. You download
 the source and compile it with debug symbols enabled.
  	a. What is a backtrace, and why is it useful? (2 marks)
  	b. How would you use GDB to execute the program, and then output a backtrace? (4 marks)
-11\. What's the difference between virtualisation and paravirtualisation? Give an example 
+11\. What's the difference between virtualisation and paravirtualisation? Give an example
 of each. (2 marks)
-12\. Why is the air conditioner the single most important piece of hardware in the 
+12\. Why is the air conditioner the single most important piece of hardware in the
 redbrick room? (1 mark)
 
 =======[ Security (30 marks) ]=======
 1\. Why are protocols like POP, IMAP, Telnet and FTP a bad idea in most cases? (3 marks)
-2\. What is a GPG key? Why is it a Good Thing(tm) that the apt package manager uses 
+2\. What is a GPG key? Why is it a Good Thing(tm) that the apt package manager uses
 them? (3 marks)
 3\. Why should the author of the following code be flogged -
-		#include 
+		#include
 
 		int main(int argc,char * argv[]) {
 			char input[20];
@@ -206,32 +206,32 @@ them? (3 marks)
 			return 0;
 		}
    (3 marks)
-4\. Describe why we use suexec instead of mod_php, mod_perl, etc, like everybody else. 
+4\. Describe why we use suexec instead of mod_php, mod_perl, etc, like everybody else.
 (3 marks)
-5\. Apache runs on port 80, which is a privileged port. You run top and find apache 
+5\. Apache runs on port 80, which is a privileged port. You run top and find apache
 running as www-data. How did this program ever manage to bind to port 80? (3 marks)
-6\. Programs like suexec and passwd use a special mechanism to temporarily gain superuser 
+6\. Programs like suexec and passwd use a special mechanism to temporarily gain superuser
 privileges. What is this mechanism? How would you set it? (3 marks)
-7\. What can Iptables be used for? How would you list the rules currently in effect? 
+7\. What can Iptables be used for? How would you list the rules currently in effect?
 (3 marks)
 8\. What is chroot used for? (3 marks)
 9\. What is fakeroot used for? (3 marks)
-10\. How can you get a list of all processes (and their respective owners) listening on 
+10\. How can you get a list of all processes (and their respective owners) listening on
 network ports? (3 marks)
 
 =======[ Bonus Round (125 marks) ]=======
 1\. Vim, Nano or Emacs? (10, 0, -10 marks)
-2\. Describe in an article, 5000 to  6000 words in length, why Redbrick is a cult. 
+2\. Describe in an article, 5000 to  6000 words in length, why Redbrick is a cult.
 (3 marks)
 3\. Press F1 to continue. (3 marks)
 4\. How much wood could a woodchuck chuck if a woodchuck could chuck wood? (3 marks)
-5\. Which current admin do you like best? Give details on why you dislike the other one. 
+5\. Which current admin do you like best? Give details on why you dislike the other one.
 (100 marks)
 6\. You just said you don't like me. Why should I vote for you? (3 marks)
 7\. Who did you vote for at the last AGM? (3 marks)
-8\. Do you vow to proactively synergise and globalise our corporate structures by 
-empowering them with client-focused tools that enterprise appliances enable, and build 
-our team structure with adaptive schedule compression and knowledge base, so that our 
-IT resources can envision strategically fit scenarios to really push the envelope of 
+8\. Do you vow to proactively synergise and globalise our corporate structures by
+empowering them with client-focused tools that enterprise appliances enable, and build
+our team structure with adaptive schedule compression and knowledge base, so that our
+IT resources can envision strategically fit scenarios to really push the envelope of
 the quality vector of our organisations morale, mindset and credibility? (3 marks)
 

diff --git a/source/help/exams/admin-test-2009-agm/index.md b/content/help/exams/admin-test-2009-agm.md
similarity index 58%
rename from source/help/exams/admin-test-2009-agm/index.md
rename to content/help/exams/admin-test-2009-agm.md
index c12050e..be864a5 100644
--- a/source/help/exams/admin-test-2009-agm/index.md
+++ b/content/help/exams/admin-test-2009-agm.md
@@ -1,22 +1,36 @@
 ---
-title: 'Admin Test 2009 AGM'
+title: Admin Test 2009 AGM
 ---
 
 277 marks total. All rounds are not weighted equally.
 
-The first half hour is for scripting. During this time, man and info pages (along with perldoc, etc - anything that's **preinstalled on redbrick**, no external docs allowed!) may be accessed. After this time, you may not access anything other then your text editor. We're watching you. Johan has a knife.
+The first half hour is for scripting. During this time, man and info pages
+(along with perldoc, etc - anything that's **preinstalled on redbrick**, no
+external docs allowed!) may be accessed. After this time, you may not access
+anything other then your text editor. We're watching you. Johan has a knife.
 
-* * *
+---
 
 ### scripting
 
 ###### 40 marks
 
-It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky scripts to sort it out.
-
-1.  Firstly you must email all the users, because they're angry and don't know what's going on. However, deathray is shitting itself, so using mailman is out of the question - All you have is an ldif file. Use the ldif file to email every user at both their redbrick and altmail addresses. (an example ldif is in /var/tmp) (13 marks).
-2.  So, now the users know, but all their websites are still replaced by rooted bricks. Luckily the original html file has been saved as index.waf. Write a script that finds all the index.waf files in /webtree and renames them to index.html (13 marks)
-3.  That mostly worked, but some users didn't have an original index.html so their brick page wasn't replaced. Write a script to check the differences between every index.html and the one in /var/tmp. If they're indentical then delete the users' index.html (13 marks)
+It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
+scripts to sort it out.
+
+1.  Firstly you must email all the users, because they're angry and don't know
+    what's going on. However, deathray is shitting itself, so using mailman is
+    out of the question - All you have is an ldif file. Use the ldif file to
+    email every user at both their redbrick and altmail addresses. (an example
+    ldif is in /var/tmp) (13 marks).
+2.  So, now the users know, but all their websites are still replaced by rooted
+    bricks. Luckily the original html file has been saved as index.waf. Write a
+    script that finds all the index.waf files in /webtree and renames them to
+    index.html (13 marks)
+3.  That mostly worked, but some users didn't have an original index.html so
+    their brick page wasn't replaced. Write a script to check the differences
+    between every index.html and the one in /var/tmp. If they're indentical then
+    delete the users' index.html (13 marks)
 4.  Write a script to amuse me (1 mark)
 
 ### General (The more 4 section)
@@ -24,42 +38,57 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 ###### 41 marks
 
 1.  How would you search for a man page? (3 marks)
-2.  What's an RCS? Why does Redbrick use it? What does it mean that receive's had db.internal locked for the past 200 days (5 marks)
-3.  What's a nice number? What command would you use to change a nice number (3 marks
+2.  What's an RCS? Why does Redbrick use it? What does it mean that receive's
+    had db.internal locked for the past 200 days (5 marks)
+3.  What's a nice number? What command would you use to change a nice number (3
+    marks
 4.  What's a xen? Why's it different from a KVM? (3 marks)
-5.  What's a dirvish? Why's it good for looking after Cian's giant collection of pr0n? (3 MARKS)
-6.  You've gone and catted a binary, and your screen is in a wide variety of languages, none of which contain latin characters? How do you go about fixing this? (3 marks)
-7.  How would you suspend a process? What signal would you send it? How would you resume it? What signal would you use? (3 marks)
+5.  What's a dirvish? Why's it good for looking after Cian's giant collection of
+    pr0n? (3 MARKS)
+6.  You've gone and catted a binary, and your screen is in a wide variety of
+    languages, none of which contain latin characters? How do you go about
+    fixing this? (3 marks)
+7.  How would you suspend a process? What signal would you send it? How would
+    you resume it? What signal would you use? (3 marks)
 8.  Why should you avoid using kill -9? (2 marks)
-9.  What architecture is murphy? What are it's benefits for RedBrick wide synergistic protocol exchange? (I'll accept what the architecture is good at either) (2 marks)
-10.  What's a crontab? How would you edit such sorcery? (2 marks)
-11.  What temperature should the redbrick room be at? (1 mark)
-12.  It's late, it's nearly time to run the test, and I haven't slept last night. Finish this one yourself  
-    Only joking. What do you need to do to tell programs you use you're behind a proxy? (3 marks)
-13.  No body in the office could give me a damn cup, so now it's payback time, What's fail2ban, why do we use it? (3 marks)
-14.  What are the following? (1 mark each)
-
-*   nagios
-*   exim
-*   bind
-*   jumpgate
-*   iptables
-*   IOS
+9.  What architecture is murphy? What are it's benefits for RedBrick wide
+    synergistic protocol exchange? (I'll accept what the architecture is good at
+    either) (2 marks)
+10. What's a crontab? How would you edit such sorcery? (2 marks)
+11. What temperature should the redbrick room be at? (1 mark)
+12. It's late, it's nearly time to run the test, and I haven't slept last night.
+    Finish this one yourself  
+    Only joking. What do you need to do to tell programs you use you're behind a
+    proxy? (3 marks)
+13. No body in the office could give me a damn cup, so now it's payback time,
+    What's fail2ban, why do we use it? (3 marks)
+14. What are the following? (1 mark each)
+
+- nagios
+- exim
+- bind
+- jumpgate
+- iptables
+- IOS
 
 ### David Cameron Round (Linux)
 
 ###### 22 marks
 
-1.  You have 2 disks, sda1 and md0, explain the difference between them (3 marks)
-2.  Some Fool, possibly moju has used yum to remove yum, explain the steps you would take to fix this [debian apt related answers excepted] (4 marks)
-3.  Ubuntu likes to reset the MOTD on boot, how would you set it so this doesn't happen on boot [hack expected] (2 marks)
-4.  Your ntp server is eating your CPU, how would you find out what its doing (3 marks)
+1.  You have 2 disks, sda1 and md0, explain the difference between them (3
+    marks)
+2.  Some Fool, possibly moju has used yum to remove yum, explain the steps you
+    would take to fix this [debian apt related answers excepted] (4 marks)
+3.  Ubuntu likes to reset the MOTD on boot, how would you set it so this doesn't
+    happen on boot [hack expected] (2 marks)
+4.  Your ntp server is eating your CPU, how would you find out what its doing (3
+    marks)
 5.  What commands would you use for the following:
 
-*   Give one way of checking load (1 mark)
-*   bring up the eth0 interface (1 mark)
-*   Show currently mounted file systems (1 mark)
-*   Find the amount of Free Space on a Partition (1 mark)
+- Give one way of checking load (1 mark)
+- bring up the eth0 interface (1 mark)
+- Show currently mounted file systems (1 mark)
+- Find the amount of Free Space on a Partition (1 mark)
 
 7.  Name one way to check if a package is installed (3 marks)
 8.  What is /etc/nsswitch.conf used for (3 marks)
@@ -71,20 +100,29 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 ##### Solaris (the synergy section)
 
 1.  Explain c0t1d0s2 (3 marks)
-2.  You've installed Solaris, the damm thing thinks its 1995 and is starting telnet on boot, how do you stop this? (3 marks)
+2.  You've installed Solaris, the damm thing thinks its 1995 and is starting
+    telnet on boot, how do you stop this? (3 marks)
 3.  Give the Solaris specific way of telling if a service is running? (3 marks)
-4.  Sun in it's infinite wisdom have decided not to bother with a nice network aware package manager. They've also decided to leave you with a nice kernel bug. Where do you go to get a patch for this? (2 marks)
-5.  Why is killall a wonderful little tool on linux, and a hilarously bad idea on Solaris? (3 marks)
-6.  You've just logged into your new Solaris box with your funky colorised bashrc, but ls dosn't work, how would you fix this? (2 marks)
+4.  Sun in it's infinite wisdom have decided not to bother with a nice network
+    aware package manager. They've also decided to leave you with a nice kernel
+    bug. Where do you go to get a patch for this? (2 marks)
+5.  Why is killall a wonderful little tool on linux, and a hilarously bad idea
+    on Solaris? (3 marks)
+6.  You've just logged into your new Solaris box with your funky colorised
+    bashrc, but ls dosn't work, how would you fix this? (2 marks)
 
 ##### OpenBSD (The difficult bastard section)
 
-1.  Open BSD's installer is seperating your disk into alphabetically numbered sections. You really shouldn't use two of these for actual file systems. Which two and why? (5 marks)
+1.  Open BSD's installer is seperating your disk into alphabetically numbered
+    sections. You really shouldn't use two of these for actual file systems.
+    Which two and why? (5 marks)
 2.  explain the difference between patches ports and packages? (3 marks)
 3.  What's PF? What do you use to start it? (3 marks)
-4.  How would you set pf to start on boot (the proper configurable way, no hacks kkplzthnxbai)? (3 marks)
+4.  How would you set pf to start on boot (the proper configurable way, no hacks
+    kkplzthnxbai)? (3 marks)
 5.  What's a securelevel? (2 marks)
-6.  su doesn't work for your newly created local account on OpenBSD. Any idea why? (3 marks)
+6.  su doesn't work for your newly created local account on OpenBSD. Any idea
+    why? (3 marks)
 
 ### Security
 
@@ -98,30 +136,37 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
     

 
 3.  What is identd? What is it for? (3 marks)
-4.  You find a root terminal unattended. How do you give yourself a backdoor? (3 marks)
+4.  You find a root terminal unattended. How do you give yourself a backdoor? (3
+    marks)
 5.  Explain what 'chroot' does. When would you use one. (4 marks)
-6.  Why is the RedBrick webserver set up to run CGI scripts under SUEXEC? (or SuPHP for php files)? (3 marks)
-7.  C code should be avoided in favour of python scripts that don't need to be beaten to compile on various platforms, but at sometime you'll probably have to look at some C code, and check that using it wouldn't be insane. Why would you be mad to let this slip through? (4 marks)
-
-    
        #include 
-
+6.  Why is the RedBrick webserver set up to run CGI scripts under SUEXEC? (or
+    SuPHP for php files)? (3 marks)
+7.  C code should be avoided in favour of python scripts that don't need to be
+    beaten to compile on various platforms, but at sometime you'll probably have
+    to look at some C code, and check that using it wouldn't be insane. Why
+    would you be mad to let this slip through? (4 marks)
+
+    
        #include
+    
             int main(int argc,char * argv[]) {
                 char input[20];
-
+    
                 printf("Enter a 20-character string: ");
                 gets(input);
-
+    
                 // Do something with username and password
-
+    
                 return 0;
             }
     

 
-8.  How can you get a list of all processes (and their owner) listening on network ports? (3 marks)
-9.  Give an example of 2 mailing lists you should subscribe to as an admin (1 mark each)
-10.  Explain each of the following briefly (1 mark each)
-    *   chkrootkit
-    *   fakeroot
+8.  How can you get a list of all processes (and their owner) listening on
+    network ports? (3 marks)
+9.  Give an example of 2 mailing lists you should subscribe to as an admin (1
+    mark each)
+10. Explain each of the following briefly (1 mark each)
+    - chkrootkit
+    - fakeroot
 
 ### LDAP
 
@@ -132,7 +177,8 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 3.  What's a Schema? (3 marks)
 4.  How would you search LDAP? (3 marks)
 5.  Slow LDAP is slow, how do you make slow ldap fast? (3 marks)
-6.  What is an LDIF file? What command generates one? What command imports it back into the LDAP database? (3 marks)
+6.  What is an LDIF file? What command generates one? What command imports it
+    back into the LDAP database? (3 marks)
 7.  What LDAP version do we use [not slapd!] (3 marks)
 
 ### File systems
@@ -142,28 +188,35 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 1.  Name 3 different, non-compatiable filesystems? (3 marks)
 2.  Name at least one difference between each of these (3 marks)
 3.  What's an inode? (3 marks)
-4.  What goes in /etc/fstab? How about /etc/dfstab? and /etc/mtab? (Yes I know this is for a pile of different operating systems, but I'm a dickhead so I don't care) (3 * 2 marks)
+4.  What goes in /etc/fstab? How about /etc/dfstab? and /etc/mtab? (Yes I know
+    this is for a pile of different operating systems, but I'm a dickhead so I
+    don't care) (3 \* 2 marks)
 5.  When do you want to fsck? (3 marks)
-6.  What's a symbolic link? What's a hard link? What's the difference? ( 3 marks)
-7.  What's a character and a block device? Given an example of each? (2 * 2 marks)
+6.  What's a symbolic link? What's a hard link? What's the difference? ( 3
+    marks)
+7.  What's a character and a block device? Given an example of each? (2 \* 2
+    marks)
 8.  What's a journaling filesytem (2 marks)
-9.  What's this lie from? Explain at least 2 of the options ( 3 marks + 2 * 2.5 marks)
+9.  What's this lie from? Explain at least 2 of the options ( 3 marks + 2 \* 2.5
+    marks)
 
 ### Networking
 
 ###### 30 marks
 
-1.  How do you show the routing table on an OS of your choice (that redbrick uses) (3 marks)
+1.  How do you show the routing table on an OS of your choice (that redbrick
+    uses) (3 marks)
 2.  Explain the difference between TCP and UDP (3 marks)
 3.  Explain the following terms in relation to DNS (1 mark each)
-    *   SOA
-    *   CNAME
-    *   Glue Record
-    *   A
-    *   TTL
+    - SOA
+    - CNAME
+    - Glue Record
+    - A
+    - TTL
 4.  What is NAT? Why would you use it (or not use it)? (4 marks)
 5.  Give 3 commands to look up a DNS entry (1 mark each)
-6.  How many IP addresses are in a /24, /16, and for a bonus mark, /25 subnets? Double time. (3 marks, 3 possible bonus)
+6.  How many IP addresses are in a /24, /16, and for a bonus mark, /25 subnets?
+    Double time. (3 marks, 3 possible bonus)
 7.  What is inetd. What would you use it for? (3 marks)
 8.  What is a vlan? How are they used on Redbrick? (3 marks)
 9.  What is a vpn? How are they used on Redbrick (or, somewhere else)? (3 marks)
@@ -173,11 +226,16 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 ###### 20 marks
 
 1.  Explain RAID0, RAID1, and RAID5 (3x1 Mark)
-2.  Whats the difference between RAID10 and RAID01? Which is better and why? (3 marks)
+2.  Whats the difference between RAID10 and RAID01? Which is better and why? (3
+    marks)
 3.  What's the difference between SATA, SCSI and SAS
-4.  Murphy has an ALOM, Morpheus and Daniel have ILOMs, what are they and why do they make Cian nearly forgive Sun for there horrible horrible Software(3 marks)
-5.  I have a lot of Us in my RACK, what are they and how many do I have (3 marks)
-6.  What program would you use to connect to a serial console on a *NIX System (3 marks)
+4.  Murphy has an ALOM, Morpheus and Daniel have ILOMs, what are they and why do
+    they make Cian nearly forgive Sun for there horrible horrible Software(3
+    marks)
+5.  I have a lot of Us in my RACK, what are they and how many do I have (3
+    marks)
+6.  What program would you use to connect to a serial console on a \*NIX System
+    (3 marks)
 7.  1000BaseT specifies 2 things about Ethernet, What are they? (2 marks)
 
 ### BONUS ROUND
@@ -188,12 +246,14 @@ It's 2008 and RedBrick has been haxxored, you alone must write a bunch of hacky
 2.  Why are we better than Games Soc?
 3.  Explain in less than 1000 words, the javascript trap
 4.  Whats wrong with fake tan and red bull?
-5.  What's this mean? 0100001100110000011010110011111101100111011011000011000100100011
+5.  What's this mean?
+    0100001100110000011010110011111101100111011011000011000100100011
 6.  What key combination enters the console screen saver on FreeBSD?
 7.  What's wrong with Sun Microsystems
 8.  Rate these operating systems in order of preference
-    *   OpenBSD
-    *   OpenBSD
-    *   OpenBSD
+    - OpenBSD
+    - OpenBSD
+    - OpenBSD
 9.  What does su do?
-10.  How do you intend to improve the quality of the naked women on the server room wall?
+10. How do you intend to improve the quality of the naked women on the server
+    room wall?
diff --git a/source/help/exams/admin-test-2009-egm/index.md b/content/help/exams/admin-test-2009-egm.md
similarity index 51%
rename from source/help/exams/admin-test-2009-egm/index.md
rename to content/help/exams/admin-test-2009-egm.md
index c3a6835..9b05ecf 100644
--- a/source/help/exams/admin-test-2009-egm/index.md
+++ b/content/help/exams/admin-test-2009-egm.md
@@ -1,75 +1,114 @@
 ---
-title: 'Admin Test 2009 EGM'
+title: Admin Test 2009 EGM
 ---
 
-All questions can be answered in the context of any version of UNIX (except for the OpenBSD, Solaris and Linux sections obviously!). Indicating which version of UNIX you refer to in your answer is preferred but not required. Negative marking applies throughout for answers that are clearly incorrect or demonstrate incompetence.
+All questions can be answered in the context of any version of UNIX (except for
+the OpenBSD, Solaris and Linux sections obviously!). Indicating which version of
+UNIX you refer to in your answer is preferred but not required. Negative marking
+applies throughout for answers that are clearly incorrect or demonstrate
+incompetence.
 
-Humourous answers while appreciated gain no extra marks*. **Keep answers short and concise** - don't waste time writing when one or two word answers will suffice.  
+Humourous answers while appreciated gain no extra marks\*. **Keep answers short
+and concise** - don't waste time writing when one or two word answers will
+suffice.
 
-* - Although, it will put us in a better mood while correcting.
+\* - Although, it will put us in a better mood while correcting.
 
-**ALL SECTIONS ARE *NOT* EQUALLY WEIGHTED**
+**ALL SECTIONS ARE _NOT_ EQUALLY WEIGHTED**
 
-The test is marked out of an arbitrary number equal to two times the bisection of the set of available marks, as outlined by the numbers beside the questions and sections (they're not just there to look pretty).
+The test is marked out of an arbitrary number equal to two times the bisection
+of the set of available marks, as outlined by the numbers beside the questions
+and sections (they're not just there to look pretty).
 
 ### The Rules
 
-*   You ***must*** be mesg n for the duration of the test. Any attempt to communicate with other users will result in immediate disqualification. Big Brother is watching you. Johan has a knife. Sonic **borrowed** Declan's Mace.
-*   During the scripting section ***only***, you may refer to the system documentation (man & info pages) for help. You ***may not*** use any external documentation, i.e. no web access! Don't forget, Big Brother is still watching you.
-*   You are free to use whatever shell or scripting language you wish to write the scripts (except brainfuck and whitespace. Admins are people too!). Only system commands may be used: yours or other users' scripts ***may not*** be referred to. Basically: No cheating! Big Brother will be checking.
-*   Make a directory called ~/admintest, and place scripts and answers in there. Name each script by its question number. Don't forget: Humorous error messages make your scripts run faster. Big Brother likes humorous error messages.
+- You **_must_** be mesg n for the duration of the test. Any attempt to
+  communicate with other users will result in immediate disqualification. Big
+  Brother is watching you. Johan has a knife. Sonic **borrowed** Declan's Mace.
+- During the scripting section **_only_**, you may refer to the system
+  documentation (man & info pages) for help. You **_may not_** use any external
+  documentation, i.e. no web access! Don't forget, Big Brother is still watching
+  you.
+- You are free to use whatever shell or scripting language you wish to write the
+  scripts (except brainfuck and whitespace. Admins are people too!). Only system
+  commands may be used: yours or other users' scripts **_may not_** be referred
+  to. Basically: No cheating! Big Brother will be checking.
+- Make a directory called ~/admintest, and place scripts and answers in there.
+  Name each script by its question number. Don't forget: Humorous error messages
+  make your scripts run faster. Big Brother likes humorous error messages.
 
 Best of luck!
 
 > - johan and sonic
 
-* * *
+---
 
 ### scripting
 
 ###### 40 marks
 
-1.  Sonic's outputed a list of all the renewed users, but we wanted just the members, not those old associates. Using /var/tmp/list.list send an email to all the members telling them their passwords probably in their spamtrap. (13 Marks)
-2.  Redbrick's got a new DAS, So we moving the contents of /storage there, write a script that will copy the contents of /storage to /das/ As it copys each user's files across it should boot the user from the network and disable their account. When the copy completes change the users home dir to the new location and reable there account. Remember, keeping the users informed as you go along is a good idea.(13 marks)
-3.  Write a script that will force the user to read the AUP, /var/tmp/aup. After reading the AUP the user should be able to accept, reject or abort the AUP, if the user rejects the AUP make it so they can no longer log in, kick then from the system and email admins. If they abort 3 times email helpdesk asking them to help this user, Each time they abort they should be dissconected. If they accept email committee. The only way out of the script should be by answering the choice at the end of the AUP.(13 marks)
+1.  Sonic's outputed a list of all the renewed users, but we wanted just the
+    members, not those old associates. Using /var/tmp/list.list send an email to
+    all the members telling them their passwords probably in their spamtrap. (13
+    Marks)
+2.  Redbrick's got a new DAS, So we moving the contents of /storage there, write
+    a script that will copy the contents of /storage to /das/ As it copys each
+    user's files across it should boot the user from the network and disable
+    their account. When the copy completes change the users home dir to the new
+    location and reable there account. Remember, keeping the users informed as
+    you go along is a good idea.(13 marks)
+3.  Write a script that will force the user to read the AUP, /var/tmp/aup. After
+    reading the AUP the user should be able to accept, reject or abort the AUP,
+    if the user rejects the AUP make it so they can no longer log in, kick then
+    from the system and email admins. If they abort 3 times email helpdesk
+    asking them to help this user, Each time they abort they should be
+    dissconected. If they accept email committee. The only way out of the script
+    should be by answering the choice at the end of the AUP.(13 marks)
 4.  Write a script to amuse me (1 mark)
 
 ### General ()
 
 ###### 30 marks
 
-1.  How would forward a port from your local computer to the internal network on redbrick? What would be a good reason for doing this? (3 marks)
+1.  How would forward a port from your local computer to the internal network on
+    redbrick? What would be a good reason for doing this? (3 marks)
 2.  Check what kernel your currently running? (1 mark)
 3.  What does chmod 4765 filename do? (3 marks)
-4.  How do you search for all the man pages containing a particular word? (2 marks)
+4.  How do you search for all the man pages containing a particular word? (2
+    marks)
 5.  Whats the difference between find and ls (2 marks)
-6.  finds gone, so's ls, how do see whats in the current working directory (2 marks)
+6.  finds gone, so's ls, how do see whats in the current working directory (2
+    marks)
 7.  whats busybox? Whats it useful for? (3 marks)
-8.  Describe the steps you'd take if you wanted to mount deathray's /not_porn onto carbon via NFS. Both server and client steps are required. (5 marks)
-9.  If you turn the airconditioning off for any reason, what do you do afterwards? Be specific. (1 marks)
-10.  If you forgot the root password on carbon how would you recover/change it? (3 marks)
-11.  What are the following? (1 mark each)
-
-*   zabbix
-*   postgres
-*   munin
-*   dovecot
-*   pf
+8.  Describe the steps you'd take if you wanted to mount deathray's /not_porn
+    onto carbon via NFS. Both server and client steps are required. (5 marks)
+9.  If you turn the airconditioning off for any reason, what do you do
+    afterwards? Be specific. (1 marks)
+10. If you forgot the root password on carbon how would you recover/change it?
+    (3 marks)
+11. What are the following? (1 mark each)
+
+- zabbix
+- postgres
+- munin
+- dovecot
+- pf
 
 ### The Linus Round
 
 ###### 30 marks
 
 1.  How would you add yourself to a group? (1 mark)
-2.  How do you stop exim from running when you go into run level 5, why would you do this (3 marks)
+2.  How do you stop exim from running when you go into run level 5, why would
+    you do this (3 marks)
 3.  Whats /etc/aliases for? (2 marks)
 4.  What command(s) would you use for the following: (1 mark each)
-    *   Check if a user is over quota?
-    *   Apache is running?
-    *   Fail2ban has banned someone?
-    *   Check the mail queue?
-    *   Look for root kits?
-5.  What file is the following taken from? (3 marks)  
+    - Check if a user is over quota?
+    - Apache is running?
+    - Fail2ban has banned someone?
+    - Check the mail queue?
+    - Look for root kits?
+5.  What file is the following taken from? (3 marks)
 
     
	*               soft    core            0
     	*               hard    core            81920
@@ -86,12 +125,18 @@ Best of luck!
     	

 
 6.  How would you check a filesystem for problems? (1 mark)
-7.  For some reason redbrick just dosn't like sudo, how would you disable it on your newly installed server? (2 marks)
+7.  For some reason redbrick just dosn't like sudo, how would you disable it on
+    your newly installed server? (2 marks)
 8.  How would you configure tzdata? Why is it important to do this? (3 marks)
-9.  What Linux utility can you use to see what system calls a program is making? (2 marks)
-10.  You've just compiled a new kernel and you reboot. Everything seems to be going ok until you get the dreaded KERNEL PANIC message. You notice messages about ext3 filesystems not being mounted. What might be the cause of this? (4 marks)
-11.  How would you enable Redbrick's, apt repositry? For 2 bonus marks give the exact changes you would make (1+2 marks)
-12.  apt-get install on your newly installed server didn't work, fix it. (1 mark)
+9.  What Linux utility can you use to see what system calls a program is making?
+    (2 marks)
+10. You've just compiled a new kernel and you reboot. Everything seems to be
+    going ok until you get the dreaded KERNEL PANIC message. You notice messages
+    about ext3 filesystems not being mounted. What might be the cause of this?
+    (4 marks)
+11. How would you enable Redbrick's, apt repositry? For 2 bonus marks give the
+    exact changes you would make (1+2 marks)
+12. apt-get install on your newly installed server didn't work, fix it. (1 mark)
 
 ### OpenBSD / Solaris
 
@@ -102,7 +147,9 @@ Best of luck!
 1.  Explain c2t2d1s5 (3 marks)
 2.  What does 'logging' means on Solaris UFS? (3 marks)
 3.  Metastat, whats that do? (1 mark)
-4.  You need to setup a network alias on a running network interface (say hme0) and ensure it is persistent across reboots. How do you go about this, with emphasis on the persistency. (4 marks)
+4.  You need to setup a network alias on a running network interface (say hme0)
+    and ensure it is persistent across reboots. How do you go about this, with
+    emphasis on the persistency. (4 marks)
 5.  A service isn't starting, how do you check its status? (2 marks)
 6.  Where would you specify filesystem mounts in Solaris? (2marks)
 
@@ -110,8 +157,10 @@ Best of luck!
 
 1.  How do you enable multi-processor support in OpenBSD? (2 marks)
 2.  Give a quick rundown of how to PXEboot your OpenBSD system. (4 marks)
-3.  How do you set up a default route? How do you make it presistant, why is this good? (3 marks)
-4.  pass in on em0 inet proto tcp from any to em0 port 80, what does this do, where would you find it, how would you make it more secure? (3 marks)
+3.  How do you set up a default route? How do you make it presistant, why is
+    this good? (3 marks)
+4.  pass in on em0 inet proto tcp from any to em0 port 80, what does this do,
+    where would you find it, how would you make it more secure? (3 marks)
 5.  What does pfctl do? why should you use it? (2 marks)
 6.  Whats /dev/wd0a? (1 mark)
 
@@ -119,20 +168,28 @@ Best of luck!
 
 ###### 30 marks
 
-1.  bind runs on port 53, but it runs as named, and its root directory is /var/lib/named. Explain the magic (3 marks)
+1.  bind runs on port 53, but it runs as named, and its root directory is
+    /var/lib/named. Explain the magic (3 marks)
 2.  What is iptables? What is it for? (3 marks)
-3.  You find a root terminal unattended. How do you give yourself a backdoor? (1 marks)
+3.  You find a root terminal unattended. How do you give yourself a backdoor? (1
+    marks)
 4.  Explain what a ulimit is, and why poor goldie needs them. (3 marks)
-5.  Redbrick is firewalled to hell by DCU, but is there is a way to get full access to our network from outside without an account? What would it be? if you were elected, how would you fix it? (3 marks)
+5.  Redbrick is firewalled to hell by DCU, but is there is a way to get full
+    access to our network from outside without an account? What would it be? if
+    you were elected, how would you fix it? (3 marks)
 6.  What is apparmor? Why is it good? What would you use it for? (3 marks)
-7.  Why shouldn't you ever run any of shadow's utilities? (for example) (3 marks)
+7.  Why shouldn't you ever run any of shadow's utilities? (for example) (3
+    marks)
 8.  Why are telnet, ftp, etc block inbound to redbrick? (2 marks)
 9.  List 3 things that should only be accessible to admins? (3 marks)
-10.  Well done, you have just been elected and added to the root group. However, you've just become a security threat to the system. As a root group member, you have elevated privileges to that of a normal user. Name 2 steps you can take to ensure your account is secure. (3 marks)
-11.  Explain each of the following briefly (1 mark each)
-    *   A password salt
-    *   Why theres /etc/passwd and /etc/shadow
-    *   suPHP
+10. Well done, you have just been elected and added to the root group. However,
+    you've just become a security threat to the system. As a root group member,
+    you have elevated privileges to that of a normal user. Name 2 steps you can
+    take to ensure your account is secure. (3 marks)
+11. Explain each of the following briefly (1 mark each)
+    - A password salt
+    - Why theres /etc/passwd and /etc/shadow
+    - suPHP
 
 ### LDAP
 
@@ -141,8 +198,11 @@ Best of luck!
 1.  What does ldif stand for? (2 marks)
 2.  ldapsearch? What is it. Name 3 switchs and tell me what they do? (4 marks)
 3.  Give 3 examples of LDAP attributes (3 marks)
-4.  Explain how you would set up a Slave LDAP Server. Pick a type and explain your choice (3 marks) Give other config variables you'd use on the slave (3 marks for that) What configuration needs to be done on the master? (2 marks)
-5.  What would you put into a ldap command to add yourself to the root group (3 marks + 1 if you name the command)
+4.  Explain how you would set up a Slave LDAP Server. Pick a type and explain
+    your choice (3 marks) Give other config variables you'd use on the slave (3
+    marks for that) What configuration needs to be done on the master? (2 marks)
+5.  What would you put into a ldap command to add yourself to the root group (3
+    marks + 1 if you name the command)
 6.  NSCD, do you like it, is it nessecary, whats this is again. etc. (3 marks)
 
 ### File systems
@@ -151,10 +211,19 @@ Best of luck!
 
 1.  Name 3 different, non-compatiable filesystems? (3 marks)
 2.  Name at least one difference between each of these (3 marks)
-3.  You decide to buy a new storage array with 6 300GB disks. You decide on Raid10\. How much much usable space will you have? Any drawbacks to this setup? What advantages are there? (5 marks)
-4.  You want minerva's disks for yourself and decide to mount /storage over nfs while in the library on your laptop. All is going well except it wont work. What command are you running on your laptop to try and mount it. Why doesnt it work? How would you make it work? If it did work, how would you make it so the disks were mounted automatically after booting your laptop and how would you tell your super duper ubuntu laptop to start using these changes you just made immediately. (5 marks)
+3.  You decide to buy a new storage array with 6 300GB disks. You decide on
+    Raid10\. How much much usable space will you have? Any drawbacks to this
+    setup? What advantages are there? (5 marks)
+4.  You want minerva's disks for yourself and decide to mount /storage over nfs
+    while in the library on your laptop. All is going well except it wont work.
+    What command are you running on your laptop to try and mount it. Why doesnt
+    it work? How would you make it work? If it did work, how would you make it
+    so the disks were mounted automatically after booting your laptop and how
+    would you tell your super duper ubuntu laptop to start using these changes
+    you just made immediately. (5 marks)
 5.  How would you change the timestamp on a file to Jan/1/1970 00:00\. (2 marks)
-6.  What are these filesystems used for, on your average unix box? (2 * 2 marks)
+6.  What are these filesystems used for, on your average unix box? (2 \* 2
+    marks)
 
     
    /proc
         /dev 

@@ -173,10 +242,10 @@ Best of luck!
     ctfs    -       /system/contract        ctfs    -       no      -
     objfs   -       /system/object  objfs   -       no      -
     swap    -       /tmp    tmpfs   -       yes     -
-
+    
     192.168.0.21:/storage    -      /storage        nfs     -       yes     rw,vers=3,rsize=65535,wsize=65535,nosuid,nodev,soft,intr
     192.168.0.1:/fast-storage        -      /fast-storage   nfs     -       yes     rw,vers=3,rsize=65535,wsize=65535,nosuid,nodev,soft,intr
-
+    
     sharefs         -       /etc/dfs/sharetab       sharefs -       no      -
     

 
@@ -184,27 +253,34 @@ Best of luck!
 
 ###### 33 marks
 
-1.  Your openbsd webserver is only accessible from localhost, but its configured correctly to allow access from anywhere. Whats wrong, how do you fix it, which current esteemed root holder do you beat with a stick? (3 marks)
+1.  Your openbsd webserver is only accessible from localhost, but its configured
+    correctly to allow access from anywhere. Whats wrong, how do you fix it,
+    which current esteemed root holder do you beat with a stick? (3 marks)
 2.  Explain the following terms in relation to Networking (1 mark each)
-    *   netmask
-    *   DNS
-    *   ifconfig
-    *   Multicast
-    *   arp
+    - netmask
+    - DNS
+    - ifconfig
+    - Multicast
+    - arp
 3.  What is ntp? Why would you use it (or not use it)? (2 marks)
-4.  You heard gw's ma runs a remote server and everyone knows the IP address(if you know what i mean) including you. What would you use to see what services she offers on it? (2 marks)
+4.  You heard gw's ma runs a remote server and everyone knows the IP address(if
+    you know what i mean) including you. What would you use to see what services
+    she offers on it? (2 marks)
 5.  1000BASE-TX. Sounds weird, what is it? Details are king. (3 marks)
 6.  What are dcu's dns server ips? (2 marks)
 7.  Whats DCU's ntp server's hostname? (1 mark)
 8.  What layer in the OSI networking model is ICMP in? (2 marks)
 9.  /etc/services, heres a list of services, you tell me the ports (1 mark each)
-    *   syslog
-    *   nfs
-    *   ldap
-    *   ntp
-    *   tftp
-10.  You notice an unknown daemon is listening on TCP port 31337\. How would you go about finding both the owner of this daemon and the exact path to the program? (3 marks)
-11.  Shite, the website appears down, any idea why? (2 marks)
+    - syslog
+    - nfs
+    - ldap
+    - ntp
+    - tftp
+10. You notice an unknown daemon is listening on TCP port 31337\. How would you
+    go about finding both the owner of this daemon and the exact path to the
+    program? (3 marks)
+11. Shite, the website appears down, any idea why? (2 marks)
+
 
     
sonic@99.222.13.4:~/1950sPorn$ ping www.redbrick.dcu.ie
     PING www.redbrick.dcu.ie (136.206.15.70) 56(84) bytes of data.
@@ -213,33 +289,48 @@ Best of luck!
     16 packets transmitted, 0 received, 100% packet loss, time 15014ms
     

 
-12.  Name three useful tools available on all UNIX systems for diagnosing network problems. (2 marks)
+12. Name three useful tools available on all UNIX systems for diagnosing network
+    problems. (2 marks)
 
 ### Hardware
 
 ###### 28 marks
 
-1.  The IP-KVM uses daisy chaining. What this, why is it handy for redbrick. (Hint: nothing to do with botany) (2 marks)
-2.  Redbrick is doing a disk inventory. On the os of your choice, find out the type and number of disks on the machine. While you are at it, you want to know the type/number of processors on sprout(openbsd) and carbon(ubuntu). (4 marks)
-3.  Cian keeps asking you about IOPS. Explain what it is and what its used for. (3 marks)
+1.  The IP-KVM uses daisy chaining. What this, why is it handy for redbrick.
+    (Hint: nothing to do with botany) (2 marks)
+2.  Redbrick is doing a disk inventory. On the os of your choice, find out the
+    type and number of disks on the machine. While you are at it, you want to
+    know the type/number of processors on sprout(openbsd) and carbon(ubuntu). (4
+    marks)
+3.  Cian keeps asking you about IOPS. Explain what it is and what its used for.
+    (3 marks)
 4.  DAS. What the frack is it? (1 mark)
-5.  Please give the number of cpus/cpu cores(threads)/ram for: Murphy, Morpheus & Carbon ( 3 * 3 marks )
-6.  RAID1/RAID5/RAID6\. Give me minimum number of disks. Which is more space efficent. How do they work. (3* 3 marks +1 )
+5.  Please give the number of cpus/cpu cores(threads)/ram for: Murphy, Morpheus
+    & Carbon ( 3 \* 3 marks )
+6.  RAID1/RAID5/RAID6\. Give me minimum number of disks. Which is more space
+    efficent. How do they work. (3\* 3 marks +1 )
 
 ### BONUS ROUND
 
 ###### 1,000,000,000,000,000,000,000,000,000,000,000,000,000 marks ( approx, +/- infinity )
 
 1.  Dr Robotnik. Friend or foe? (>7000 words)
-2.  I will when elected buy sonic what number of pizza's? (-1000 marks for numbers < 1)
-3.  If you could take one operating system on date. What one would it be and why?
-4.  Gw's mother has a lot of "clients" on her "server". In this scenario is "uptime" important?
+2.  I will when elected buy sonic what number of pizza's? (-1000 marks for
+    numbers < 1)
+3.  If you could take one operating system on date. What one would it be and
+    why?
+4.  Gw's mother has a lot of "clients" on her "server". In this scenario is
+    "uptime" important?
 5.  Give me a good joke including the words monkey, pineapple and yogurt.
 6.  Rate these in order of your preference, and explain why  
     Solaris, OpenBSD, GW's Ma
-7.  How long does it take the average Redbrick Admin Project to Complete 1 year, 2 years, 10 years? What would you do to improve this
-8.  You servars are aspolding, whats you head doing? whats a good way to fix this?
-9.  A user emails you asking to be removed from the Debate Socs Redbrick email list. what do you do?
-10.  How do you convince the SPC to buy you shinny stuff?
-11.  What does su do?
-12.  How do you intend to improve the quality of the naked women on the server room wall?
+7.  How long does it take the average Redbrick Admin Project to Complete 1 year,
+    2 years, 10 years? What would you do to improve this
+8.  You servars are aspolding, whats you head doing? whats a good way to fix
+    this?
+9.  A user emails you asking to be removed from the Debate Socs Redbrick email
+    list. what do you do?
+10. How do you convince the SPC to buy you shinny stuff?
+11. What does su do?
+12. How do you intend to improve the quality of the naked women on the server
+    room wall?
diff --git a/source/help/exams/admin-test-2010-agm/index.md b/content/help/exams/admin-test-2010-agm.md
similarity index 51%
rename from source/help/exams/admin-test-2010-agm/index.md
rename to content/help/exams/admin-test-2010-agm.md
index 699fbc0..6e47308 100644
--- a/source/help/exams/admin-test-2010-agm/index.md
+++ b/content/help/exams/admin-test-2010-agm.md
@@ -1,14 +1,18 @@
 ---
-title: 'Admin Test 2010 AGM'
+title: Admin Test 2010 AGM
 ---
 
 ## The rules
 
 1.  **ALL GLORY TO THE HYPNOTOAD.**
-2.  The first half hour is for scripting. During this time, man, info, apropos, perldoc, pydoc, etc (anything that's installed on redbrick) may be accessed. The internet may not.
-3.  After the first half hour you may not access anything other than a text editor.
+2.  The first half hour is for scripting. During this time, man, info, apropos,
+    perldoc, pydoc, etc (anything that's installed on redbrick) may be accessed.
+    The internet may not.
+3.  After the first half hour you may not access anything other than a text
+    editor.
 4.  We're watching you. Any trouble and sonic will throw you out a window.
-5.  All sections are probably not weighted equally. Probably. W're not quite sure yet.
+5.  All sections are probably not weighted equally. Probably. W're not quite
+    sure yet.
 6.  The whole test is out of 267\. Yep, 267.
 7.  **ALL GLORY TO THE HYPNOTOAD.**
 
@@ -16,75 +20,119 @@ title: 'Admin Test 2010 AGM'
 
 40 marks
 
-1.  Write a script to tell you how much space each user is using in their HOME directory and how many files they have greater than 150mb. Output should be:  
+1.  Write a script to tell you how much space each user is using in their HOME
+    directory and how many files they have greater than 150mb. Output should be:
 
     
SpaceUsed Username NumFiles

 
     However it should be sorted by alphabetically by Username. (13 marks)
-2.  Write a script that checks whether or not a user has a quota on /dev/sda1 (/storage on Minerva). If they don't, then check whether or not they have more then 2GB of files in their home directory. If not, set them a 2GB quota. If they do have more then 2GB of files, email admins@redbrick.dcu.ie to prod someone to look at the situation manually. (13 marks)
-3.  Write a script that takes 6 usernames and monitors what processes they are running during the admin test. If any of the users run any of 3 forbidden binaries simultaneously (you get to pick the forbidden binaries, aren't we nice?) they are heyed (assume mesg y) saying they are cheating gits and to "stop or else". Also, if **any** of the offending processes are running, kill them immediately. (13 marks)
-4.  Write a script that monitors incoming mail for the word "GRAND", "PLANTS", "BBQ" or "TFAS". If any is found, send it to /dev/null and cat /boot/vmlinuz all over that user's terminal. (1 mark, but we'll really like you and be nicer marking the rest).
+
+2.  Write a script that checks whether or not a user has a quota on /dev/sda1
+    (/storage on Minerva). If they don't, then check whether or not they have
+    more then 2GB of files in their home directory. If not, set them a 2GB
+    quota. If they do have more then 2GB of files, email admins@redbrick.dcu.ie
+    to prod someone to look at the situation manually. (13 marks)
+3.  Write a script that takes 6 usernames and monitors what processes they are
+    running during the admin test. If any of the users run any of 3 forbidden
+    binaries simultaneously (you get to pick the forbidden binaries, aren't we
+    nice?) they are heyed (assume mesg y) saying they are cheating gits and to
+    "stop or else". Also, if **any** of the offending processes are running,
+    kill them immediately. (13 marks)
+4.  Write a script that monitors incoming mail for the word "GRAND", "PLANTS",
+    "BBQ" or "TFAS". If any is found, send it to /dev/null and cat /boot/vmlinuz
+    all over that user's terminal. (1 mark, but we'll really like you and be
+    nicer marking the rest).
 
 ## General
 
 (22 marks)
 
-1.  You are about to reboot all user login servers for a kernel upgrade. You have already upgraded the kernels. What else should you do on each server and in what order. (Server A running LDAP, Mail, IRC server, Server B running a dev environment for users, Server C running an NFS server with everyone's /home and webtree on it, Server D running a web server) (5 marks)
-2.  Whats nagios likely output to what happens in the above question assuming no intervention on your part. (1 mark)
-3.  What permissions would you give /usr/bin/wall if you were setting up a server? Why? (2 marks)
-4.  You just typed your password into the username field while logging in from PuTTY. Should you be worried? If so, what should you do about it? (3 marks)
+1.  You are about to reboot all user login servers for a kernel upgrade. You
+    have already upgraded the kernels. What else should you do on each server
+    and in what order. (Server A running LDAP, Mail, IRC server, Server B
+    running a dev environment for users, Server C running an NFS server with
+    everyone's /home and webtree on it, Server D running a web server) (5 marks)
+2.  Whats nagios likely output to what happens in the above question assuming no
+    intervention on your part. (1 mark)
+3.  What permissions would you give /usr/bin/wall if you were setting up a
+    server? Why? (2 marks)
+4.  You just typed your password into the username field while logging in from
+    PuTTY. Should you be worried? If so, what should you do about it? (3 marks)
 5.  What temperature should the Redbrick room be kept at? (1 mark)
-6.  A machine has just died, its not important enough for you to rush to the server room to fix (at 00:22 anyway), but your curious as to what went wrong. Give an example of where you might look for information. (2 marks)
+6.  A machine has just died, its not important enough for you to rush to the
+    server room to fix (at 00:22 anyway), but your curious as to what went
+    wrong. Give an example of where you might look for information. (2 marks)
 7.  What does DNS do? (1 mark)
 8.  How would you search man for a woman? (1 mark)
-9.  What version of an OS should your secondary services machine be running?(2 marks)
-10.  What is the CVE database? (2 marks)
-11.  What is an IP KVM? Why does redbrick have or need one? (2 marks)
+9.  What version of an OS should your secondary services machine be running?(2
+    marks)
+10. What is the CVE database? (2 marks)
+11. What is an IP KVM? Why does redbrick have or need one? (2 marks)
 
 ## Linux
 
 (26 marks)
 
-1.  You want to find a package that has something to do with "mudkips" on a Debian based system. Give us the command you'd enter. (1 mark)
-2.  You pasted minerva's root password into #lobby last night, didn't notice and went to bed. How do you change the root password? The permissions of what file in /bin are suddenly very important to you? (2 marks)
-3.  Describe the steps needed to share /waf on 192.168.0.1 with 192.168.0.2 via NFS. (4 marks)
-4.  How would you disable sudo access for users without removing the binary or editing the binaries permissions? (3 marks)
-5.  Murphy just had a wibblywobbly and you had to shut it down. What steps will you take to diagnose what went wrong. (1 mark)
+1.  You want to find a package that has something to do with "mudkips" on a
+    Debian based system. Give us the command you'd enter. (1 mark)
+2.  You pasted minerva's root password into #lobby last night, didn't notice and
+    went to bed. How do you change the root password? The permissions of what
+    file in /bin are suddenly very important to you? (2 marks)
+3.  Describe the steps needed to share /waf on 192.168.0.1 with 192.168.0.2 via
+    NFS. (4 marks)
+4.  How would you disable sudo access for users without removing the binary or
+    editing the binaries permissions? (3 marks)
+5.  Murphy just had a wibblywobbly and you had to shut it down. What steps will
+    you take to diagnose what went wrong. (1 mark)
 6.  What file do you add nameservers to? (1 mark)
 7.  What file do you add a time server to? (1 mark)
 8.  How do you get ntp to resync its time immediately? (2 marks)
-9.  OH noes, some idiot left their root terminal open and someones ran apt-get remove apt. How might you go about fixing this? (4 marks)
-10.  Redbrick use a shiny packaging system (a standard debian setup, really), explain how you would modify and deploy a change to a package? (5 marks)
-11.  What's an nrpe plugin? (2 marks)
+9.  OH noes, some idiot left their root terminal open and someones ran apt-get
+    remove apt. How might you go about fixing this? (4 marks)
+10. Redbrick use a shiny packaging system (a standard debian setup, really),
+    explain how you would modify and deploy a change to a package? (5 marks)
+11. What's an nrpe plugin? (2 marks)
 
 ## Free/OpenBSD
 
 (23 marks)
 
-1.  How would you update the ports tree on FreeBSD? Any one of the twenty methods is acceptable, as long as it works. (3 marks)
-2.  You've been elected, and you're handed a root terminal on our BSD machine to create an a/c for yourself. You go  
+1.  How would you update the ports tree on FreeBSD? Any one of the twenty
+    methods is acceptable, as long as it works. (3 marks)
+2.  You've been elected, and you're handed a root terminal on our BSD machine to
+    create an a/c for yourself. You go
 
     
useradd waf

 
-    You can now login fine, but it won't let you su, even when you have the password right. Why not? (2 marks)
+    You can now login fine, but it won't let you su, even when you have the
+    password right. Why not? (2 marks)
+
 3.  What's a securelevel? (2 marks)
 4.  Why should you not put your /home partition on /dev/wd0b? (2 marks)
 5.  /dev/amrd0s1a. What's that all mean? (3 marks)
 6.  What does dtrace do? (1 mark)
-7.  What's the current (stable) OpenBSD version? Current (release) FreeBSD version? (2 marks)
+7.  What's the current (stable) OpenBSD version? Current (release) FreeBSD
+    version? (2 marks)
 8.  What's the correct way to add a new user or group on FreeBSD? (2 marks)
-9.  Where do ports and packaged software usually install to on a BSD system? (1 mark)
-10.  What file usually contains the kernel on an OpenBSD system? (1 mark)
-11.  Where would you configure networking on either an OpenBSD or a FreeBSD system? (2 marks)
-12.  Where would you configure which TTYs (the console, serial ports, etc) have login prompts on a BSD system? (2 marks)
+9.  Where do ports and packaged software usually install to on a BSD system? (1
+    mark)
+10. What file usually contains the kernel on an OpenBSD system? (1 mark)
+11. Where would you configure networking on either an OpenBSD or a FreeBSD
+    system? (2 marks)
+12. Where would you configure which TTYs (the console, serial ports, etc) have
+    login prompts on a BSD system? (2 marks)
 
 ## Security
 
 (33 marks)
 
-1.  I overloaded your ma's buffer last night. What's a buffer overflow (1 mark), why are they bad (1 mark)? How would you use one to 0wn someone's gibson (3 marks)? (1+1+3=5 marks)
-2.  What's a "setuid" executable? (2) Give a command to turn a regular executable into a "setuid" one (1). (2+1=3 marks)
-3.  A user has called you over to look at their broken wordpress installation. They type ls -l and you see the following output:  
+1.  I overloaded your ma's buffer last night. What's a buffer overflow (1 mark),
+    why are they bad (1 mark)? How would you use one to 0wn someone's gibson (3
+    marks)? (1+1+3=5 marks)
+2.  What's a "setuid" executable? (2) Give a command to turn a regular
+    executable into a "setuid" one (1). (2+1=3 marks)
+3.  A user has called you over to look at their broken wordpress installation.
+    They type ls -l and you see the following output:
 
     
[werdz@minerva wordpress]$ ls -l
     total 228K
@@ -117,20 +165,27 @@ title: 'Admin Test 2010 AGM'
     

 
     Point out the glaring security hole (3 marks).
-4.  Some moron admin left their terminal open on the Photoshop PC in the clubs and socs office. They had a root terminal open in one of their screens. Name one way Micheal McHugh could give himself a back door. (3 marks)
-5.  All root passwords just got changed. How do you inform the other root holders of the new passwords securely? (2 marks)
+
+4.  Some moron admin left their terminal open on the Photoshop PC in the clubs
+    and socs office. They had a root terminal open in one of their screens. Name
+    one way Micheal McHugh could give himself a back door. (3 marks)
+5.  All root passwords just got changed. How do you inform the other root
+    holders of the new passwords securely? (2 marks)
 6.  Forkbombs are bad mmmkay. Why? How will you stop this evil? (3 marks)
 7.  What is a umask? (2 marks)
 8.  Give 3 files that should only be viewable by root. (3 marks)
 9.  Redbrick uses at least 2 different firewalls, name them. (2 marks)
-10.  What is this line from? What does it do?  
+10. What is this line from? What does it do?
+
 
     
pass out quick on hme1 inet proto { tcp udp } from any to any port { www https }

 
     (3 marks)
-11.  Why is telnet, FTP, SMTP, etc usually a bad idea? (1 mark)
-12.  What does AppArmor do, aside from piss admins off? (2 marks)
-13.  Why is this a bad idea?  
+
+11. Why is telnet, FTP, SMTP, etc usually a bad idea? (1 mark)
+12. What does AppArmor do, aside from piss admins off? (2 marks)
+13. Why is this a bad idea?
+
 
     
mysql -u root -h mysql.internal -p=rootpasswordgoeshere mydatabase

 
@@ -142,17 +197,23 @@ title: 'Admin Test 2010 AGM'
 
 1.  What is slapd? What is slurpd? (2 marks)
 2.  What does nscd stand for? What does it do? (2 marks)
-3.  What version of LDAP do we mainly use? (the protocol, not the piece of software) (1 mark)
+3.  What version of LDAP do we mainly use? (the protocol, not the piece of
+    software) (1 mark)
 4.  What form of authentication do we use on our LDAP server? (2 marks)
-5.  You want to do an (unprivileged, no need for root) LDAP search for merchelo. How would you do this? You can assume that the admins have set up ldap.conf correctly to reduce the amount of switches you'll need. (3 marks)
-6.  Give me an LDAP search filter that'll find all the users with YearsPaid less than one (shouldn't be any lower than -1), and in the member group? (3 marks)
+5.  You want to do an (unprivileged, no need for root) LDAP search for merchelo.
+    How would you do this? You can assume that the admins have set up ldap.conf
+    correctly to reduce the amount of switches you'll need. (3 marks)
+6.  Give me an LDAP search filter that'll find all the users with YearsPaid less
+    than one (shouldn't be any lower than -1), and in the member group? (3
+    marks)
 7.  What does LDAP stand for? (2 mark)
-8.  How would you produce an LDIF if the LDAP server was running normally? (1 mark)
+8.  How would you produce an LDIF if the LDAP server was running normally? (1
+    mark)
 9.  How would you produce one if it was down? (1 mark)
-10.  Name 2 generic LDAP tools, other then the one you used earlier. (2 marks)
-11.  What does re-indexing the LDAP database mean? (1 mark)
-12.  How would you do this? (2 marks)
-13.  In the context of an LDAP search, what do the following normally mean?
+10. Name 2 generic LDAP tools, other then the one you used earlier. (2 marks)
+11. What does re-indexing the LDAP database mean? (1 mark)
+12. How would you do this? (2 marks)
+13. In the context of an LDAP search, what do the following normally mean?
     1.  o
     2.  ou
     3.  cn
@@ -162,24 +223,30 @@ title: 'Admin Test 2010 AGM'
 
 (31 marks)
 
-1.  Name three filesystems. Tell us a useful bit of information about each of them. No NTFS plx. (5 marks)
+1.  Name three filesystems. Tell us a useful bit of information about each of
+    them. No NTFS plx. (5 marks)
 2.  What's an LVM? (2 marks)
 3.  Explain what the sticky bit on a directory does. (2 marks)
 4.  How would you find the inode number of a file? (2 marks)
 5.  Now that you've found the number, what is an inode? (2 marks)
-6.  Why would you ever want to know an inode's number anyway? What's it useful for, other then designing filesystems? (2 marks)
-7.  Explain in as much detail as you can the difference between symbolic links and hard links. How would you create each? Why are hard links useful for incremental backups? (1 + 2 + 2 = 5 marks)
-8.  Explain what each bit of this line means, and tell us where we found it:  
+6.  Why would you ever want to know an inode's number anyway? What's it useful
+    for, other then designing filesystems? (2 marks)
+7.  Explain in as much detail as you can the difference between symbolic links
+    and hard links. How would you create each? Why are hard links useful for
+    incremental backups? (1 + 2 + 2 = 5 marks)
+8.  Explain what each bit of this line means, and tell us where we found it:
 
     
UUID=3835ca8f-3c96-4597-a027-32c7a0962c07 /var/tmp        ext3    nosuid,noexec,nodev,relatime        0       2

 
     (8 marks)
+
 9.  What's in /etc/mtab? (1 mark)
-10.  How did I produce the following? What do the numbers mean, roughly?  
+10. How did I produce the following? What do the numbers mean, roughly?
+
 
     
     Filesystem  blocks   quota   limit   grace   files   quota   limit   grace
     192.168.0.21:/storage
-                    26151752  30000000 33000000          385837  1800000 2000000  
+                    26151752  30000000 33000000          385837  1800000 2000000
     					

 
     (2 marks)
@@ -188,39 +255,72 @@ title: 'Admin Test 2010 AGM'
 
 (33 marks)
 
-1.  What's a pf? Sounds a bit like poof. What's a server doing acting like a poof? (2 marks)
-2.  Aside from creating a massive headache and an epic looking spaghetti jungle behind the racks, why do we have three different networks? (1) What does each of them do? (1) They're all plugged into the same physical switch. How does this not result in chaos? (3) (1+1+3 = 5 marks)
-3.  So, Redbrick's primary link has died, and you need to bring up the secondary link on our switch. Give the commands to do this, assuming that the secondary link is gi0/47 (4 marks)
-4.  Give the names of, and examples of things that happen in any 4 of the 7 OSI layers. (4 marks)
+1.  What's a pf? Sounds a bit like poof. What's a server doing acting like a
+    poof? (2 marks)
+2.  Aside from creating a massive headache and an epic looking spaghetti jungle
+    behind the racks, why do we have three different networks? (1) What does
+    each of them do? (1) They're all plugged into the same physical switch. How
+    does this not result in chaos? (3) (1+1+3 = 5 marks)
+3.  So, Redbrick's primary link has died, and you need to bring up the secondary
+    link on our switch. Give the commands to do this, assuming that the
+    secondary link is gi0/47 (4 marks)
+4.  Give the names of, and examples of things that happen in any 4 of the 7 OSI
+    layers. (4 marks)
 5.  136.206.15.0 to 136.206.15.255 is how big a subnet? (in bits) (2 marks)
 6.  136.206.218.123/28\. What's the /28 usually called? (1 mark)
-7.  Give the ports on which two services would usually listen, excluding telnet, FTP, HTTP or SSH. (2 marks)
+7.  Give the ports on which two services would usually listen, excluding telnet,
+    FTP, HTTP or SSH. (2 marks)
 8.  What is tcpdump? (1 mark)
 9.  What is a VLAN? (2 marks)
-10.  What is a VPN? Name a piece of software that you might use to create one. (2 marks)
-11.  How would you add a route to the routing table of an OS of your choice? (2 marks)
-12.  How would you add an IP alias to an interface on an OS of your choice? The interface is already up, and you don't want to disrupt the existing link. (2 marks)
-13.  Identd runs on port 113, but it runs under the xinetd user. How is this possible? Why is it strange? (2 marks)
-14.  How would you log into redbrick's switch? (Any method that works on a Cisco will do). (2 marks)
+10. What is a VPN? Name a piece of software that you might use to create one. (2
+    marks)
+11. How would you add a route to the routing table of an OS of your choice? (2
+    marks)
+12. How would you add an IP alias to an interface on an OS of your choice? The
+    interface is already up, and you don't want to disrupt the existing link. (2
+    marks)
+13. Identd runs on port 113, but it runs under the xinetd user. How is this
+    possible? Why is it strange? (2 marks)
+14. How would you log into redbrick's switch? (Any method that works on a Cisco
+    will do). (2 marks)
 
 ## Hardware
 
 (33 marks)
 
-1.  Redbrick recently bought a giant storage array.It's a direct attached storage device connecting to a SAS RAID controller (a Dell PERC6/E sitting in minerva). It contains 10 15000RPM 3.5" SAS disks in RAID 10, has two power supplies and shows up on Linux as /dev/sda.
-    *   What's the difference between a direct attached storage device and a network attached storage device? (1 mark)
-    *   What's RAID do (in general, no need for discussion on individual levels). (1 mark)
-    *   Explain what RAID 10 means. (3 marks)
-    *   The disks are 15,000RPM disks with SAS interfaces. They're fast. Name one other type of interface you might find on a disk in the Redbrick room, and name one other common disk speed that you might find in the redbrick room. Regarding the interface, is it generally slower or faster then a SAS interface? (3 marks)
-    *   Why would we want two power supplies in a piece of hardware? (1 mark).
-    *   There's ten disks. /dev/sda only represents one disk. Why is this? (2 marks).(1+1+3+3+1+2 = 11 marks)
-2.  Sonic wants to replace the new and old storage arrays with 5 shiney SSD drives in a RAID10 setup. Is this madness or IS THIS SPARTA? Explain your answer by giving the advantages/disadvantages to the system. (3 marks)
-3.  Thunder, with it's crazy prioprietary hardware RAID controller, has a dead disk. How do you know and how do you find out which disk? (very vague answer accepted) (1 marks)
-4.  RAID1/RAID5/RAID6\. Give me minimum number of disks. Which is more space efficent? How do they work? (3* 3 marks +1 = 10 marks)
-5.  Pick a current intel processor and give 3 technical reasons why it rocks your cpu socks. (3 marks)
-6.  What architecture is murphy? Why has this caused us headaches in the past? (2 marks)
-7.  What is this architecture good at? What is it really, really, really bad at?(2 marks)
+1.  Redbrick recently bought a giant storage array.It's a direct attached
+    storage device connecting to a SAS RAID controller (a Dell PERC6/E sitting
+    in minerva). It contains 10 15000RPM 3.5" SAS disks in RAID 10, has two
+    power supplies and shows up on Linux as /dev/sda.
+    - What's the difference between a direct attached storage device and a
+      network attached storage device? (1 mark)
+    - What's RAID do (in general, no need for discussion on individual levels).
+      (1 mark)
+    - Explain what RAID 10 means. (3 marks)
+    - The disks are 15,000RPM disks with SAS interfaces. They're fast. Name one
+      other type of interface you might find on a disk in the Redbrick room, and
+      name one other common disk speed that you might find in the redbrick room.
+      Regarding the interface, is it generally slower or faster then a SAS
+      interface? (3 marks)
+    - Why would we want two power supplies in a piece of hardware? (1 mark).
+    - There's ten disks. /dev/sda only represents one disk. Why is this? (2
+      marks).(1+1+3+3+1+2 = 11 marks)
+2.  Sonic wants to replace the new and old storage arrays with 5 shiney SSD
+    drives in a RAID10 setup. Is this madness or IS THIS SPARTA? Explain your
+    answer by giving the advantages/disadvantages to the system. (3 marks)
+3.  Thunder, with it's crazy prioprietary hardware RAID controller, has a dead
+    disk. How do you know and how do you find out which disk? (very vague answer
+    accepted) (1 marks)
+4.  RAID1/RAID5/RAID6\. Give me minimum number of disks. Which is more space
+    efficent? How do they work? (3\* 3 marks +1 = 10 marks)
+5.  Pick a current intel processor and give 3 technical reasons why it rocks
+    your cpu socks. (3 marks)
+6.  What architecture is murphy? Why has this caused us headaches in the past?
+    (2 marks)
+7.  What is this architecture good at? What is it really, really, really bad
+    at?(2 marks)
 
 ## Bonus
 
-1.  Hit refresh at the end of your test to see the super shiny bonus round! We haven't written it yet.
+1.  Hit refresh at the end of your test to see the super shiny bonus round! We
+    haven't written it yet.
diff --git a/source/help/exams/admin-test-2010-egm/index.md b/content/help/exams/admin-test-2010-egm.md
similarity index 61%
rename from source/help/exams/admin-test-2010-egm/index.md
rename to content/help/exams/admin-test-2010-egm.md
index 46fb97c..07c6d44 100644
--- a/source/help/exams/admin-test-2010-egm/index.md
+++ b/content/help/exams/admin-test-2010-egm.md
@@ -1,10 +1,13 @@
 ---
-title: 'Admin Test 2010 EGM'
+title: Admin Test 2010 EGM
 ---
 
-1\. The first half hour is for scripting. During this time, man, info, apropos, perldoc, pydoc, etc (anything that's installed on redbrick) may be accessed. The internet may not.
+1\. The first half hour is for scripting. During this time, man, info, apropos,
+perldoc, pydoc, etc (anything that's installed on redbrick) may be accessed. The
+internet may not.
 
-2\. After the first half hour you may not access anything other than a text editor.
+2\. After the first half hour you may not access anything other than a text
+editor.
 
 3\. We're watching you. Fun has a machete.
 
@@ -16,33 +19,47 @@ GOOD LUCKS
 
 ### a=b;b=c;c=b;c=$((321 >> 3));echo $((a)) marks
 
-1\. There have been a lot of failed login attemps lately, write a script to search through /var/log/auth.log and print out a list of the most frequently failed logins in the format: Number of failed logins user name ip address ( should put some example data in /var/tmp o r something) 13 marks
+1\. There have been a lot of failed login attemps lately, write a script to
+search through /var/log/auth.log and print out a list of the most frequently
+failed logins in the format: Number of failed logins user name ip address (
+should put some example data in /var/tmp o r something) 13 marks
 
-2\. Write me a script that scans /webtree for world readable wp-config.php files. When found you should email the user about the security risk and send an email to system-reports with a list of all files found. 13 marks
+2\. Write me a script that scans /webtree for world readable wp-config.php
+files. When found you should email the user about the security risk and send an
+email to system-reports with a list of all files found. 13 marks
 
-3\. There's been some problems with java processes crashing the system. Write a cron script (to run every 5 minutes) that will kill all java processes and alert the admins is the average load is above 5 13 marks
+3\. There's been some problems with java processes crashing the system. Write a
+cron script (to run every 5 minutes) that will kill all java processes and alert
+the admins is the average load is above 5 13 marks
 
 4\. Write a script to amuse me 1 mark
 
-**No more use of man, info, apropos, perldoc, pydoc, etc (anything that's installed on redbrick) after this section. Fun _will_ cut you if you do not comply.**
+**No more use of man, info, apropos, perldoc, pydoc, etc (anything that's
+installed on redbrick) after this section. Fun _will_ cut you if you do not
+comply.**
 
 ## General
 
 30 marks
 
-1\. What are (5*1 mark each) -syslog-ng -nagios -munin -exim -postgres
+1\. What are (5\*1 mark each) -syslog-ng -nagios -munin -exim -postgres
 
-2\. You just entered your password as your username when logging in via PuTTY. Is this bad? If so, explain how. 2 marks
+2\. You just entered your password as your username when logging in via PuTTY.
+Is this bad? If so, explain how. 2 marks
 
 3\. What are ulimits? Why do we have them? How do you set them? 2 marks
 
-4\. You need to log in as root on a server, but no one remembers the password - what do you do? 3 marks
+4\. You need to log in as root on a server, but no one remembers the password -
+what do you do? 3 marks
 
-5\. What is the syntax of a cron job? How would you edit a specific users crontab? 2 marks
+5\. What is the syntax of a cron job? How would you edit a specific users
+crontab? 2 marks
 
 6\. What is init? What are runlevels? 4 marks
 
-7\. How can you find out which user or process has a file open or is using a particular file system (so that you can unmount it)? How would you unmount it anyway? 3 marks
+7\. How can you find out which user or process has a file open or is using a
+particular file system (so that you can unmount it)? How would you unmount it
+anyway? 3 marks
 
 8\. What is a sticky bit? Explain how it works. 2 marks
 
@@ -58,25 +75,39 @@ GOOD LUCKS
 
 30 marks
 
-1\. A user complains that they get an error message about too many clients already connected when trying to join some public irc network. What command would you run to find out who is connected to that network from redbrick? 2 marks
+1\. A user complains that they get an error message about too many clients
+already connected when trying to join some public irc network. What command
+would you run to find out who is connected to that network from redbrick? 2
+marks
 
-2\. Why might creating set[ug]id scripts be a bad idea? Why does it probably not really matter (on Linux at least)? 3 marks
+2\. Why might creating set[ug]id scripts be a bad idea? Why does it probably not
+really matter (on Linux at least)? 3 marks
 
-3\. You're about to do some mad editing of config files, changing permissions and some other jazz. What should you run to record everything you do in case something goes wrong and you need to look over what you did? What other precautions could you take? 3 marks
+3\. You're about to do some mad editing of config files, changing permissions
+and some other jazz. What should you run to record everything you do in case
+something goes wrong and you need to look over what you did? What other
+precautions could you take? 3 marks
 
-4\. How would you list all running processes? How would you list only instances of apache? How would you only list their pids? 3 marks
+4\. How would you list all running processes? How would you list only instances
+of apache? How would you only list their pids? 3 marks
 
-5\. What commands would you issue to: Find the amount of free space on a disk 2 marks Find the UUID of a partition 2 marks Search for a package 2 marks Edit a users quota 2 marks
+5\. What commands would you issue to: Find the amount of free space on a disk 2
+marks Find the UUID of a partition 2 marks Search for a package 2 marks Edit a
+users quota 2 marks
 
 6\. How would you set a default route? 2 marks
 
 7\. How would you check the load on a machine? 1 marks
 
-8\. Lithium is transferring most of the radio transmissions from apollo 11 into his home dir. One of the files is 300M. How yould you change his filesize quota? 2 marks
+8\. Lithium is transferring most of the radio transmissions from apollo 11 into
+his home dir. One of the files is 300M. How yould you change his filesize quota?
+2 marks
 
 9\. How would you bring up an interface? 2 marks
 
-10\. What command would you use to delete downloaded package files. 1 mark11\. You can't run uptime to check load, and top is also not starting. How else would you check load averages? 3 marks
+10\. What command would you use to delete downloaded package files. 1 mark11\.
+You can't run uptime to check load, and top is also not starting. How else would
+you check load averages? 3 marks
 
 ## BSD
 
@@ -90,11 +121,13 @@ GOOD LUCKS
 
 4\. /dev/amrd2s1a Explain it plz. 3 marks
 
-5\. BSD breaks up your drive into little letters. Why should you not mount anything on b? 3 marks
+5\. BSD breaks up your drive into little letters. Why should you not mount
+anything on b? 3 marks
 
 6\. How would you go about searching for nagios in ports? 3 marks
 
-7\. OMG, there's no /etc/init.d in openBSD. How (generally) do I restart a program? 3 marks
+7\. OMG, there's no /etc/init.d in openBSD. How (generally) do I restart a
+program? 3 marks
 
 ## Networking
 
@@ -106,13 +139,16 @@ GOOD LUCKS
 
 3\. What is port knocking? What is it used for? 2 marks
 
-4\. Redbrick has a /23\. What's that? How many IP addresses does that mean we have? 3 marks
+4\. Redbrick has a /23\. What's that? How many IP addresses does that mean we
+have? 3 marks
 
-5\. What are the differences between a switch, a hub and a router? What OSI layers do they work on? 4 marks
+5\. What are the differences between a switch, a hub and a router? What OSI
+layers do they work on? 4 marks
 
 6\. Three commands to do a dns lookup please. 3 (1 mark each)
 
-7\. What is a VLAN? Why are they awesome? Redbrick has three. What do we use them for? 4 marks
+7\. What is a VLAN? Why are they awesome? Redbrick has three. What do we use
+them for? 4 marks
 
 8\. What is a VPN? Why do we use one? 2 marks
 
@@ -124,19 +160,25 @@ GOOD LUCKS
 
 25 marks
 
-1\. You've just been elected! What steps do you take to ensure your account is secure? 3 marks
+1\. You've just been elected! What steps do you take to ensure your account is
+secure? 3 marks
 
-2\. You have found an abandoned root shell, what steps would you take to give yourself a backdoor? 2 marks
+2\. You have found an abandoned root shell, what steps would you take to give
+yourself a backdoor? 2 marks
 
 3\. Explain how a buffer overflow works. 3 marks
 
 4\. Why should you not run things like shadowmap? 2 marks
 
-5\. You have just freshly installed a shiny new ubuntu server. What are the first steps you would take to secure it? 3 marks
+5\. You have just freshly installed a shiny new ubuntu server. What are the
+first steps you would take to secure it? 3 marks
 
 6\. What are ssh keys? Why should you not use them to log in? 2 marks
 
-7\. You attempt to log in one day and you see this: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ Should you panic? What could have happened? 2 marks
+7\. You attempt to log in one day and you see this:
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @ WARNING: REMOTE HOST IDENTIFICATION HAS
+CHANGED! @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ Should you panic? What could have
+happened? 2 marks
 
 8\. Describes the steps that happen when a user runs passwd 2 marks
 
@@ -150,43 +192,55 @@ GOOD LUCKS
 
 20 marks
 
-1\. Name 3 different file systems and explain the differences between them (fat12, fat16 and fat32 do not count as 3 different file systems) 3 marks
+1\. Name 3 different file systems and explain the differences between them
+(fat12, fat16 and fat32 do not count as 3 different file systems) 3 marks
 
-2\. Explain what this means: UUID=c0837187-288f-4dbc-b9de-06d2403a5985 / ext4 errors=remount-ro 0 1 How would you find the name of the device that / is mounted on? 6 marks
+2\. Explain what this means: UUID=c0837187-288f-4dbc-b9de-06d2403a5985 / ext4
+errors=remount-ro 0 1 How would you find the name of the device that / is
+mounted on? 6 marks
 
 3\. What command do you run to check file system consistency? 2 marks
 
-4\. What are the differences between hard and soft links? What are soft links useful for? 3 marks
+4\. What are the differences between hard and soft links? What are soft links
+useful for? 3 marks
 
 5\. What's an inode? 1 mark
 
-6\. How would you find the inode number of a file? How would you delete a file by it's inode number? 5 marks.
+6\. How would you find the inode number of a file? How would you delete a file
+by it's inode number? 5 marks.
 
 ## Hardware
 
 25 marks
 
-1\. What architecture is murphy? What is it good for? Whay does it fail hard at? 3 Marks
+1\. What architecture is murphy? What is it good for? Whay does it fail hard at?
+3 Marks
 
-2\. What is RAID? What are the advantages and disadvantages of Hardware and software RAID? Explain RAID 0, 1, and 5\. How many disks are needed for each? 1+2+2+2+2=9 marks
+2\. What is RAID? What are the advantages and disadvantages of Hardware and
+software RAID? Explain RAID 0, 1, and 5\. How many disks are needed for each?
+1+2+2+2+2=9 marks
 
 3\. Why, when you're buying a server, is a management card important? 2 marks
 
 4\. What is an IP-KVM and why do we need one? 2 marks
 
-5\. What is a UPS? Why do we want them taking up our rack space? How could we use this to shut down the machines in a power failure? 4 marks
+5\. What is a UPS? Why do we want them taking up our rack space? How could we
+use this to shut down the machines in a power failure? 4 marks
 
-6\. DAS, how soes it differ from NAS? Advantages and disadvantages please. 2 marks
+6\. DAS, how soes it differ from NAS? Advantages and disadvantages please. 2
+marks
 
 7\. What is SAS, how does it differ from scsi? 2 marks.
 
-8\. What temperature should the server room be? What do you do if you ever turn the aircon off? 1 mark
+8\. What temperature should the server room be? What do you do if you ever turn
+the aircon off? 1 mark
 
 ## Bonus Round
 
 +-"Your mother" marks  
 1\. Tabs or spaces?  
-2\. The python style guide states that you should murder your parents and all your extended family for best practices. Should you follow it?  
+2\. The python style guide states that you should murder your parents and all
+your extended family for best practices. Should you follow it?  
 3\. vim or emacs?  
 4\. What is your favourite OS (Insta fail for solaris)?  
 5\. GPL or BSD licence?  
diff --git a/content/help/exams/admin-test-2011-agm.md b/content/help/exams/admin-test-2011-agm.md
new file mode 100644
index 0000000..dc172b5
--- /dev/null
+++ b/content/help/exams/admin-test-2011-agm.md
@@ -0,0 +1,197 @@
+---
+title: Admin Test 2011
+---
+
+## Scripting - (40 marks)
+
+1.  So, upstart is shit. You've noticed that it doesn't seem to start syslog-ng.
+    Write a script to check if it's running. If it isn't, start it. (13 marks)
+2.  Some cunts keep housing warez on their webspace and the IRMA or IMRO or
+    whatever they're calling themselves this week are fed up sending us cease
+    and desists. Once more strike and we're out. Write me a script that searches
+    /webtree for files of the following types (mp3, avi, wma, wmv, aac, flac),
+    chmods the files to 000, emails the user with a warning to take it down, and
+    emails a list of files to admins (15 marks)
+3.  We're moving /storage from minerva to azazel. Some users (cough cough) have
+    a bigger quota than the default 2G. This will mess everythig up for cunts
+    like fun when we move. Write me a script to check all users quotas and email
+    a list of all users with non-default quotas to admins@redbrick.dcu.ie in the
+    following format: Username Quota (8 marks)
+4.  Some users also have a different filesize quota (default is 150M), email a
+    list of users with a bigger filesize quota to admins in the form: Username
+    Filesize_quota. Hint: limits.conf (5 marks)
+5.  Write a script that amuses me. (2 mark)
+
+## General - (35 marks)
+
+1.  Minerva has booted without any swap space because the line in fstab was
+    commented out. What command would you use to activate the swap space and
+    stop asplosions? (3 marks)
+2.  What does DHCP stand for? What does it do? Why would redbrick want a DHCP
+    server?(2 marks)
+3.  MySQL has taken a spa attack, and you can't get the damn thing to start
+    again. What steps would you take to figure out why it's behaving like this?
+    (2 marks)
+4.  You've noticed your server has been getting alot of brute force attacks of
+    late. It's unlikely that any of these attempts will even be successful, but
+    the jittery paranoid guy working the controls in there, feels you should do
+    something about it. What tool could you use? How does it work? (3 marks)
+5.  You stopped minerva from exploding earlier, but, what is swap space? Why
+    would you want it? (2 marks)
+6.  What signal is sent to a process when it's suspended? What signal is sent to
+    it when it's resumed? (2 marks)
+7.  Some spa has pissed you off, how would you kill all of their processes in
+    one go? (1 mark)
+8.  Tell me what the following are and give me a brief description of what they
+    do:
+
+- openntp
+- nginx
+- apparmor
+- git
+
+10. You've updated LDAP, but the old information is still appearing. What the
+    hell is causing this? (1 mark)
+11. What's utmp? (1 mark)
+12. How do you change the root password? Now that you've changed it, how do you
+    inform the other rootholders securely? (1 mark)
+13. nsswitch.conf, what's this bollocks? (3 marks)
+14. How would you check what library calls a program is making? (2 marks)
+15. What is /proc? What is contained in /proc? How does /proc differ in linux
+    and BSD? (4 marks)
+16. What is a umask? What is a suitable value for a umask and why? (3 marks)
+17. What is chkrootkit? (1 mark)
+
+## Linux - 20 marks
+
+1.  Give me 2 different ways of searching for a specific man page.(1 mark)
+2.  How would I find out if a specific package is installed? (2 marks)
+3.  Some dickhead has made uptime, top, etc point to /dev/null. How am I
+    supposed to be able to tell what the load average is now? (2 mark)
+4.  You find yourself at a shell, but you've no idea what distro the machine is.
+    How would you find out what distro it's running? (1 mark)
+5.  Imagine a scenario where redbrick needs to modify a package (Unimaginable, I
+    know). You have the source and have made your mad hacks^W^W changes. How
+    would you rebuild the package?( 3 marks)
+6.  What command can you use to view boot messages?(2 marks)
+7.  Why should you not use useradd? (What does it not do by default) (2 marks)
+8.  5\. Grub 2 on 10.04 doesn't like giving you a grub menu on boot. Where do I
+    change this? What option needs to be unset/set?(3 marks)
+9.  What is selinux? What does it do? (4 marks)
+
+## Networking - 20 marks
+
+1.  What is NAT? How does it work?(2 marks)
+2.  How would I go about activating a port on hadron?(5 marks)
+3.  OMG! WE'RE OUT OF IPV4 ADDRESSES! Should I be worried?(1 mark)
+4.  Redbrick has a /23\. What's that then? So how many usable addresses do we
+    have? How much would it fetch on the IP black market? Supply and demand you
+    know.( 2 marks)
+5.  What is DNS? How does it work? What happens if our DNS server doesn't know
+    what crack we're smoking?(Translation: If the DNS server we're querying
+    doesn't know redbrick.dcu.ie)(3 marks)
+6.  What is STP? How does it work?(4 marks)
+7.  A command to show the routing table on your linux or BSD of choice plox.(1
+    marks)
+8.  what is inetd? (2 marks)
+
+## Security - 20 marks
+
+1.  What is a buffer overfow, and how can it be used in an attack? ( 2 marks)
+2.  So like, what could be possibly be wrong with this code? (2 marks)
+
+```
+#include 
+#include 
+#include 
+#include 
+int main(void) {
+  int uid;
+  uid=getuid();
+  setuid(0);
+  system("useradm resetpw");
+  setuid(uid);
+  return(0);
+}
+```
+
+4.  What does it mean to chroot a process? What effect does this have on
+    security?(2 marks)
+5.  What lists should a young elected admin subscribe to to keep abreast of
+    security issues? (1 mark)
+6.  What is the deal with these permissions? What bits are set? What user/group
+    would it run as? -rws--s--x 1 fun committe 66 2011-02-07 23:36 waf.sh (3
+    marks)
+7.  How does ssl help ensure secure data transmission? How do you know that the
+    SSL cert is legit? (3 marks)
+8.  What's a canary? (2 marks)
+9.  What is a honeypot? How does it work? (2 marks)
+10. `.:/bin:/sbin:local/bin:/bin::/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin`
+    Why is this insecure? (3 marks)
+
+## (Open|Free)BSD - 14 marks
+
+1.  Why should you not mount anything on b? (1 mark)
+2.  You're trying to install something on OpenBSD because it's not in the damn
+    base system. You run: _pkg_add -v
+    http://ftp.heanet.ie/pub/OpenBSD/4.7/packages/i386/wget-1.12p0.tgz_  
+    But the damn thing is just hanging. Why? How do you fix it? (2 marks)
+3.  What's pf? Where would you find it's config file? Y? (2 marks)
+4.  YOu've edited the config file mentioned above, but nothing's changed. What's
+    the command to fix this sorcery?(2 marks)
+5.  What is a jail? How does it work? (2 marks)
+6.  Give me the command to install screen from ports. (2 marks)
+7.  What is a securelevel? Explain how they work. (3 marks)
+
+## Filesystems - 25 marks
+
+1.  What's an inode? How would you find out a file's inode number? (2 marks)
+2.  Give me the command to delete a file by it's inode number. Why would I ever
+    need to do that? (3 marks)
+3.  What's a sticky bit? (Not the one that frequently ends up in gw's ma) (1
+    mark)
+4.  Name 3 filesystems, name at least one difference between them. Which one
+    would you choose over the other two? Why? (3 marks)
+5.  Briefly describe (as in, don't write a ridiculous essay, but convey your
+    understanding) the Filesystem Hierarchy. (3 marks)
+6.  What is a journalling filesystem? Why would you use one? (2 marks)
+7.  What's a hard link? What's a soft link? What's the difference between
+    hard-links and soft-links? What are the commands to hard-link and soft-link
+    files? (3 marks)
+8.  What are ctime, atime and mtime? (3 marks)
+9.  You have an ext2 filesystem. You cannot create a file on a partition.
+    Permissions are fine. The partition is not mounted read-only. What else
+    could be the culprit? (2 marks)
+10. UUID=0a57784e-0867-49be-995b-343a2e1a8682 /webmasterporn ext3 relatime 0 2
+    What the fuck is this shit? Where is it from? FOR THE LOVE OF GOD WHAT DOES
+    IT MEAN? (3 marks)
+
+## Hardware - 16 marks
+
+1.  Why are ALOMs the sex? (1 mark)
+2.  _Generic RAID question_ Explain the following RAID levels, advantages and
+    disadvantages and minimum number of disks: RAID 0 RAID 1 RAID 5 RAID 10 and
+    for shits and giggles, RAID 6 (6 marks)
+3.  So you're speccing up a new server for redbrick, but on a limited budget.
+    You can either get a badass processor and a moderate amount of ram, or a
+    mahoosive amount of ram, and a moderate processor. What do? More
+    importantly, why? (3 marks)
+4.  So like, I compiled something on murphy, but it doesn't run on minerva? What
+    sorcery is this? (1 mark)
+5.  What hardware is azazel rockin'? (1 mark)
+6.  I need to know the UUID of a disk pronto. What command could I use to find
+    this out? (2 marks)
+7.  DDR2 and DDR3\. What's the difference? (2 marks)
+
+## Bonus\* - 1,000,000 marks
+
+1.  Pet swans. Why can't redbrick have any?
+2.  Obviously fun cannot be bought, but if he could, how many pints would you
+    buy him?
+3.  Why is port knocking on a server different from gw's ma?
+4.  Which distro of (Li|U)NIX is most like mak's sister and why?
+5.  What would you do to the people who wrote upstart if you ever met them?
+6.  Nano or vim? (Note your life depends on this. If you use emacs you're
+    already in hell)
+7.  If elected, will you question my homedir size? I NEED THOSE 5 DIFFERENT
+    VERSIONS OF GCC
diff --git a/content/help/exams/admin-test-2012-agm.md b/content/help/exams/admin-test-2012-agm.md
new file mode 100644
index 0000000..e69f86d
--- /dev/null
+++ b/content/help/exams/admin-test-2012-agm.md
@@ -0,0 +1,304 @@
+---
+title: Admin Test 2012 AGM
+---
+
+252 marks total
+
+---
+
+---
+
+## Scripting (40 marks)
+
+1 - gamma refuses to fulfill the scripture and run for admin to follow in his
+brother's footsteps. The gods have been angered that they are being denied the
+second coming of atlas. They have given you the task of killing all of gamma's
+processes every 5 minutes, however, you may not use pkill, pgrep or killall. Go!
+(9 marks)
+
+2 - In a move to stamp out the LOLSORANDUM crew haus has asked you to write a
+script that will:
+
+- Get a list of all users in CA1
+- Find any files they own that contain the substring "lol" (case insensitive)
+- Delete the files
+- Email the path of each file you delete to the member of "the crew" and make an
+  insulting remark about their mother. (15 marks)
+
+3 - Write a monitoring script that writes to syslog. It should have a start &
+stop operation. 'start' begins monitoring of iostat and load_avg. It should use
+variables $IO_INTERVAL & $LOAD_AVG_INTERVAL to determine when it writes each to
+syslog. 'stop' should kill every instance of monitoring. (15 marks)
+
+4 - Write a script to amuse me (1 mark)
+
+---
+
+## Practical (40 Marks)
+
+1.  I want a /var/tmp partition, but forgot to create one. Motherfucker. Resize
+    /home for me so we have 1G free space. Create a partition in this free
+    space, and an ext4 filesystem. Make sure it mounts on boot. (30 marks)
+
+2.  The Vms are running linux-server. Install linux_generic and make it the
+    bootable kernel.(10 marks)
+
+---
+
+## General (31 marks)
+
+1 - What's UNSCD? What does it do? (2 marks)
+
+2 - You've catted a binary and now your terminal has had a spa attack. What
+command will fix it? (1 mark)
+
+3 - What's RCS? Why would it ever be used? If you're fun, what do you enjoy
+doing because you "can't be dealing with checking files in and out" to get
+around it? What do you hit him with when he does this? (3 marks)
+
+4 - Give a situation in which you would use the following commands: renice
+swapon dig telnet (1 mark each)
+
+5.  What are the following;
+
+- Exim
+- NFS
+- Dirvish
+- Nagios (1 mark each)
+
+6.  You have written a script which you want to execute at 5 minutes past
+    midnight every thursday. What would you use for this? What command would you
+    use to modify it? What would the configuration line be (Assume the script is
+    /opt/lol.sh)? (3 marks)
+
+7.  Ideally what temperature should the server room be kept at? (1 mark)
+
+8.  Give me 2 different ways of searching for a specific man page? (1 mark)
+
+9 - A user wants to upload an iso of damn vulnerable linux, but he isn't allowed
+own files that large What file do you need to edit to change this? (1 mark)
+
+11 - What is an IP KVM? Why are they awesballs? (2 marks)
+
+12 - How would you view the current mail queue? (exim specific answer plx) (3
+marks)
+
+13 - How would you suspend a process? What signal would you send it? How would
+you resume it? What signal would you use? (2 marks)
+
+14 - What is an LDIF? What tool would you use to generate an LDIF? (2 marks)
+
+15 - Which is the shit one, useradd or adduser? What makes the other one shit?
+(2 marks)
+
+---
+
+## \*NIX/Linux (25 marks)
+
+1 - Where are crontabs located? (1 mark)
+
+2.  We compress old log files to save space. You need to view one of these
+    compressed log files. How do you go about this without uncompressing the
+    file first. (1 mark)
+
+3.  apt-get install fails to complete sucessfully on a new server. What could be
+    wrong? (2 marks)
+
+4.  You have a file which you want to add to every new users home directory when
+    it is created. What directory should this file go in and what do you have to
+    do when creating an account for it to take affect? (2 marks)
+
+5.  How do you assign multiple ip addresses to a network interface? (1 mark)
+
+6.  You are trying to umount a filesystem (/storage) however it is currently
+    busy. How can you find out what user/process is using it and kill it? How
+    can you umount it without killing it? (2 marks)
+
+7.  What linux utility can you use to see what library calls a process makes? (2
+    marks)
+
+8.  Carbon just shutdown unexpectedly. What can be done to identify what went
+    wrong? (1 marks)
+
+9 - What command can you use to view boot messages? (2 marks)
+
+10 - What is /etc/nsswitch.conf used for? When would you need to edit this file?
+(3 marks)
+
+11 - Explain briefly what an nrpe plugin is. (2 marks)
+
+12 - chroot. What be it? When might you find it useful? (2 marks)
+
+13 - What command would you use to show the amount of free space on a
+parition?(1 mark)
+
+14 - Why should you avoid using kill -9? (1 mark)
+
+15 - What's /dev/kmem? What's /dev/mem? Explain the difference? (2 marks)
+
+---
+
+## Files & Filesystems (30 marks)
+
+1 - Briefly explain what ctime, mtime and atime are in regards to a file. How
+would you retrieve each of these? (4 marks)
+
+2 - What are these filesystems used for, on an average linux installation? (3
+marks) /proc /bin /etc
+
+3 - Name 3 filesystems. different filesystem versions within the same family of
+filesystems will not be accepted (3 marks)
+
+4 - Give at least one difference between each filesystem. (3 marks)
+
+5 - Explain as verbosely as you can the difference between a hard link and a
+soft link. What command creates each of them? (3 marks)
+
+6 - Why are hard links & incremental backups best buds? (2 marks)
+
+7 - What command will give me the UUID of a partition? (The answer does not
+involve cat) (2 marks)
+
+8 - What's an inode? (1 mark)
+
+9 - How would you find the inode number of a file? How would you delete a file
+by its inode number? Why would you want to? (4 marks)
+
+10 - What goes in /etc/fstab? How about /etc/dfstab? and /etc/mtab? (3 marks)
+
+11 - drwxrwxrwt 3 root root 4096 2012-03-26 15:27 /var/tmp
+
+What does the t mean? (1 marks)
+
+12 - What does fsck do? When would you use it? (2 marks)
+
+---
+
+## (Open|Free)BSD (20 marks)
+
+1 - What's a securelevel? Briefly explain how it works. (2 marks)
+
+2 - What is a jail? When would you use one? (2 marks)
+
+3 - OpenBSD's installer is seperating your disk into alphabetically numbered
+sections. What's a is root, b is swap, but what's c? (2 marks)
+
+4 - You're running pf on OpenBSD. You've changed the config and restarted pf.
+Why aren't the new rules you've added showing up? (2 marks)
+
+5 - How do you update the ports tree on FreeBSD? (2 marks)
+
+6 - FreeBSD doesn't have a /etc/init.d and no upstart either, where the jesus
+are its startup scripts? (2 marks)
+
+7 - Okay, you've figured out where the startup scripts are on FreeBSD but it
+turns out you actually want to restart ssh on OpenBSD. Give me the command to do
+it. (2 marks)
+
+8 - What file do you have to edit to change the default route on FreeBSD? (2
+marks)
+
+9 - You're trying to install something using pkg_add but it's just hanging
+there. Name 2 things you should do to try and fix it. (2 marks)
+
+10 - How do you delete a user on OpenBSD? (2 marks)
+
+---
+
+## Networking (24 Marks)
+
+1.  Yer auld wan needed help with her NAT, and I gave it to her. What is NAT?
+    Why is it useful? Where would you see it used? 2 marks
+
+2.  Redbrick have two switches. What OS are they running? Give me the steps to
+    see the port configuration on a switch running this OS. 4 marks
+
+3.  Speaking of switches, What is a switch? How does it work? On what OSI layer?
+    Compare to a router and a hub. 4 marks
+
+4.  WHO HAS any idea about ARP? What is it? How would I use it to give an IP
+    address to a device? How could I take advantage of ARP for a man in the
+    middle attack? 4 marks
+
+5.  Which has the highest propigation speed, fibre, coax, or cat6? Highest
+    bandwidth? 2 marks
+
+6.  Redbrick has a /23. We've broken this up into two /24s, how many useable IPs
+    do we have? 1 mark
+
+7.  What is a VLAN? How do redbrick use VLANS? Can VLANs talk to each other? 2
+    marks
+
+8.  How many IP addresses can we have under IPv4? IPv6? 1 mark
+
+9.  What ports do SNMP, SMTP, LDAP and TFTP run on? 4 marks
+
+---
+
+## Hardware (31 marks)
+
+1.  How would I find the UUID of a disk? 2 marks
+
+2.  What is a DAS? What do redbrick use one for? Compare and contrast to a NAS
+    and a SAN. 5 marks
+
+3.  Redbrick are getting a GPU for people to program on. What are the advantages
+    of GPGPU programming? Why? 3 marks
+
+4.  SATA, SAS and SCSI. What are they? Why would I use each? 4 marks
+
+5.  What is the svm flag in /proc/cpuinfo? What do we want it? 2 marks
+
+6.  What is an IP-KVM and why do we use one? 2 marks
+
+7.  What RAID configuration would you use for a cluster of 4 1TB disks housing
+    your warez? Why? 3 marks
+
+---
+
+## Security (31 marks)
+
+1.  Why are running services such as FTP, Telnet & POP a bad idea? (2 marks)
+
+2.  You have just become the a system adminstrator and have been given root.
+    What can you do to secure your account? (2 marks)
+
+3.  Name 3 files which should only be readable by root? (3 marks)
+
+4.  When scripts are executed by the webserver on redbrick they are run under
+    suexec and suphp. Why is this and why is it a good thing? (3 marks)
+
+5.  What is a firewall? Name two firewalls that redbrick have on their systems.
+    How do you list the current rules on them both? (5 marks)
+
+6.  What is wrong with the following path?
+    .:/home/user/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/games
+    How would an attacker go about exploting this? (2 marks)
+
+7.  You left a root terminal unlocked and someone has used it to do something.
+    The history files has been deleted. How do you go about finding out what
+    they did? (5 marks)
+
+8.  You have just installed a new linux server. Name 3 things you should do to
+    secure this system. (3 marks)
+
+9.  What are AppArmor and SELinux used for? (2 marks)
+
+10. Name 2 security mailing lists that you should be subscribers to as a
+    redbrick root holder. (2 marks)
+
+11. What is wrong with setuid scripts and why should they be avoided? (1 mark)
+
+---
+
+## Bonus round
+
+1.  Which HTTP response code best describes dilligaf and why?
+
+2.  Cans during the test, is this win?
+
+3.  MDMA, LSD, Cannabis, Crystal meth. Which one of these best describes you and
+    why?
+
+4.  WHAT DID THE 5 FINGERS SAY TO THE FACE? The first one to give gw the correct
+    answer gets a can.
diff --git a/content/help/exams/admin-test-2012-egm.md b/content/help/exams/admin-test-2012-egm.md
new file mode 100644
index 0000000..e8441cf
--- /dev/null
+++ b/content/help/exams/admin-test-2012-egm.md
@@ -0,0 +1,347 @@
+---
+title: Admin Test 2012 EGM
+---
+
+---
+
+Scripting (40 marks)
+
+---
+
+1.  It has come to our attention that a number of users are running services
+    that are listening on network ports.  
+    You should write a script that will kill any proccesses that are listening
+    on ports and running as users in the members of associate group. (9 marks)
+
+2.  An attacker has hacked Redbrick and gained access to root account. You are
+    preparing to reinstall the primary services and login box. Before that you
+    want to ensure that users file have not been modified.  
+    Compare the files in /storage with the latest backup copy in /backup.  
+    Email a list of the files that differ to admins. Include the path to the
+    file and the time it was modified. (15 marks)
+
+3.  Write a script that takes usernames and password hashes from /etc/shadow.
+    The script should then try and crack them using john the ripper. If the
+    password is found in under 5 minutes email the user their password and tell
+    them it's shit (15 marks)
+
+4.  Write a script to amuse me. (1 mark)
+
+---
+
+Practical (40 marks)
+
+---
+
+We have given you a VM each.
+
+1.  slapd (LDAP Server) is already installed and running on these VMs. Add a
+    user to this ldap server. (15 marks)
+
+2.  Configure apache to also listen on port 81\. When a user vists the webserver
+    on port 81 with the path /admin use mod_rewrite to redirect them to
+    http://google.ie. (15 marks)
+
+3.  You will be given a backup tar of a user's home directory. Extract this tar,
+    in the correct directory, to restore their files.
+    http://www.redbrick.dcu.ie/~isaac702/homedir.tar.gz (10 marks)
+
+---
+
+General (30 marks)
+
+---
+
+1.  What's RCS? Why might you use it? (2 marks)
+
+2.  How would you check what kernel you are running? (1 mark)
+
+3.  You are logged in remotely and you notice that the all of your servers are  
+    running very hot. What might be going on? Is it likely to be a server  
+    hardware fault? (2 marks)
+
+4.  What's a package repository? What are they used for? (2 marks)
+
+5.  What protocol might you use to allow a filesystem to be mounted over a  
+    network? (1 mark)
+
+6.  What temperature should the server room be kept at? (1 mark)
+
+7.  A badger has broken into the server room and managed to destroy the few  
+    blocks on the hdd that held find and ls. How do you, now, see what's in
+    the  
+    current directory? (1 mark)
+
+8.  What's OpenVZ? How is it different to KVM? Should you allow users login  
+    access on a OpenVZ container? (3 marks)
+
+9.  What's a PDU and why does a server room need them? (2 marks)
+
+10. A red light starts flashing on your UPS, what could this mean? (1 marks)
+
+11. What do all of these have in common - ALOM, ILOM, DRAC? When might you use  
+    them (2 marks)
+
+12. What is RAID 10? Why is it a good idea to use RAID 10? (2 marks)
+
+13. What do these stand for? (4 x 1 marks)
+
+- LDAP
+- NIC
+- SAN
+- KVM
+
+14. What are ulimits? Why do we use them in redbrick? (2 marks)
+
+15. When racking a UPS where in the rack should it be mounted? (1 mark)
+
+16\. What are the DCU proxy details? Protocol, host and port required (1 mark)
+
+17. What is an ldif? Give a situation where you would create or use  
+    one. (2 marks)
+
+---
+
+Linux (25 marks)
+
+---
+
+1\. You need to check if a network interface is working and active on one of
+the  
+servers. What keyword are looking for in ifconfig. (It isn't UP) (1 mark)
+
+2\. How would you list all of the currently loaded kernel modules (1 mark)
+
+3\. A user has somehow renamed a file to a name with strange unicode
+characters  
+and you cannot delete that file by name. How would you go about deleting  
+that file? Give commands with parameters. (4 marks)
+
+4.  How would you find the UUID of the partition /dev/sdb1? (1 marks)
+
+5.  How would you enable ipv4 forwarding in linux? (1 marks)
+
+6.  What is logrotate? What does it do? Why is it used? (3 marks)
+
+7.  What is wtmp? (2 marks)
+
+8.  Give a command to set the default route? (2 marks)
+
+9.  What is fail2ban? Is it a good idea to run it on your server, why? (2 marks)
+
+10. Munin is awesome! why? (2 marks)
+
+11. You are compiling hybrid-ircd from source. You should really make a
+    package  
+    of this when installing it. Describe how you would do this. (2 marks)
+
+12. AppArmour. Explain. (2 marks)
+
+13. You want to create a system user to be used by a daemon. What do you set
+    its  
+    shell to? (1 mark)
+
+---
+
+BSD (23 marks)
+
+---
+
+1.  What is the command to list the currently loaded pf rules? (2 marks)
+
+2.  How would you set a service to start on boot? (2 marks)
+
+3.  Paritions on OpenBSD are labeled using the characters 'a' through 'p'.  
+    What are the characters 'a', 'b' and 'c' used for? (3 marks)
+
+4.  You want to install irssi from ports. What command would you use to search
+    for it? How would you install it? (3 marks)
+
+5.  What command would you use to update ports? What about the base system? (3
+    marks)
+
+6.  What is a Jail? What would you use one for? (3 marks)
+
+7.  What file would you modify to change the default router? (2 marks)
+
+8.  You have just been given root and created an account on our BSD boxes.
+    However you are unable to 'su'. Why? (2 marks)
+
+9.  What is syctl? Why would you use it? (3 marks)
+
+---
+
+Security (29 marks)
+
+---
+
+1.  A user has launched a new website for another society. They type ls -l and
+    the following is outputed;
+
+isaac702@azazel (..lic_html/wordpress) -> ls -al  
+drwx--x--x 35 isaac702 committe 4096 2012-09-26 23:56 ..  
+-rw-r--r-- 1 isaac702 committe 397 2008-05-25 21:33 index.php  
+-rw-r--r-- 1 isaac702 committe 16899 2011-06-08 19:18 license.txt  
+-rw-r--r-- 1 isaac702 committe 9202 2012-01-03 17:01 readme.html  
+-rw-r--r-- 1 isaac702 committe 4268 2011-10-20 15:40 wp-activate.php  
+drwxr-xr-x 9 isaac702 committe 4096 2012-01-03 20:53 wp-admin  
+-rw-r--r-- 1 isaac702 committe 40272 2011-10-28 16:48 wp-app.php  
+-rw-r--r-- 1 isaac702 committe 274 2010-11-20 21:44 wp-blog-header.php  
+-rw-r--r-- 1 isaac702 committe 3982 2011-09-30 18:18 wp-comments-post.php  
+-rw-r--r-- 1 isaac702 commitee 3200 2010-11-01 15:45 wp-config.php  
+-rw-r--r-- 1 isaac702 committe 3177 2010-11-01 14:45 wp-config-sample.php  
+drwxr-xr-x 4 isaac702 committe 49 2012-01-03 20:53 wp-content  
+-rw-r--r-- 1 isaac702 committe 2684 2011-09-09 20:59 wp-cron.php  
+drwxr-xr-x 8 isaac702 committe 4096 2012-01-03 20:53 wp-includes  
+-rw-r--r-- 1 isaac702 committe 1997 2010-10-23 13:17 wp-links-opml.php  
+-rw-r--r-- 1 isaac702 committe 2546 2011-11-15 15:47 wp-load.php  
+-rw-r--r-- 1 isaac702 committe 27695 2011-11-23 07:03 wp-login.php  
+-rw-r--r-- 1 isaac702 committe 7777 2011-08-05 17:57 wp-mail.php  
+-rw-r--r-- 1 isaac702 committe 413 2011-09-19 05:17 wp-pass.php  
+-rw-r--r-- 1 isaac702 committe 334 2010-12-09 18:02 wp-register.php  
+-rw-r--r-- 1 isaac702 committe 9913 2011-10-18 20:37 wp-settings.php  
+-rw-r--r-- 1 isaac702 committe 18545 2011-11-15 20:44 wp-signup.php  
+-rw-r--r-- 1 isaac702 committe 3702 2010-02-24 20:13 wp-trackback.php  
+-rw-r--r-- 1 isaac702 committe 3266 2011-04-17 09:35 xmlrpc.php
+
+How would a user go about exploiting this? (3 marks)
+
+2.  What is a VPN? Give a example where one would be used. (2 marks)
+
+3.  What are SSH keys? What command would you use to configure one? (3 marks)
+
+4.  Apache runs on port 80 but it runs as the www-data user. Why is this unusal
+    & how is it done?  
+    ( 3 marks)
+5.  Explain a buffer overflow? Explain how it can be used to comprise a system.
+    (3 marks)
+
+6.  What is chroot? What about fakeroot? (2 marks)
+
+7.  What is wrong with the following?  
+    mysql -u root -h mysql.internal -p=ThisIsTheRootPassword redbrickdb  
+    (2 marks)
+
+8.  What is a ulimit? How would you go about changing one? (2 marks)
+
+9.  Briefly explain each of the following; (1 mark each)
+
+- /etc/passwd & /etc/shadow
+- suPHP
+- AppArmor
+
+10.
+
+isaac702@azazel (/usr/bin) -> ls -ld /usr/bin/passwd  
+-rwsr-xr-x 1 root root 42856 2011-02-14 22:11 /usr/bin/passwd  
+^  
+What does the s mean? Why can this be considered insecure? (3 marks)
+
+11. You notice the IP address 136.206.15.150 is currently in use. This is a
+    Redbrick IP address and usually isn't in use. What would you do to identify
+    the machine and remove it from the network. (3 marks)
+
+---
+
+Networking (31 marks)
+
+---
+
+1.  What is a privillaged port? Name a services that uses one, and what port
+    does it run on? (3 marks)
+2.  Briefly expalin the following in relation to DNS;
+
+- TTL
+- CNAME
+- MX
+- AAAA  
+  (4 marks)
+
+3.  What program would you use to check for open ports on a system. (1 mark)
+4.  Outline a few differences between TCP and UDP? Give a example of where each
+    would be used. (3 marks)
+5.  What is a virtual interface? What file would you modify to add one? (3
+    marks)
+6.  Briefly explain what a CIDR network is? Why is it an improvement over
+    Classful networks. (3 marks)
+7.  Name 2 commands that could be used to query DNS? (2 marks)
+8.  What is OSPF? How does it related to BGP? (2 marks)
+9.  What program generates the following output? Explain what it means? Note
+    that ssh has replaced the port number. How does it know this? (3 marks)  
+    Proto Recv-Q Send-Q Local Address Foreign Address State  
+    tcp 0 0 192.168.0.13:37403 azazel.redbrick.dcu:ssh ESTABLISHED
+
+10. What ports are the following on;
+
+- ssh
+- imap
+- irc
+- ldap  
+  (4 marks)
+
+11. Explain the difference between Hubs and Switches. (3 marks)
+
+---
+
+Files & Filesystems (30 marks)
+
+---
+
+1.  List 3 (incompatible) filesystems. Give an advantage and disadvantage of
+    each. (6 marks)
+2.  What is an inode? Why would you limit the number of them a single user can
+    create? (3 marks)
+3.  How would you change the timestamp on a file to Jan/1/1970 00:00\. (1 mark)
+4.  Explain some of the options on the following two lines. What file would you
+    find them in? (4 marks)  
+    192.168.0.9:/backup /backup nfs nosuid,nodev,soft,intr,ro,noquota 0 2  
+    tmpfs /tmp tmpfs size=4G,nosuid 0 0
+
+5.  What command would you run to check a disk for errors? (1 mark)
+6.  You have added a new disk to your system. Describe the steps you would take
+    to set it up as /var/log (3 marks)
+7.  Briefly state what ctime, mtime and atime represent? (3 marks)
+8.  What's the difference between a symbolic link and a hard link? How command
+    would you use to create one? ( 3 marks)
+9.  The /var directory on your system appears completely full however as root
+    you are still abel to create files.
+
+- Why is this?
+- What option can you change to solve the problem.
+- What can you do if the above doesn't solve the problem.  
+  (4 marks)
+
+10. What is the effect of setting a sticky bit on a directory? (2 marks)
+
+---
+
+Hardware (22 marks)
+
+---
+
+1.  Upon entering the server room you start hearing a clicking noise coming from
+    one of the servers. What could it be? What commands could you run to
+    identify the issue? (3 marks)
+2.  What is a UPS? Why is it a good thing? (3 marks)
+3.  Briefly describe Hardware RAID and Software RAID? Which is beeter? Why? (4
+    marks)
+4.  What architecture is Murphy? What is it good at? (2 marks)
+5.  When you are buying a server, is a management card important? Why? (2 marks)
+6.  Redbrick is looking at buying a set of TCP/IP controlled PDU's. Why are they
+    useful and why would we want them over a non TCP/IP controled PDU. (2 marks)
+7.  Explain what a server being 1U means? (2 marks)
+8.  What is an IP KVM? Why is it a good thing to have? (2 marks)
+9.  SATA, SAS and SCSI. What are they? Why would I use each? 4 marks
+
+---
+
+BONUS ROUND!
+
+---
+
+1.  If you were an admin, what would you do?
+2.  You have a thumb tack, a plastic bottle and a piece of paper. Amuse us.  
+    3.14) MMMMMM
+3.  Touch the floor?
+4.  Who is the first person you would disuser upon becoming admin? Why?
+5.  What is the airspeed velocity of an unladen swallow?
diff --git a/source/help/exams/admin-test-2012-egm/admin-test-2012/index.md b/content/help/exams/admin-test-2012.md
similarity index 54%
rename from source/help/exams/admin-test-2012-egm/admin-test-2012/index.md
rename to content/help/exams/admin-test-2012.md
index a8e2ac1..af4fb12 100644
--- a/source/help/exams/admin-test-2012-egm/admin-test-2012/index.md
+++ b/content/help/exams/admin-test-2012.md
@@ -1,285 +1,350 @@
 ---
-title: 'Admin Test 2012'
+title: Admin Test 2012
 ---
 
-252 marks total  
-__________________________________  
+252 marks total
 
--------------------------------  
-Scripting (40 marks)  
--------------------------------  
+---
+
+---
+
+Scripting (40 marks)
+
+---
 
-1 - gamma refuses to fulfill the scripture and run for admin to follow in his brother's footsteps.  
-The gods have been angered that they are being denied the second coming of atlas. They have given  
-you the task of killing all of gamma's processes every 5 minutes, however, you may not use pkill,  
-pgrep or killall. Go! (9 marks)  
+1 - gamma refuses to fulfill the scripture and run for admin to follow in his
+brother's footsteps.  
+The gods have been angered that they are being denied the second coming of
+atlas. They have given  
+you the task of killing all of gamma's processes every 5 minutes, however, you
+may not use pkill,  
+pgrep or killall. Go! (9 marks)
 
-2 - In a move to stamp out the LOLSORANDUM crew haus has asked you to write a script that will:  
-- Get a list of all users in CA1  
-- Find any files they own that contain the substring "lol" (case insensitive)  
-- Delete the files  
-- Email the path of each file you delete to the member of "the crew" and make an insulting  
-remark about their mother. (15 marks)  
+2 - In a move to stamp out the LOLSORANDUM crew haus has asked you to write a
+script that will:
+
+- Get a list of all users in CA1
+- Find any files they own that contain the substring "lol" (case insensitive)
+- Delete the files
+- Email the path of each file you delete to the member of "the crew" and make an
+  insulting  
+  remark about their mother. (15 marks)
 
 3 - Write a monitoring script that writes to syslog.  
 It should have a start & stop operation.  
 'start' begins monitoring of iostat and load_avg.  
 It should use variables $IO_INTERVAL & $LOAD_AVG_INTERVAL to determine when  
 it writes each to syslog.  
-'stop' should kill every instance of monitoring. (15 marks)  
+'stop' should kill every instance of monitoring. (15 marks)
+
+4 - Write a script to amuse me (1 mark)
+
+---
 
-4 - Write a script to amuse me (1 mark)  
+Practical (40 Marks)
 
--------------------  
-Practical (40 Marks)  
--------------------  
+---
 
 1\. I want a /var/tmp partition, but forgot to create one. Motherfucker.  
 Resize /home for me so we have 1G free space. Create a partition in this  
 free space, and an ext4 filesystem. Make sure it mounts on boot. (30  
-marks)  
+marks)
 
 2\. The Vms are running linux-server. Install linux_generic and make it  
-the bootable kernel.(10 marks)  
+the bootable kernel.(10 marks)
 
--------------------  
-General (31 marks)  
--------------------  
+---
+
+General (31 marks)
+
+---
 
-1 - What's UNSCD? What does it do? (2 marks)  
+1 - What's UNSCD? What does it do? (2 marks)
 
-2 - You've catted a binary and now your terminal has had a spa attack. What command will fix it? (1 mark)  
+2 - You've catted a binary and now your terminal has had a spa attack. What
+command will fix it? (1 mark)
 
-3 - What's RCS? Why would it ever be used? If you're fun, what do you enjoy doing because you  
+3 - What's RCS? Why would it ever be used? If you're fun, what do you enjoy
+doing because you  
 "can't be dealing with checking files in and out" to get around it?  
-What do you hit him with when he does this? (3 marks)  
+What do you hit him with when he does this? (3 marks)
 
 4 - Give a situation in which you would use the following commands:  
 renice  
 swapon  
 dig  
 telnet  
-(1 mark each)  
+(1 mark each)
+
+5\. What are the following;
 
-5\. What are the following;  
-- Exim  
-- NFS  
-- Dirvish  
+- Exim
+- NFS
+- Dirvish
 - Nagios  
-(1 mark each)  
+  (1 mark each)
 
-6\. You have written a script which you want to execute at 5 minutes past midnight every thursday.  
+6\. You have written a script which you want to execute at 5 minutes past
+midnight every thursday.  
 What would you use for this? What command would you use to modify it?  
-What would the configuration line be (Assume the script is /opt/lol.sh)? (3 marks)  
+What would the configuration line be (Assume the script is /opt/lol.sh)? (3
+marks)
 
-7\. Ideally what temperature should the server room be kept at? (1 mark)  
+7\. Ideally what temperature should the server room be kept at? (1 mark)
 
-8\. Give me 2 different ways of searching for a specific man page? (1 mark)  
+8\. Give me 2 different ways of searching for a specific man page? (1 mark)
 
-9 - A user wants to upload an iso of damn vulnerable linux, but he isn't allowed own files that large  
-What file do you need to edit to change this? (1 mark)  
+9 - A user wants to upload an iso of damn vulnerable linux, but he isn't allowed
+own files that large  
+What file do you need to edit to change this? (1 mark)
 
-11 - What is an IP KVM? Why are they awesballs? (2 marks)  
+11 - What is an IP KVM? Why are they awesballs? (2 marks)
 
-12 - How would you view the current mail queue? (exim specific answer plx) (3 marks)  
+12 - How would you view the current mail queue? (exim specific answer plx) (3
+marks)
 
 13 - How would you suspend a process? What signal would you send it?  
-How would you resume it? What signal would you use? (2 marks)  
+How would you resume it? What signal would you use? (2 marks)
+
+14 - What is an LDIF? What tool would you use to generate an LDIF? (2 marks)
 
-14 - What is an LDIF? What tool would you use to generate an LDIF? (2 marks)  
+15 - Which is the shit one, useradd or adduser? What makes the other one shit?
+(2 marks)
 
-15 - Which is the shit one, useradd or adduser? What makes the other one shit? (2 marks)  
+---
+
+\*NIX/Linux (25 marks)
+
+---
+
+1 - Where are crontabs located? (1 mark)
 
----------------------  
-*NIX/Linux (25 marks)  
----------------------  
+2\. We compress old log files to save space. You need to view one of these
+compressed log files.  
+How do you go about this without uncompressing the file first. (1 mark)
 
-1 - Where are crontabs located? (1 mark)  
+3\. apt-get install fails to complete sucessfully on a new server. What could be
+wrong? (2 marks)
 
-2\. We compress old log files to save space. You need to view one of these compressed log files.  
-How do you go about this without uncompressing the file first. (1 mark)  
+4\. You have a file which you want to add to every new users home directory when
+it is created.  
+What directory should this file go in and what do you have to do when creating
+an account for it to take affect?  
+(2 marks)
 
-3\. apt-get install fails to complete sucessfully on a new server. What could be wrong? (2 marks)  
+5\. How do you assign multiple ip addresses to a network interface? (1 mark)
 
-4\. You have a file which you want to add to every new users home directory when it is created.  
-What directory should this file go in and what do you have to do when creating an account for it to take affect?  
-(2 marks)  
+6\. You are trying to umount a filesystem (/storage) however it is currently
+busy.  
+How can you find out what user/process is using it and kill it? How can you
+umount it without killing it?  
+(2 marks)
 
-5\. How do you assign multiple ip addresses to a network interface? (1 mark)  
+7\. What linux utility can you use to see what library calls a process makes? (2
+marks)
 
-6\. You are trying to umount a filesystem (/storage) however it is currently busy.  
-How can you find out what user/process is using it and kill it? How can you umount it without killing it?  
-(2 marks)  
+8\. Carbon just shutdown unexpectedly. What can be done to identify what went
+wrong? (1 marks)
 
-7\. What linux utility can you use to see what library calls a process makes? (2 marks)  
+9 - What command can you use to view boot messages? (2 marks)
 
-8\. Carbon just shutdown unexpectedly. What can be done to identify what went wrong? (1 marks)  
+10 - What is /etc/nsswitch.conf used for? When would you need to edit this file?
+(3 marks)
 
-9 - What command can you use to view boot messages? (2 marks)  
+11 - Explain briefly what an nrpe plugin is. (2 marks)
 
-10 - What is /etc/nsswitch.conf used for? When would you need to edit this file? (3 marks)  
+12 - chroot. What be it? When might you find it useful? (2 marks)
 
-11 - Explain briefly what an nrpe plugin is. (2 marks)  
+13 - What command would you use to show the amount of free space on a
+parition?(1 mark)
 
-12 - chroot. What be it? When might you find it useful? (2 marks)  
+14 - Why should you avoid using kill -9? (1 mark)
 
-13 - What command would you use to show the amount of free space on a parition?(1 mark)  
+15 - What's /dev/kmem? What's /dev/mem? Explain the difference? (2 marks)
 
-14 - Why should you avoid using kill -9? (1 mark)  
+---
 
-15 - What's /dev/kmem? What's /dev/mem? Explain the difference? (2 marks)  
+Files & Filesystems (30 marks)
 
--------------------------------  
-Files & Filesystems (30 marks)  
--------------------------------  
+---
 
 1 - Briefly explain what ctime, mtime and atime are in regards to a file.  
-How would you retrieve each of these? (4 marks)  
+How would you retrieve each of these? (4 marks)
 
-2 - What are these filesystems used for, on an average linux installation? (3 marks)  
+2 - What are these filesystems used for, on an average linux installation? (3
+marks)  
 /proc  
 /bin  
-/etc  
+/etc
 
 3 - Name 3 filesystems. different filesystem versions within the same family  
-of filesystems will not be accepted (3 marks)  
+of filesystems will not be accepted (3 marks)
+
+4 - Give at least one difference between each filesystem. (3 marks)
+
+5 - Explain as verbosely as you can the difference between a hard link and a
+soft link.  
+What command creates each of them? (3 marks)
+
+6 - Why are hard links & incremental backups best buds? (2 marks)
+
+7 - What command will give me the UUID of a partition? (The answer does not
+involve cat) (2 marks)
 
-4 - Give at least one difference between each filesystem. (3 marks)  
+8 - What's an inode? (1 mark)
 
-5 - Explain as verbosely as you can the difference between a hard link and a soft link.  
-What command creates each of them? (3 marks)  
+9 - How would you find the inode number of a file? How would you delete a file
+by its inode number?  
+Why would you want to? (4 marks)
 
-6 - Why are hard links & incremental backups best buds? (2 marks)  
+10 - What goes in /etc/fstab? How about /etc/dfstab? and /etc/mtab? (3 marks)
 
-7 - What command will give me the UUID of a partition? (The answer does not involve cat) (2 marks)  
+11 - drwxrwxrwt 3 root root 4096 2012-03-26 15:27 /var/tmp
 
-8 - What's an inode? (1 mark)  
+What does the t mean? (1 marks)
 
-9 - How would you find the inode number of a file? How would you delete a file by its inode number?  
-Why would you want to? (4 marks)  
+12 - What does fsck do? When would you use it? (2 marks)
 
-10 - What goes in /etc/fstab? How about /etc/dfstab? and /etc/mtab? (3 marks)  
+---
 
-11 - drwxrwxrwt 3 root root 4096 2012-03-26 15:27 /var/tmp  
+(Open|Free)BSD (20 marks)
 
-What does the t mean? (1 marks)  
+---
 
-12 - What does fsck do? When would you use it? (2 marks)  
+1 - What's a securelevel? Briefly explain how it works. (2 marks)
 
------------------------------  
-(Open|Free)BSD (20 marks)  
------------------------------  
+2 - What is a jail? When would you use one? (2 marks)
 
-1 - What's a securelevel? Briefly explain how it works. (2 marks)  
+3 - OpenBSD's installer is seperating your disk into alphabetically numbered
+sections.  
+What's a is root, b is swap, but what's c? (2 marks)
 
-2 - What is a jail? When would you use one? (2 marks)  
+4 - You're running pf on OpenBSD. You've changed the config and restarted pf.
+Why aren't the new rules you've added  
+showing up? (2 marks)
 
-3 - OpenBSD's installer is seperating your disk into alphabetically numbered sections.  
-What's a is root, b is swap, but what's c? (2 marks)  
+5 - How do you update the ports tree on FreeBSD? (2 marks)
 
-4 - You're running pf on OpenBSD. You've changed the config and restarted pf. Why aren't the new rules you've added  
-showing up? (2 marks)  
+6 - FreeBSD doesn't have a /etc/init.d and no upstart either, where the jesus
+are its startup scripts? (2 marks)
 
-5 - How do you update the ports tree on FreeBSD? (2 marks)  
+7 - Okay, you've figured out where the startup scripts are on FreeBSD but it
+turns out you actually want to restart  
+ssh on OpenBSD. Give me the command to do it. (2 marks)
 
-6 - FreeBSD doesn't have a /etc/init.d and no upstart either, where the jesus are its startup scripts? (2 marks)  
+8 - What file do you have to edit to change the default route on FreeBSD? (2
+marks)
 
-7 - Okay, you've figured out where the startup scripts are on FreeBSD but it turns out you actually want to restart  
-ssh on OpenBSD. Give me the command to do it. (2 marks)  
+9 - You're trying to install something using pkg_add but it's just hanging
+there.  
+Name 2 things you should do to try and fix it. (2 marks)
 
-8 - What file do you have to edit to change the default route on FreeBSD? (2 marks)  
+10 - How do you delete a user on OpenBSD? (2 marks)
 
-9 - You're trying to install something using pkg_add but it's just hanging there.  
-Name 2 things you should do to try and fix it. (2 marks)  
+---
 
-10 - How do you delete a user on OpenBSD? (2 marks)  
+Networking (24 Marks)
 
----------------------  
-Networking (24 Marks)  
----------------------  
+---
 
 1\. Yer auld wan needed help with her NAT, and I gave it to her. What is  
-NAT? Why is it useful? Where would you see it used? 2 marks  
+NAT? Why is it useful? Where would you see it used? 2 marks
 
 2\. Redbrick have two switches. What OS are they running? Give me the  
-steps to see the port configuration on a switch running this OS. 4 marks  
+steps to see the port configuration on a switch running this OS. 4 marks
 
 3\. Speaking of switches, What is a switch? How does it work? On what OSI  
-layer? Compare to a router and a hub. 4 marks  
+layer? Compare to a router and a hub. 4 marks
 
 4\. WHO HAS any idea about ARP? What is it? How would I use it to give an  
 IP address to a device? How could I take advantage of ARP for a man in  
-the middle attack? 4 marks  
+the middle attack? 4 marks
 
 5\. Which has the highest propigation speed, fibre, coax, or cat6?  
-Highest bandwidth? 2 marks  
+Highest bandwidth? 2 marks
 
 6\. Redbrick has a /23\. We've broken this up into two /24s, how many  
-useable IPs do we have? 1 mark  
+useable IPs do we have? 1 mark
 
 7\. What is a VLAN? How do redbrick use VLANS? Can VLANs talk to each  
-other? 2 marks  
+other? 2 marks
+
+8\. How many IP addresses can we have under IPv4? IPv6? 1 mark
+
+9\. What ports do SNMP, SMTP, LDAP and TFTP run on? 4 marks
 
-8\. How many IP addresses can we have under IPv4? IPv6? 1 mark  
+---
 
-9\. What ports do SNMP, SMTP, LDAP and TFTP run on? 4 marks  
+Hardware (31 marks)
 
--------------------  
-Hardware (31 marks)  
--------------------  
+---
 
-1\. How would I find the UUID of a disk? 2 marks  
+1\. How would I find the UUID of a disk? 2 marks
 
 2\. What is a DAS? What do redbrick use one for? Compare and contrast to  
-a NAS and a SAN. 5 marks  
+a NAS and a SAN. 5 marks
 
 3\. Redbrick are getting a GPU for people to program on. What are the  
-advantages of GPGPU programming? Why? 3 marks  
+advantages of GPGPU programming? Why? 3 marks
 
-4\. SATA, SAS and SCSI. What are they? Why would I use each? 4 marks  
+4\. SATA, SAS and SCSI. What are they? Why would I use each? 4 marks
 
-5\. What is the svm flag in /proc/cpuinfo? What do we want it? 2 marks  
+5\. What is the svm flag in /proc/cpuinfo? What do we want it? 2 marks
 
-6\. What is an IP-KVM and why do we use one? 2 marks  
+6\. What is an IP-KVM and why do we use one? 2 marks
 
 7\. What RAID configuration would you use for a cluster of 4 1TB disks  
-housing your warez? Why? 3 marks  
+housing your warez? Why? 3 marks
+
+---
+
+Security (31 marks)
+
+---
 
--------------------  
-Security (31 marks)  
--------------------  
-1\. Why are running services such as FTP, Telnet & POP a bad idea? (2 marks)  
+1\. Why are running services such as FTP, Telnet & POP a bad idea? (2 marks)
 
-2\. You have just become the a system adminstrator and have been given root. What can you do to secure your account? (2 marks)  
+2\. You have just become the a system adminstrator and have been given root.
+What can you do to secure your account? (2 marks)
 
-3\. Name 3 files which should only be readable by root? (3 marks)  
+3\. Name 3 files which should only be readable by root? (3 marks)
 
-4\. When scripts are executed by the webserver on redbrick they are run under suexec and suphp. Why is this and why is it a good thing? (3 marks)  
+4\. When scripts are executed by the webserver on redbrick they are run under
+suexec and suphp. Why is this and why is it a good thing? (3 marks)
 
-5\. What is a firewall? Name two firewalls that redbrick have on their systems. How do you list the current rules on them both? (5 marks)  
+5\. What is a firewall? Name two firewalls that redbrick have on their systems.
+How do you list the current rules on them both? (5 marks)
 
 6\. What is wrong with the following path?  
 .:/home/user/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/games  
-How would an attacker go about exploting this? (2 marks)  
+How would an attacker go about exploting this? (2 marks)
+
+7\. You left a root terminal unlocked and someone has used it to do something.
+The history files has been deleted. How do you go about finding out what they
+did? (5 marks)
+
+8\. You have just installed a new linux server. Name 3 things you should do to
+secure this system. (3 marks)
 
-7\. You left a root terminal unlocked and someone has used it to do something. The history files has been deleted. How do you go about finding out what they did? (5 marks)  
+9\. What are AppArmor and SELinux used for? (2 marks)
 
-8\. You have just installed a new linux server. Name 3 things you should do to secure this system. (3 marks)  
+10\. Name 2 security mailing lists that you should be subscribers to as a
+redbrick root holder. (2 marks)
 
-9\. What are AppArmor and SELinux used for? (2 marks)  
+11\. What is wrong with setuid scripts and why should they be avoided? (1 mark)
 
-10\. Name 2 security mailing lists that you should be subscribers to as a redbrick root holder. (2 marks)  
+---
+
+Bonus round
 
-11\. What is wrong with setuid scripts and why should they be avoided? (1 mark)  
+---
 
---------------------  
-Bonus round  
---------------------  
-1\. Which HTTP response code best describes dilligaf and why?  
+1\. Which HTTP response code best describes dilligaf and why?
 
-2\. Cans during the test, is this win?  
+2\. Cans during the test, is this win?
 
-3\. MDMA, LSD, Cannabis, Crystal meth. Which one of these best describes you and why?  
+3\. MDMA, LSD, Cannabis, Crystal meth. Which one of these best describes you and
+why?
 
 4\. WHAT DID THE 5 FINGERS SAY TO THE FACE?  
 The first one to give gw the correct answer gets a can.
diff --git a/source/help/exams/admin-test-2013-agm/index.md b/content/help/exams/admin-test-2013-agm.md
similarity index 94%
rename from source/help/exams/admin-test-2013-agm/index.md
rename to content/help/exams/admin-test-2013-agm.md
index b4891d0..523ba71 100644
--- a/source/help/exams/admin-test-2013-agm/index.md
+++ b/content/help/exams/admin-test-2013-agm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Admin Test 2013 AGM'
+title: Admin Test 2013 AGM
 ---
 
 
 _________________________________
@@ -9,13 +9,13 @@ title: 'Admin Test 2013 AGM'
 --- Practical (40 Marks) ---
 
 1\. (5 Marks)
-Create a user 'ted' with a home directory of '/home/ted' 
+Create a user 'ted' with a home directory of '/home/ted'
 
 adduser ted
 
 2\. (5 Marks)
-Make ted a member of 'harry' group and give that group write access to 
-directory '/home/ted/shared' 
+Make ted a member of 'harry' group and give that group write access to
+directory '/home/ted/shared'
 
 groupadd harry
 chown ted:harry /home/ted/shared
@@ -28,7 +28,7 @@ chmod g+s /home/ted/shared
 chown -R ted:harry /home/ted/shared
 
 4\. (10 Marks)
-The VM you are using has a free unformated partition. Format this partion 
+The VM you are using has a free unformated partition. Format this partion
 to be swap and make the VM mount the swap patition at startup.
 
 mkswap /dev/sda3
@@ -39,11 +39,11 @@ add the following to /etc/fstab:
 /dev/sda3 none swap sw 0 0
 
 5\. (15 Marks)
-Create a cron job that will synchronise the contents of /etc/ every night 
-to a remote server over ssh. (remote server details are provided on your 
+Create a cron job that will synchronise the contents of /etc/ every night
+to a remote server over ssh. (remote server details are provided on your
 handout)
 
-crontab -e: 
+crontab -e:
 add the following:
 0 0 * * * rsync -avz -e ssh /etc user@backup:/home/user/backup
 
@@ -58,7 +58,7 @@ cat key.pub >> ~/.ssh/authorized_hosts
 --- Scripting (40 Marks) ---
 
 1\. (13 Marks)
-We are replacing tcsh because it is shit. Find all users with tcsh, and 
+We are replacing tcsh because it is shit. Find all users with tcsh, and
 change their shell to bash. Email the user to tell them of the change
 
 #!/bin/bash
@@ -71,11 +71,11 @@ do
 done
 
 2\. (13 Marks)
-It has come to our attention that a number of users have been storing out 
+It has come to our attention that a number of users have been storing out
 of date lecture notes on their webspace.
 We have been provided with a copy of each of the files.
-Scan /webtree for any copies of these files and if they are world readable 
-and not password protected email admins if one is found. (You can ignore 
+Scan /webtree for any copies of these files and if they are world readable
+and not password protected email admins if one is found. (You can ignore
 users home directories for this question.)
 
 #!/usr/bin/env python
@@ -85,7 +85,7 @@ import smtplib
 
 from email.mime.text import MIMEText
 
-#Many enhancements could be made to this, but It is at least correct. 
+#Many enhancements could be made to this, but It is at least correct.
 #This solution assumes that we cannot take into account the file extension.
 
 #get a list of all the lecture files.
@@ -104,7 +104,7 @@ findoutput = subprocess.check_output(
          ["find", "/webtree", "-type", "f", "-perm", "/o+r"])
 webtreefiles = findoutput.split("\n")[:-1]
 
-#Make a dictionary of file paths to MD5 sums of the world-readable files 
+#Make a dictionary of file paths to MD5 sums of the world-readable files
 #of /webtree
 webtree_dict = {}
 for f in webtreefiles:
@@ -127,11 +127,11 @@ s.quit()
 
 3\. (13 Marks)
 We believe that a number of users are abusing redbrick services.
-Specifically they are running programs that are not allowed. Write a script 
-that takes a list of usernames as an argument and will detect if they are 
-running any of these programs. If you see the same user running banned 
-programs more than 3 times automatically change their shell to disusered. 
-Email admins to inform us of the users poor choices. (You may choose which 
+Specifically they are running programs that are not allowed. Write a script
+that takes a list of usernames as an argument and will detect if they are
+running any of these programs. If you see the same user running banned
+programs more than 3 times automatically change their shell to disusered.
+Email admins to inform us of the users poor choices. (You may choose which
 programs are banned.)
 
 #!/bin/bash
@@ -142,7 +142,7 @@ email="banned users were:\n\n"
 for user in $userlist
 do
    numprocs=$(pgrep -u $user -c $bannedprocs"")
-   if [ $numprocs -gt 3 ] 
+   if [ $numprocs -gt 3 ]
    then
       chsh $user -s /usr/local/shells/disusered
       email="$email $user"
@@ -158,7 +158,7 @@ figlet DONGS
 
 1\. What versions of ubuntu do we run on redbrick and why?
 (2 Marks)
-%"An LTS on a general server, because it is supported 5 years 
+%"An LTS on a general server, because it is supported 5 years
 %from release" (1)
 %1 "The Latest LTS on the development server, so the latest dev tools are
 %available" (1)
@@ -189,12 +189,12 @@ figlet DONGS
 
 5\. Why does catting a binary screw up your shell? How do you fix this?
 (2 Marks)
-%Catting a binary spits out control characters that change your shell 
+%Catting a binary spits out control characters that change your shell
 %settings (1)
 %the "reset" command (1)
 %Total: 12
 
-6\. How do you create a compressed tar archive? Give an example command. 
+6\. How do you create a compressed tar archive? Give an example command.
 (1 Mark)
 %"tar -cvzf balls.tar.gz /path/to/compress"(1)
 %Total: 13
@@ -203,7 +203,7 @@ figlet DONGS
 %Allowing you to see what system calls a program is making(1)
 %Total: 14
 
-8\. What's a nice value. Tell me what the rules of changing them are for 
+8\. What's a nice value. Tell me what the rules of changing them are for
 users and for root (3 Marks)
 %process priority(1)
 %users can only raise them(1)
@@ -213,21 +213,21 @@ users and for root (3 Marks)
 9\. What does cron allow you to do? How do you edit it (2 Mark)
 %Schedule processes to run at certain times(1)
 %"crontab -e"(1)
-%Total: 19 
+%Total: 19
 
-10\. Tell me what command you would use to create a ssh tunnel from port 
-1010 on your local host to port 2020 on morpheus, using azazel as your 
+10\. Tell me what command you would use to create a ssh tunnel from port
+1010 on your local host to port 2020 on morpheus, using azazel as your
 forwarder. Why might you need to use an ssh tunnel in general? (6 Marks)
 %ssh -L 1010:morpheus.redbrick,dcu.ie:2020 user@azazel.redbrick.dcu.ie(5)
 %to access a blocked port(1)
-%Total: 25 
+%Total: 25
 
 11\. How would you search for manpages? 2 ways please.(2 Marks)
 %man -k(1)
 %apropos(1)
 %Total: 27
 
-12\. What signal would you send a process to terminate it gracefully? How 
+12\. What signal would you send a process to terminate it gracefully? How
 would you do this? (2 Marks)
 %SIGTERM(1)
 %"kill "(1)
@@ -243,7 +243,7 @@ would you do this? (2 Marks)
 %"service  status"(1)
 %Total: 31
 
-2\. How would you search for a package on ubuntu? Give the command(1 Mark) 
+2\. How would you search for a package on ubuntu? Give the command(1 Mark)
 %"apt-cache search "(1)
 %Total: 32
 
@@ -251,27 +251,27 @@ would you do this? (2 Marks)
 %lsb_release -a(1)
 %Total: 33
 
-4\. What effect does the sticky bit have when set on a directory? What 
+4\. What effect does the sticky bit have when set on a directory? What
 2 directories are most commonly set with the sticky bit?(2 Marks)
-%files created therein can only be deleted by their owners, the owners of 
+%files created therein can only be deleted by their owners, the owners of
 %that directory, or root(1)
-%/tmp and /var/tmp(1) (need both) 
+%/tmp and /var/tmp(1) (need both)
 %Total: 36
 
-5\. What does setting the setuid bit of an executable do? name a file that 
+5\. What does setting the setuid bit of an executable do? name a file that
 has this set.(2 Marks)
 %Causes that executable to be run as it's owner(1)
 %/usr/bin/passwd(1)
 %Total: 38
 
-6\. What does Upstart (sometimes) do? What does it replace on some systems? 
+6\. What does Upstart (sometimes) do? What does it replace on some systems?
 (2 Marks)
 %Starts processes on boot(1)
 %init(1)
 %Total: 40
 
-7\. You're trying to back up mysql, but mysqldump fails because of broken 
-tables or the moon not being in the correct phase or somesuch shite, How 
+7\. You're trying to back up mysql, but mysqldump fails because of broken
+tables or the moon not being in the correct phase or somesuch shite, How
 do you make a backup in spite of this?(2 Marks)
 %tar /var/lib/mysql(2)
 %Total: 42
@@ -281,8 +281,8 @@ do you make a backup in spite of this?(2 Marks)
 %"cat /proc/uptime"(1)
 %Total: 44
 
-9\. What are three advantages of installing packages from a package 
-manager rather than building from source. What 2 commands do you use to 
+9\. What are three advantages of installing packages from a package
+manager rather than building from source. What 2 commands do you use to
 keep packages up to date?(5 marks)
 %Any three of:
 %  Faster(1)
@@ -299,15 +299,15 @@ keep packages up to date?(5 marks)
 %database of information security vulnerabilites?(2)
 %Total: 51
 
-11\. What would you use to check how much free space is on the system? Also, 
-the command to check how much is used. What does the -h flag do for these 
+11\. What would you use to check how much free space is on the system? Also,
+the command to check how much is used. What does the -h flag do for these
 commands?(3 Marks)
 %df(1)
 %du(1)
 %makes it human-readable(1)
 %Total: 54
 
-12\. You've just written a python script and made it executable, but when 
+12\. You've just written a python script and made it executable, but when
 you try to run it, this error comes up:
 import: unable to open X server `' @ error/import.c/ImportImageCommand/366.
 What is most likely causing this? How do you fix it(4 Marks)
@@ -326,7 +326,7 @@ What is most likely causing this? How do you fix it(4 Marks)
 %pfctl -a (1)
 %Total: 62
 
-02\. The manpages on a freebsd box are broken. What command will help you 
+02\. The manpages on a freebsd box are broken. What command will help you
 fix this?(2 Marks)
 %sysinstall(2)
 %Total: 64
@@ -355,7 +355,7 @@ fix this?(2 Marks)
 %Total: 76
 
 07\. Why does redbrick bother using the BSDs at all at all? (2 Marks)
-%So some important boxes (pwsafe, firewalls) can have a different, 
+%So some important boxes (pwsafe, firewalls) can have a different,
 %hopefully smaller set of vulnerabilites.(2)
 %Total: 78
 
@@ -365,11 +365,11 @@ fix this?(2 Marks)
 
 --- Security (30 Marks) ---
 
-01\. What is a buffer overflow and why are they bad? Where could they occur 
+01\. What is a buffer overflow and why are they bad? Where could they occur
 that is most harmful?(6 Marks)
-%When a program doesn't check input length, it's possible to give it so 
-%much data that it overwrites things on the stack. This is bad because 
-%one can write arbitrary code into the return address of the stack, 
+%When a program doesn't check input length, it's possible to give it so
+%much data that it overwrites things on the stack. This is bad because
+%one can write arbitrary code into the return address of the stack,
 %which will execute when the function returns.(4)
 %setuid executables(2)
 %Total: 86
@@ -392,11 +392,11 @@ that is most harmful?(6 Marks)
 %Total: 93
 
 06\. You find an unattended root terminal, give yourself a backdoor.(5 Marks)
-%copy /bin/bash over the location of some binary that no one checks 
+%copy /bin/bash over the location of some binary that no one checks
 %use that when you wanna do root things.(5)
 %Total: 98
 
-07\. What utility allows you to encrypt and store login details? Give a 
+07\. What utility allows you to encrypt and store login details? Give a
 command to display login details on cmdline for the entry "foo".(5 Marks)
 %pwsafe(2)
 %pwsafe -Eup foo
@@ -419,21 +419,21 @@ command to display login details on cmdline for the entry "foo".(5 Marks)
 
 --- Networking (30 Marks) ---
 
-01\. Explain Subnetting. What's the subnet mask of a /23? How many hosts per 
+01\. Explain Subnetting. What's the subnet mask of a /23? How many hosts per
 subnet on it? (4 Marks)
-%subnetting, allocating bits from the start of an IP address to act as the 
+%subnetting, allocating bits from the start of an IP address to act as the
 %network address and using the bits left to represent the subnet/hosts(2)
 %255.255.254.0(1)
 %510 or 2^9-2(1)
 %Total: 114
 
 02\. Difference between TCP and UDP please.(2 Marks)
-%TCP - connection oriented, if connection is lost, server requests lost bit 
+%TCP - connection oriented, if connection is lost, server requests lost bit
 %(1)
 %UDP - connectionless, no guarantee your data is gonna get there.(1)
 %Total: 116
 
-03\. What's a private IP address range? Give an example. 
+03\. What's a private IP address range? Give an example.
 What problem were these introduced to solve?(4 Marks)
 %IP Address ranges that aren't routable over the global internet(1)
 %192.168.0.0-192.168.255.255(1)
@@ -472,7 +472,7 @@ What problem were these introduced to solve?(4 Marks)
 %Total: 136
 
 08\. What is port knocking?(4)
-%Sending packets to a series of closed ports on a firewall that opens a 
+%Sending packets to a series of closed ports on a firewall that opens a
 %previously closed port(4)
 %Total: 140
 
@@ -513,12 +513,12 @@ iii) mtime
 %Total: 151
 
 04\. What is /proc for? what's /etc for?(2 Marks)
-%/proc -a virtual filesystem which is an interface to interact with the 
+%/proc -a virtual filesystem which is an interface to interact with the
 %running kernel (1)
 %/etc - config files(1)
 %Total: 153
 
-05\. Name three different filesystems (not different versions of fat) and 
+05\. Name three different filesystems (not different versions of fat) and
 tell me a feature of each?(6 Marks)
 %ext3/4 - journaling file system, default in ubuntu(2)
 %nfs - network file system, works over network(2)
@@ -543,23 +543,23 @@ tell me a feature of each?(6 Marks)
 --- Hardware (20 Marks) ---
 
 01\. What's an IP-KVM? Why is is deadly?(2 Marks)
-%Lets you have keyboard and mouse input for multiple machines at once 
-%remotely.(1) 
+%Lets you have keyboard and mouse input for multiple machines at once
+%remotely.(1)
 %Deadly because it's very useful for remote maintainance.(1)
 %Total: 172
 
 02\. What is a UPS? How does one help in the event of a powercut?(2 Marks)
 %Uninterruptable Power supply(1)
-%It allows us to shut the servers off sensibly rather than everything 
+%It allows us to shut the servers off sensibly rather than everything
 %just powering down.(1)
 %Total: 174
 
 03\. Explain RAID 0, 1 and 5.(6 Marks)
-%RAID0: improved performance but no redundancy. more disks=higher risk of 
+%RAID0: improved performance but no redundancy. more disks=higher risk of
 %failure.(2)
-%RAID1: data written identically to two drives, array can tolerate 1 drive 
+%RAID1: data written identically to two drives, array can tolerate 1 drive
 %dying.(2)
-%RAID5: Needs all drives but 1 to work to operate, can tolerate 1 drive 
+%RAID5: Needs all drives but 1 to work to operate, can tolerate 1 drive
 %dying.(2)
 %Total: 180
 
@@ -569,7 +569,7 @@ tell me a feature of each?(6 Marks)
 
 05\. What does SAN stand for? Explain a bit.(2 Marks)
 %Storage Attached Network(1)
-%Attach storage devices to servers so they look like they're attached 
+%Attach storage devices to servers so they look like they're attached
 %directly(1)
 %Total: 184
 
@@ -580,7 +580,7 @@ tell me a feature of each?(6 Marks)
 
 --- Bonus ---
 
-1\. Who is the best electronic dance music artist? 
+1\. Who is the best electronic dance music artist?
 %No answer, I just want music recommendations
 
 2\. If you are elected, what nasty things will you do to dever's homedir?
diff --git a/content/help/exams/admin-test-2013-egm.md b/content/help/exams/admin-test-2013-egm.md
new file mode 100644
index 0000000..2ce7d37
--- /dev/null
+++ b/content/help/exams/admin-test-2013-egm.md
@@ -0,0 +1,273 @@
+---
+title: Admin Test 2013 EGM
+---
+
+## Redbrick Admin Exam 2013
+
+We have created an admintest2k13 folder in your homedir. answer all questions in
+a text file in that directory. (you will be judged on your choice of text
+editor)
+
+---
+
+## Scripting (40 marks)
+
+1.  Find and kill all running processes named hax0re.py (4 marks)
+
+2.                       Create an alphabetically sorted, unique list of all members currently active on your current machine(5 marks)
+
+3.                       A recent vulnerability has been discovered. Find all the symlink files in /home owned by root, named `public_html` and chmod them to the correct user:group(15 marks)
+
+4.               Write a script that takes usernames and password hashes from /etc/shadow. The script should then try and crack them using john the ripper. If the password is found in under 5 minutes email the user their password and tell them it's shit (15 marks)
+
+5.               Write a script to amuse me. (1 mark)
+
+---
+
+## General (30 marks)
+
+1.  What's RCS? Why might you use it? (2 marks)
+
+2.  How would you check what kernel you are running? (1 mark)
+
+3.  What is LDAP? What is an LDIF and why would you use one? (3 marks)
+
+4.  What's a package repository? What are they used for? (2 marks)
+
+5.  What protocol might you use to allow a filesystem to be mounted over a
+    network? (1 mark)
+
+6.  What temperature should the server room be kept at? (1 mark)
+
+7.  A lot of the servers on Redbrick run Ubuntu 12.04\. How would you update an
+    Ubuntu server and its packages? (1 mark)
+
+8.  You need to quickly backup a file, How do you copy a file to a remote server
+    via command line? (1 marks)
+
+9.  What's a PDU and why does a server room need them? (2 marks)
+
+10. What is a UPS used for? (1 marks)
+
+11. What is a DRAC? (1 mark)
+
+12. What is Dirvish?(1 mark)
+
+13. Why is Nagios important, where can you find it ?(2 marks)
+
+14. When racking a UPS where in the rack should it be mounted? (1 mark)
+
+15. What are the DCU proxy details? Protocol, host and port required (1 mark)
+
+16. How would you view the current Mail Queue, Exim Specific answer please(2
+    marks)
+
+17. You accidentally messaged a root password to someone in IRC, what do you do?
+    (2 marks)
+
+18. What does strace do?(2 marks)
+
+19. What does GRUB stand for? (1 mark)
+
+20. What does lsof do? (1 mark)
+
+21. What is Munin? (1 mark)
+
+22. How did koffee lock your answers and test when he went to pee? give a
+    suitable solution (2 marks)
+
+---
+
+## Linux (25 marks)
+
+1.  What information may you find in /proc? (1 mark)
+
+2.  How would you list all of the currently loaded kernel modules (1 mark)
+
+3.  A user has somehow renamed a file to a name with strange unicode characters
+    and you cannot delete that file by name. How would you go about deleting
+    that file? Give commands with parameters. (4 marks)
+
+4.  How would you enable ipv4 forwarding in linux? (1 marks)
+
+6)  What is logrotate? What does it do? Why is it used? (3 marks)
+
+7)  What is wtmp? (2 marks)
+
+8)  Give a command to set the default route? (2 marks)
+
+9)  What is fail2ban? Is it a good idea to run it on your server, why? (2 marks)
+
+10) What command will show me the active iptables config? (2 marks)
+
+11) You are compiling hybrid-ircd from source. You should really make a package
+    of this when installing it. Describe how you would do this. (2 marks)
+
+12) AppArmour. Explain. (2 marks)
+
+13) You want to create a system user to be used by a daemon. What do you set its
+    shell to? (1 mark)
+
+---
+
+## BSD (23 marks)
+
+1.  What is the command to list the currently loaded pf rules? (2 marks)
+2.  What would the following pf rule do? (2 marks)
+
+block in on \$ext_if proto tcp from any os "Windows"
+
+3.  Paritions on OpenBSD are labeled using the characters 'a' through 'p'. What
+    are the characters 'a', 'b' and 'c' used for? (3 marks)
+4.  How do you update the ports tree on FreeBSD? (2 marks)
+5.  Where are the startup scripts on BSD? How do you add something to run on
+    startup? (3 marks)
+6.  What is a Jail? What would you use one for? (3 marks)
+7.  What file would you modify to change the default router? (2 marks)
+8.  Why does the admin box run FreeBSD? Can you name the admin box? (2 marks)
+9.  What is syctl? Why would you use it? (2 marks)
+10. What does growfs do? (1 mark)
+
+---
+
+## Security (30 marks)
+
+1.  A user has launched a new website for another society. They type ls -l and
+    the following is outputed; silly@azazel (~/public_html/) -> ls -l [8:25]
+    total 12K -rwxrwxrwx 1 silly member 116 2013-10-21 19:55 blah.php -rwxrwxrwx
+    1 silly member 50 2013-10-21 19:25 database.php -rwxrwxrwx 1 silly member
+    1593 2013-10-21 19:17 index.php How would a regular user go about exploiting
+    this? (3 marks)
+
+2.  What is port forwarding? Give an example where/why this would be used? (3
+    marks)
+3.  What are SSH keys? What command would you use to configure one? (3 marks)
+4.  Apache runs as the www-data user, yet users scripts run as themselves. How
+    is this done? ( 2 marks)
+5.  Briefly Explain a buffer overflow? (2 marks)
+6.  What is chroot? What about fakeroot? (2 marks)
+7.  What is wrong with the following?(1 marks) mysql -u root -h mysql.internal
+    -p=ThisIsTheRootPassword redbrickdb
+8.  What is a ulimit? Where do you change these values? (2 marks)
+9.  Briefly explain each of the following; (1 mark each)
+
+- /etc/passwd & /etc/shadow
+- Apache.s mod_rewrite
+- AppArmor
+- .htaccess
+- SSL
+
+10. Our servers are being hammered by the chinese. What do you do?(2 marks)
+11. What is SELinux? (1 marks)
+12. Name 2 security mailing lists that you should be subscribers to as a
+    redbrick root holder. (2 marks)
+13. maK stupidly posted a very recent kernel privilege escalation exploit into
+    #lobby, what do you do? (1 mark)
+
+---
+
+## Networking (30 marks)
+
+1.  What is a privileged port? Name a service that uses one, and what port does
+    it run on? (3 marks)
+2.  How would you go about diagnosing a DNS issue? How do you find the
+    authoritative name server? Name 2 useful DNS tools?(4 marks)
+
+3)  What program would you use to check for open ports on a system? Give an
+    example of how you could list pids/ports with this utility? (2 marks)
+4)  What is NAT? Why would you use it? (2 marks)
+5)  What is a virtual interface? What file would you modify to add one? (3
+    marks)
+6)  Briefly explain what a CIDR network is? (1 marks)
+7)  What is a VLAN, what are they used for? (2 marks)
+8)  What is OSPF? How does it relate to BGP? (2 marks)
+9)  What is port-knocking? What is it useful for? (2 marks)
+10) What ports are the following on; (5 marks)
+
+- ssh
+- imap
+- irc
+- ldap
+- dns
+
+11. Explain the difference between Hubs and Switches. (2 marks)
+12. HEAnet have given us a /56 IPV6 Address. How would you work out how many
+    addresses we could possibly have? (2 marks)
+
+---
+
+## Files & Filesystems (30 marks)
+
+1. List 3 (incompatible) filesystems. Give an advantage and disadvantage of
+   each. (6 marks)
+2. What is an inode? Why would you limit the number of them a single user can
+   create? (3 marks)
+3. How would you change the timestamp on a file to Jan/1/1970 00:00\. (1 mark)
+4. Explain some of the options on the following two lines. What file would you
+   find them in? (4 marks) 192.168.0.9:/backup /backup nfs
+   nosuid,nodev,soft,intr,ro,noquota 0 2 tmpfs /tmp tmpfs size=4G,nosuid 0 0
+
+5. What command would you run to check a disk for errors? (1 mark)
+6. You have added a new disk to your system. Describe the steps you would take
+   to set it up as /var/log (3 marks)
+7. Briefly state what ctime, mtime and atime represent? (3 marks)
+8. What's the difference between a symbolic link and a hard link? What command
+   would you use to create one? ( 3 marks)
+9. The /var directory on your system appears completely full however as root you
+   are still able to create files.
+
+   - Why is this?
+   - What option can you change to solve the problem.
+   - What can you do if the above doesn't solve the problem. (4 marks)
+
+10. What is the effect of setting a sticky bit on a directory? (2 marks)
+
+---
+
+## Hardware (32 marks)
+
+1. Upon entering the server room you start hearing a clicking noise coming from
+   one of the servers. What could it be? What commands could you run to identify
+   the issue? (3 marks)
+
+2) What is a UPS? Why is it a good thing? (3 marks)
+3) Briefly describe Hardware RAID and Software RAID? Which is better? Why? (4
+   marks)
+4) What architecture is Murphy? What is it good at? (2 marks)
+5) When you are buying a server, is a management card important? Why? (2 marks)
+6) Redbrick is looking at buying a set of TCP/IP controlled PDU's. Why are they
+   useful and why would we want them over a non TCP/IP controlled PDU. (2 marks)
+7) Explain what a server being 1U means? (2 marks)
+8) What is an IP KVM? Why is it a good thing to have? (2 marks)
+9) SATA, SAS and SCSI. What are they? Why would I use each? (4 marks)
+10) When you first go into the server room, there are 3 CAT5e cables coming from
+    the back of each server, Why? Where are they going? (3 Marks)
+11) What is DAS? Do we have one? If so where is it? (3 marks)
+12) If I told you to connect something to a NIC what would be connecting? (2
+    marks)
+
+---
+
+## BONUS ROUND!
+
+1. User Privacy is of utmost importance, if it wasn.t, what would you do?
+2. How do you shot web? 3)mak & koffee are great admins, How would you express
+   your gratitude to them?
+
+## we.re feeling mean.
+
+## Practical (40 marks)
+
+We have given you a VM.
+
+to get at your VM ssh -L 5900:136.206.16.1:6006 zergless@login.redbrick.dcu.ie
+
+once you have logged in connect your VNC Client of choice to 127.0.0.1:5900
+
+1. Configure iptables so that only traffic from the 136.206.16.0/24 subnet comes
+   through. then configure it so that only ssh and http & https are allowed to
+   get to the vm. (15 marks)
+
+2. Configure apache to also listen on port 81\. When a user vists the webserver
+   on port 81 with the path /admin use mod_rewrite to redirect them to
+   http://google.ie. (15 marks)
diff --git a/content/help/exams/admin-test-2014-agm.md b/content/help/exams/admin-test-2014-agm.md
new file mode 100644
index 0000000..15eafdd
--- /dev/null
+++ b/content/help/exams/admin-test-2014-agm.md
@@ -0,0 +1,326 @@
+---
+title: Admin Test AGM 2014
+---
+
+-------------------- Scripting (40 marks) --------------------
+
+1.  It has come to our attention that a number of associates are running some
+    new dodgy services that are listening on network ports. You should write a
+    script that will kill any processes that are listening on ports 1337 and
+    anything over port 9000\. Make sure to only to kill those processes belong
+    to that of the associate user group. (13 marks)
+
+2.  There has been a new wordpress vulnerability, scan the webtree for the file
+    "wp-fucked.php", delete it and then email and inform any member who has this
+    file that it has been removed.(13 marks)
+
+3.  Write a script to tell you how much space each user is using in their HOME
+    directory and how many files they have greater than 150mb. Output should be:
+    uid SpaceUsed Username NumFiles (13 marks)
+
+4.  Write a script to amuse us! (1 mark)
+
+==== Practical (50 marks) ==== For this part you are allowed to use RedBrick
+wiki and Ubuntu manual. http://wiki.redbrick.dcu.ie/mw/Rbvm
+
+1\. You have been provided an empty Redbrick VM, install Ubuntu Server on it.
+Make the right choices when installing; network configuration is on the wiki.
+(15 marks)
+
+2\. Install a ssh server and make sure that root can't connect by ssh. Once your
+ssh server is running, use it and close vncviewer. (5 marks)
+
+3\. - Install a DNS Server (we suggest bind) - Add the zone exam.redbrick.dcu.ie
+as master  
+HINT : the SOA is the nameserver of your zone, bind needs two of them  
+HINT 2 : this hint will cost you 1 mark, if you are stucked ask an admin [1]
+
+- Add an entry that link .exam.redbrick.dcu.ie to your VM
+- Configure your server to use it and test that it's working  
+  (20 marks)  
+  You can get marks even if it's not working
+
+4\. Using the best method, restrict the DNS server access to 136.206.16.0/24 and
+the ssh server access to 136.206.15.0/24. (10 marks)
+
+Don't forget to give the root password to your beloved admins (if you want to be
+marked).
+
+## ---------------------------------- General (35 marks)
+
+1.  What's RCS? Why might you use it? (2 marks)
+
+2.  How would you check what kernel you are running? (2 mark)
+
+3.  What is LDAP? What is an LDIF and why would you use one? (3 marks)
+
+4.  What's a package repository? What are they used for? (2 marks)
+
+5.  What protocol might you use to allow a filesystem to be mounted over a
+    network? (1 mark)
+
+6.  What versions of Ubuntu do we run on Redbrick and Why? (3 marks)
+
+7.  How would you create a compressed tar archive? Give an example command. (1
+    Mark)
+
+8.  You need to quickly backup a file, How do you copy a file to a remote server
+    via command line? (1 marks)
+
+9.  What's a PDU and why does a server room need them? (2 marks)
+
+10. Why does catting a binary screw up your shell? How do you fix this?(2 Marks)
+
+11. What is a DRAC/ILOM/ALOM? (1 mark)
+
+12. What is Dirvish?(1 mark)
+
+13. Why is Nagios important, where can you find it?(2 marks)
+
+14. What is strace? (1 Mark)
+
+15. What's a nice value? How would you change it? (2 marks)
+
+16. How would you view the current Mail Queue, Exim or Postfix answer please(2
+    marks)
+
+17. You accidentally messaged a root password to someone in IRC, what do you do?
+    (2 marks)
+
+18. What does GRUB stand for? (1 mark)
+
+19. What does DNS do? (1 mark)
+
+20. What is Munin? (1 mark)
+
+21. How did koffee lock your answers and test when he went to pee? give a
+    suitable solution (2 marks)
+
+## ---------------------------------- Linux (25 marks)
+
+1.  What information may you find in /proc? (1 mark)
+
+2.  How would you list all of the currently loaded kernel modules (1 mark)
+
+3.  A user has somehow renamed a file to a name with strange unicode characters
+    and you cannot delete that file by name. How would you go about deleting
+    that file? Give commands with parameters. (4 marks)
+
+4.  How would you enable ipv4 forwarding in linux? (1 marks)
+
+6)  What is logrotate? What does it do? Why is it used? (3 marks)
+
+7)  What's /dev/kmem? What's /dev/mem? Explain the difference? (3 marks)
+
+8)  Give a command to set the default route? (2 marks)
+
+9)  What is fail2ban? Is it a good idea to run it on your server, why? (2 marks)
+
+10) What command will show me the active iptables config? (2 marks)
+
+11) What does upstart do? What does it replace? (2 marks)
+
+12) AppArmour. Explain. (2 marks)
+
+13) What's the apt command to remove already downloaded package files? (1 mark)
+
+## ---------------------------------- BSD (25 marks)
+
+1.  What is the command to list the currently loaded pf rules? (2 marks)
+
+2.  What would the following pf rule do? (2 marks)  
+    block in on \$ext_if proto tcp from any os "Windows"
+
+3.  Paritions on OpenBSD are labeled using the characters 'a' through 'p'. What
+    are the characters 'a', 'b' and 'c' used for? (3 marks)
+
+4.  What is the equivalent of the root group in FreeBSD? (2 marks)
+
+5.  Where are the startup scripts on BSD? How do you add something to run on
+    startup? (3 marks)
+
+6.  What is a Jail? What would you use one for? (3 marks)
+
+7.  What file would you modify to change the default route? (2 marks)
+
+8.  Why does the admin box run FreeBSD? Can you name the admin box? (2 marks)
+
+9.  What is syctl? Why would you use it? (2 marks)
+
+10. What does growfs do? (1 mark)
+
+11. What command would set the first NIC on a FreeBSD install to have i.p.
+    address of 192.168.1.119 with a /24 netmask. (3 marks)
+
+## ---------------------------------- Security (30 marks)
+
+1.  A user has launched a new website for another society. They type ls -l and
+    the following is output;  
+    silly@azazel (~/public_html/) -> ls -l [8:25] total 12K  
+    -rwxrwxrwx 1 silly member 116 2013-10-21 19:55 blah.php  
+    -rwxrwxrwx 1 silly member 50 2013-10-21 19:25 database.php  
+    -rwxrwxrwx 1 silly member 1593 2013-10-21 19:17 index.php  
+    How would a regular user go about exploiting this? (3 marks)
+
+2.  What is port forwarding? Give an example where/why this would be used? (3
+    marks)
+
+3.  What are SSH keys? What command would you use to configure one? (3 marks)
+
+4.  Apache runs as the www-data user, yet users scripts run as themselves. How
+    is this done? (2 marks)
+
+5.  Briefly Explain a buffer overflow? (2 marks)
+
+6.  What is chroot? What about fakeroot? (2 marks)
+
+7.  What is wrong with the following?(1 marks)  
+    mysql -u root -h mysql.internal -p=ThisIsTheRootPassword redbrickdb
+
+8.  What is a ulimit? Where do you change these values? (2 marks)
+
+9.  Briefly explain each of the following; (1 mark each)
+
+- /etc/passwd & /etc/shadow
+- Apache.s mod_rewrite
+- AppArmor
+- .htaccess
+- SSL
+
+10. Our servers are being hammered by the chinese. What do you do?(2 marks)
+
+11. What is SELinux? (1 marks)
+
+12. Name 2 security mailing lists that you should be subscribers to as a
+    redbrick root holder. (2 marks)
+
+13. What is a CVE Database?(1 mark)
+
+## ------------------------------------------- Networking (30 marks)
+
+1.  What Switches do Redbrick Use? What OS do they run? (2 marks)
+
+2.  How would you go about diagnosing a DNS issue? How do you find the
+    authoritative name server?  Name 2 useful DNS tools?(4 marks)
+
+3.  What program would you use to check for open ports on a system? Give an
+    example of how you could list  pids/ports with this utility? (2 marks)
+
+4.  What is NAT? Why would you use it? (2 marks)
+
+5.  What is a virtual interface? What file would you modify to add one? (3
+    marks)
+
+6.  Briefly explain what a CIDR network is? (1 marks)
+
+7.  What is a VLAN, what are they used for? (2 marks)
+
+8.  What is OSPF? How does it relate to BGP? (2 marks)
+
+9.  What is port-knocking? What is it useful for? (2 marks)
+
+10. What default ports are the following on; (5 marks)
+
+- ssh
+- imap
+- irc
+- ldap
+- dns
+
+11. Explain the difference between Hubs and Switches. (2 marks)
+
+12. HEAnet have given us a /56 IPV6 Address. How would you work out how many
+    addresses we could possibly have?  (2 marks)
+
+13. On our switches; what commands would you use to get from login to a describe
+    any port on the switch? (3 marks)
+
+14. Give the v4 netmask for the following subnets: (5 marks)
+
+- /24
+- /32
+- /29
+- /26
+- /8
+
+15. How many networks are in the Redbrick Environment? give the justification
+    and use of each. (3 marks)
+
+## -------------------------------------------- Files & Filesystems (30 marks)
+
+1.  List 3 (incompatible) filesystems. Give an advantage and disadvantage of
+    each. (6 marks)
+
+2.  What is an inode? Why would you limit the number of them a single user can
+    create? (3 marks)
+
+3.  What file would you find the following lines in? (2 marks)  
+    192.168.0.9:/backup /backup nfs nosuid,nodev,soft,intr,ro,noquota 0 2  
+    tmpfs /tmp tmpfs size=4G,nosuid 0 0
+
+4.  What command would you run to check a disk for errors? (1 mark)
+
+5.  You have added a new disk to your system. Describe the steps you would take
+    to set it up as /var/log (4 marks)
+
+6.  Briefly state what ctime, mtime and atime represent? (3 marks)
+
+7.  What's the difference between a symbolic link and a hard link? What command
+    would you use to create both? (3 marks)
+
+8.  What's an LVM? (2 marks)
+
+9.  There are 8hrs to go until Lorcan and Laura sit this exam and I’m scrambling
+    for questions to ask, What is the effect of setting a sticky bit on a
+    directory? (2 marks)
+
+## -------------------------------------------- Hardware (32 marks)
+
+1.  You walk in to the server room and it feels like you’ve walked into a sauna,
+    what’s gone wrong? (1 mark)
+
+2.  Having just ascertained the problem you can’t do anything to fix it
+    direcetly, what are your next courses of action? (2 marks)
+
+3.  What is a UPS? Why is it a good thing? (3 marks)
+
+4.  Briefly describe Hardware RAID and Software RAID? Which is better? Why? (4
+    marks)
+
+5.  When you are buying a server, is a management card important? Why? (2 marks)
+
+6.  Redbrick has bought a set of TCP/IP controlled PDU's. Why are they useful
+    and why would we want them  over a non TCP/IP controlled PDU? (2 marks)
+
+7.  List these Interface speeds in order of increasing data throughput rate:
+    SAS,IDE,USB2.0,SATA1.0,SATA3(4 marks)
+
+8.  What is an IP KVM? Why is it a good thing to have? (2 marks)
+
+9.  What is DAS? Do we have one? If so where is it? (3 marks)
+
+10. Describe the following Storage Arrays: RAID 0, RAID 5, RAID 10\. (3 marks)
+
+11. If I told you to connect something to a NIC what would you be connecting? (2
+    marks)
+
+12. With regards to power supplies what are redundancy and diverse power
+    supplies and why are they important? (3 marks)
+
+13. What kind of cable connects our DAS to Azazel? (1 mark)
+
+## -------------------------------------------- BONUS ROUND!
+
+1.  User Privacy is of utmost importance, if it wasn’t, what would you do?
+
+2.  How do you shot web?
+
+3)mak & koffee & twister are great admins, How would you express your gratitude
+to them?
+
+4.  Alliance Suck, this is not a question merely a statement of fact.
+
+5.  SpaceGoats suck more.
+
+6.  Lorcan, something you love also sucks (your girlfriend not
+    included)
diff --git a/source/help/exams/admin-test-2014-egm/index.md b/content/help/exams/admin-test-2014-egm.md
similarity index 69%
rename from source/help/exams/admin-test-2014-egm/index.md
rename to content/help/exams/admin-test-2014-egm.md
index 3af617a..2b42fa2 100644
--- a/source/help/exams/admin-test-2014-egm/index.md
+++ b/content/help/exams/admin-test-2014-egm.md
@@ -1,9 +1,11 @@
 ---
-title: 'Admin Exam 2014 EGM'
+title: Admin Exam 2014 EGM
 ---
 
-We have created an admintest2k14 folder in your homedir. answer all questions in a text file in that directory.  
-(you may use nano, vim or vi. you will be judged on your choice of text editor)  
+We have created an admintest2k14 folder in your homedir. answer all questions in
+a text file in that directory.  
+(you may use nano, vim or vi. you will be judged on your choice of text
+editor)  
 Total marks 287
 
 ======================  
@@ -13,26 +15,36 @@ Total marks 287
 2\. What is Redbrick's primary login server? Name two other servers (3 marks)  
 3\. What temperature should the server room be kept at? (2 marks)  
 4\. What does nagios do? Why do we use it? How does it work? (4 marks)  
-5\. You type the command "ls" expecting a list of all non-hidden items in the current directory, instead you get an ascii dick printed to standard output, why would this happen? (4 marks)  
+5\. You type the command "ls" expecting a list of all non-hidden items in the
+current directory, instead you get an ascii dick printed to standard output, why
+would this happen? (4 marks)  
 6\. What are ALOM,ILOM and DRAC and why do admins love them? (3 marks)  
-7\. What is a ulimit, why do we impose them on servers other than the development server? (3 marks)  
-8\. Why would you use a managed PDU instead of a PDU? What does PDU stand for? (3 marks)  
+7\. What is a ulimit, why do we impose them on servers other than the
+development server? (3 marks)  
+8\. Why would you use a managed PDU instead of a PDU? What does PDU stand for?
+(3 marks)  
 9\. What does SNMP stand for? (2 marks)  
-10.What protocol allows us to mount /storage over multiple servers? (3 marks)  
+10.What protocol allows us to mount /storage over multiple servers? (3 marks)
 
 ======================  
 **Linux (30 marks)**  
 ======================  
-1\. What flavour of linux do we use on the majority of Redbrick Servers? And what version? (3 marks)  
+1\. What flavour of linux do we use on the majority of Redbrick Servers? And
+what version? (3 marks)  
 2\. What is /proc? Why would you look there? (3 marks)  
 3\. What does FHS stand for? (2 marks)  
-4\. What is an inode? How would you show a file's inode? How would you delete this file using its inode (3marks)  
-5\. How would you show what version of OS you're running (assume this is on a Redbrick server)? (2 marks)  
+4\. What is an inode? How would you show a file's inode? How would you delete
+this file using its inode (3marks)  
+5\. How would you show what version of OS you're running (assume this is on a
+Redbrick server)? (2 marks)  
 6\. What is LDAP? Why do we use it? (3 marks)  
 7\. What is apt? Why do we use it? (3 marks)  
-8\. What command would you use to find the process id running as a particular user? How would you kill just that process (4 marks)  
-9\. chmod and chown, what do they do? and for each give the syntax they use (4 marks, 2 per command)  
-10.What command would you run to update to the latest version of OS available on a Redbrick server? (3 marks)  
+8\. What command would you use to find the process id running as a particular
+user? How would you kill just that process (4 marks)  
+9\. chmod and chown, what do they do? and for each give the syntax they use (4
+marks, 2 per command)  
+10.What command would you run to update to the latest version of OS available on
+a Redbrick server? (3 marks)
 
 ======================  
 **BSD (30 marks)**  
@@ -42,11 +54,13 @@ Total marks 287
 3\. What is the BSD equivalent of root? (3 marks)  
 4\. What is pf? How would you show the current ruleset? (3 marks)  
 5\. How do you get a process to run at boot time? (3 marks)  
-6\. What file would you modify to set the static IP of an interface in BSD? (3 marks)  
+6\. What file would you modify to set the static IP of an interface in BSD? (3
+marks)  
 7\. Show me how to find the routing table in BSD (3 marks)  
 8\. What is ports in BSD? How do I update them? (3 marks)  
 9\. In FreeBSD; what is a jail? Why would one use it? (3 marks)  
-10.You just got your root talk as an admin, and were added to the root group on a freebsd box, Why does this allow you to do jack all? (3 marks)  
+10.You just got your root talk as an admin, and were added to the root group on
+a freebsd box, Why does this allow you to do jack all? (3 marks)
 
 ======================  
 **Security (30 marks)**  
@@ -55,21 +69,29 @@ Total marks 287
 2\. What are: pf, fail2ban, iptables (3 marks)  
 3\. What does VPN stand for? Why would one be used? (3 marks)  
 4\. What are SSH keys? What command would you use to configure one? (3 marks)  
-5\. You suspect maK has a rootkit on one of the machines. What command could you run to check for the rootkit? (3 marks)  
-6\. You have just installed a new linux server. Name 3 things you should do to secure this system. (3 marks)  
+5\. You suspect maK has a rootkit on one of the machines. What command could you
+run to check for the rootkit? (3 marks)  
+6\. You have just installed a new linux server. Name 3 things you should do to
+secure this system. (3 marks)  
 7\. Why is ssh as root disabled on our machines? (2 marks)  
-8\. Name 3 files that should only be readable by root and what they do. (4 marks)  
+8\. Name 3 files that should only be readable by root and what they do. (4
+marks)  
 9\. Why would you set the sticky bit on a file? (3 marks)  
-10\. You left a root terminal unlocked and someone has used it to do something. The history files has been deleted. How do you go about finding out what they did? (4 marks)  
+10\. You left a root terminal unlocked and someone has used it to do something.
+The history files has been deleted. How do you go about finding out what they
+did? (4 marks)
 
 ======================  
 **Files & Filesystems (30 marks)**  
 ======================  
 1\. Name 3 different types of filesystems (3 marks)  
-2\. What does it mean when a filesystem is described as being journalled? (2 marks)  
+2\. What does it mean when a filesystem is described as being journalled? (2
+marks)  
 3\. How would you show what filesystems are currently mounted? (3 marks)  
-4\. What is a symlink, how would you create one, how does it differ from a 'hard-link' (4 marks)  
-5\. You've added a new disk to a machine mount /zergless/potato on it (2 marks)  
+4\. What is a symlink, how would you create one, how does it differ from a
+'hard-link' (4 marks)  
+5\. You've added a new disk to a machine mount /zergless/potato on it (2
+marks)  
 6\. drwxrw-rw- what is this permission in octal format? (3 marks)  
 7\. What is NFS? Do we use it in Redbrick? If so where? (4 marks)  
 8\. What are the following?  
@@ -78,42 +100,65 @@ ii) atime
 iii) mtime  
 (1 mark each)  
 9\. What is the difference between /etc/mtab & /etc/fstab (3 marks)  
-10.How would you force unmount a 'busy' directory? (3 marks)  
+10.How would you force unmount a 'busy' directory? (3 marks)
 
 ======================  
 **Practical (37 marks)**  
 ======================  
-For this practical we have setup a raspberyr pi for you with login details provided.  
-1\. Create a user for yourself 'redbrick' with a home directory of '/home/redbrick' (4 marks)  
+For this practical we have setup a raspberyr pi for you with login details
+provided.  
+1\. Create a user for yourself 'redbrick' with a home directory of
+'/home/redbrick' (4 marks)  
 2\. It looks like ssh is enabled for root. disable it. (6 marks)  
-3\. Ok now that we know no one can ssh in as root lets change the password. pwgen has been installed on these pis. use this to generate a password of 8 characters and change the root password. make sure this is included in answers so we can correct this section.(4 marks)  
+3\. Ok now that we know no one can ssh in as root lets change the password.
+pwgen has been installed on these pis. use this to generate a password of 8
+characters and change the root password. make sure this is included in answers
+so we can correct this section.(4 marks)  
 4\. Change it so that only su can be used and not sudo.(6 marks)  
 5\. Make sure that bash is up-to-date (2 marks)  
-6\. You notice that 'sillyuser' account has been compromised. His home dir and files may have been compromised. Make a tar.gz of sillyusers home dir then make sure that he can't access it anymore (6 marks)  
-7\. You have a copy of sillyuser's home dir and his files are secure now you need to take appropriate actions. List the actions you would take. Minimum of 3 (3 marks per action +1 extra mark if its really inventive)  
+6\. You notice that 'sillyuser' account has been compromised. His home dir and
+files may have been compromised. Make a tar.gz of sillyusers home dir then make
+sure that he can't access it anymore (6 marks)  
+7\. You have a copy of sillyuser's home dir and his files are secure now you
+need to take appropriate actions. List the actions you would take. Minimum of 3
+(3 marks per action +1 extra mark if its really inventive)
 
 ======================  
 **Scripting (40 marks)**  
 ======================  
-1\. Create an alphabetically sorted, unique list of all members currently active on your current machine Output this to a .txt file(4 marks)  
-2\. With this txt file amend @redbrick.dcu.ie is at the end of each name. (5 marks)  
-3\. Redbrick is running out of space quicker than the admins can delete files. Write a script that checks the size of users home directorys. if the directory is more that 90% full email the admins the user and the biggest 3 files. (15 marks)  
-4\. There has been a new wordpress vulnerability, scan the webtree for the file "wp-fucked.php", delete it and then email and inform any member who has this file that it has been removed.(15 marks)  
-5\. Write a script to amuse us! (1 mark)  
+1\. Create an alphabetically sorted, unique list of all members currently active
+on your current machine Output this to a .txt file(4 marks)  
+2\. With this txt file amend @redbrick.dcu.ie is at the end of each name. (5
+marks)  
+3\. Redbrick is running out of space quicker than the admins can delete files.
+Write a script that checks the size of users home directorys. if the directory
+is more that 90% full email the admins the user and the biggest 3 files. (15
+marks)  
+4\. There has been a new wordpress vulnerability, scan the webtree for the file
+"wp-fucked.php", delete it and then email and inform any member who has this
+file that it has been removed.(15 marks)  
+5\. Write a script to amuse us! (1 mark)
 
 ======================  
 **Hardware (30 marks)**  
 ======================  
 1\. What does NIC stand for? (1 mark)  
-2\. If disks are in a RAID 10 array, what does this mean from a parity standpoint? Draw a diagram of a RAID 10 Array using the minimum number of disks required. (5 marks)  
-3\. The air conditioning in the server room has broken. What do you do? (2 marks)  
-4\. When building a new server, what are the minimum requirements you should have (3 marks)  
-5\. Order these protocols in terms of data transfer speed (high -> low) : SATA,ATA,IDE,SAS,SCSI. (3 marks)  
+2\. If disks are in a RAID 10 array, what does this mean from a parity
+standpoint? Draw a diagram of a RAID 10 Array using the minimum number of disks
+required. (5 marks)  
+3\. The air conditioning in the server room has broken. What do you do? (2
+marks)  
+4\. When building a new server, what are the minimum requirements you should
+have (3 marks)  
+5\. Order these protocols in terms of data transfer speed (high -> low) :
+SATA,ATA,IDE,SAS,SCSI. (3 marks)  
 6\. What is DAS? Does Redbrick have any DAS, if so where? (4 marks)  
 7\. What is an IP-KVM? Why should we use one (3 marks)  
 8\. Tell me how to get the UUiD of a disk (2 marks)  
-9\. Why do our servers have two power supplies? What 2 pieces of hardware do we use in conjunction with them to ensure maximum redundancy and uptime? (5 marks)  
-10.Where would you mount a UPS? Why? (2 marks)  
+9\. Why do our servers have two power supplies? What 2 pieces of hardware do we
+use in conjunction with them to ensure maximum redundancy and uptime? (5
+marks)  
+10.Where would you mount a UPS? Why? (2 marks)
 
 ======================  
 **Networking (30 marks)**  
@@ -124,24 +169,30 @@ i) /8
 ii) /24  
 iii)/29  
 IPv4 Subnet. (3 marks)  
-3\. If 127.0.0.1 is the v4 local loopback address, what is the IPv6 one? (2 marks)  
+3\. If 127.0.0.1 is the v4 local loopback address, what is the IPv6 one? (2
+marks)  
 4\. What protocol is used to distribute routes on the internet? (2 marks)  
 5\. What do  
 i) HTTPS  
 ii)DNS  
 iii) DHCP  
 stand for and what ports & protocols do they use by default (6 marks)  
-6\. We use Cisco switches; how do you show the running configuration on one of our switches? (2 marks)  
+6\. We use Cisco switches; how do you show the running configuration on one of
+our switches? (2 marks)  
 7\. What does NAT stand for? What does it do? (4 marks)  
-8\. How many disparate networks are there in the Redbrick environment? Why? (3 marks)  
-9\. What are privilieged ports? What port number is the priv/unpriv border? (2 marks)  
-10.What does VPN stand for? What does it do? (3 marks)  
+8\. How many disparate networks are there in the Redbrick environment? Why? (3
+marks)  
+9\. What are privilieged ports? What port number is the priv/unpriv border? (2
+marks)  
+10.What does VPN stand for? What does it do? (3 marks)
 
 ======================  
 **Bonus Round**  
 ======================  
-This round carries no marks but will affect our mood when correcting the exams.  
+This round carries no marks but will affect our mood when correcting the
+exams.  
 1\. So you want extra points? What you willing to do for them?  
 2\. What addition would you make to the server room?  
-3\. In a hypothecical situation there are no rules for having root. What would you do to Redbrick?  
+3\. In a hypothecical situation there are no rules for having root. What would
+you do to Redbrick?  
 4\. Tunes?
diff --git a/content/help/exams/admin-test-2015-agm.md b/content/help/exams/admin-test-2015-agm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/admin-test-2015-agm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/source/help/exams/admin-test-2016-agm/index.md b/content/help/exams/admin-test-2016-agm.md
similarity index 55%
rename from source/help/exams/admin-test-2016-agm/index.md
rename to content/help/exams/admin-test-2016-agm.md
index 0025e7a..692a831 100644
--- a/source/help/exams/admin-test-2016-agm/index.md
+++ b/content/help/exams/admin-test-2016-agm.md
@@ -1,118 +1,133 @@
 ---
-title:
+title: Admin Exam 2016 AGM
 ---
 
-Assumptions that can be made:
-When referring to VMs assume they’re running in a Native Hypervisor architecture. Unless otherwise specified give answers for a Ubuntu based OS.
-(Exceptions are the BSD & CoreOS sections)
-General:
+Assumptions that can be made: When referring to VMs assume they’re running in a
+Native Hypervisor architecture. Unless otherwise specified give answers for a
+Ubuntu based OS. (Exceptions are the BSD & CoreOS sections) General:
+
 1. Give 2 Primary differences between Docker Containers and VMs (2)
 2. What do CI & CD stand for? Give one example of a tool used for each (4)
 3. What is the default shell of new users on Redbrick (2)
 4. What does nagios do? Why do we use it? How does it work? (4)
-5. What does the initialism OOB stand for? When would you use something that was OOB? (4)
-6. What is a ulimit, why do we impose them on servers other than the development server? (3)
+5. What does the initialism OOB stand for? When would you use something that was
+   OOB? (4)
+6. What is a ulimit, why do we impose them on servers other than the development
+   server? (3)
 7. What does UPS stand for when referring to infrastructure? (2)
 8. What does SNMP stand for? (2)
 9. What is a cronjob? How would you create one? (2)
 10. What protocol allows us to mount /storage over multiple servers? (2)
 11. What is LDAP? Why do we use it? (3)
 12. What's a package repository? What are they used for? (3)
-13. How would you create a BZIP compressed tar archive? Give an example command. (3)
-14. You’ve just `cat /bin/lol_idiot`; What command do you run to fix the mess you’re now in? (2)
+13. How would you create a BZIP compressed tar archive? Give an example command.
+    (3)
+14. You’ve just `cat /bin/lol_idiot`; What command do you run to fix the mess
+    you’re now in? (2)
 15. What's a nice value? How would you change it? (2)
-16. How would you view the current Mail Queue[ state using exim /postfix /other] (3)
-17. You accidentally messaged a root password to someone in IRC, what do you do? (2)
+16. How would you view the current Mail
+    Queue[ state using exim /postfix /other](3)
+17. You accidentally messaged a root password to someone in IRC, what do you do?
+    (2)
 18. What does DNS stand for? What does DNS do? (3)
 
 Total: /50
 
 ## Networking:
-Assume IPv4 unless otherwise specified
-Hardware Specific questions are denoted by HC (Cisco - IOS) and HJ(Juniper)
+
+Assume IPv4 unless otherwise specified Hardware Specific questions are denoted
+by HC (Cisco - IOS) and HJ(Juniper)
+
 1. What does CIDR stand for? (1)
-2. Give the subnet masks for the following: (4)
-  a. /24
-  b. /29
-  c. /16
-  d. /10
-3. Write the DNS entry to bind the IP address 126.206.15.25 to azazel.redbrick.dcu.ie (2)
-4. What service do we use to stop repeated DNS queries from overwhelming the
-DNS service? (1)
+2. Give the subnet masks for the following: (4) a. /24 b. /29 c. /16 d. /10
+3. Write the DNS entry to bind the IP address 126.206.15.25 to
+   azazel.redbrick.dcu.ie (2)
+4. What service do we use to stop repeated DNS queries from overwhelming the DNS
+   service? (1)
 5. What is NAT? Why is it used? Where do we use it in Redbrick? (4)
 6. There are 6 Private Network Subnets defined by IANA/IETF. Give the CIDR
-notation for 4 of them (4)
+   notation for 4 of them (4)
 7. Set a default route using the ip 136.206.15.254 using interface em1 (3)
 8. What technology does IEEE 802.1Q refer to? Do we use it in Redbrick? (3)
-9. [HC] Show a brief report of all the ports currently running in a specific VLAN (2)
-10. [HJ] Show a brief report of all the ports currently running in a specific VLAN (2)
-11. What is OSPF? How does it differ from STP? (4)
-12.Youtypew ww.google.com intoawebbrowser’ssearchbar;Whathappens? (5)
-13. What Ports do these services usually run on? What Protocol do they use? (10)
-  a. DNS
-  b. SMTP
-  c. IMAP(S)
-  d. HTTPS
-  e. VNC (Graphical Display)
-14. What is SFP? What TCP/IP level would it be found on? (2)
-15. What does BGP stand for? What numbers are used for identification in BGP? (3)
+9. [HC] Show a brief report of all the ports currently running in a specific
+   VLAN (2)
+10. [HJ] Show a brief report of all the ports currently running in a specific
+    VLAN (2)
+11. What is OSPF? How does it differ from STP? (4) 12.Youtypew ww.google.com
+    intoawebbrowser’ssearchbar;Whathappens? (5)
+12. What Ports do these services usually run on? What Protocol do they use? (10)
+    a. DNS b. SMTP c. IMAP(S) d. HTTPS e. VNC (Graphical Display)
+13. What is SFP? What TCP/IP level would it be found on? (2)
+14. What does BGP stand for? What numbers are used for identification in BGP?
+    (3)
 
 Total /40
 
 ## Hardware/Infrastructure
+
 You will find a file called raid to assist you.
+
 1. What does RAID stand for? Software or Hardware? Why? (3)
 2. You have 4 Disks all with the same speed and capacity, using diagrams, give 4
-possible RAID configurations. (5)
+   possible RAID configurations. (5)
 3. Which of the 4 configs gives the optimal RW speed;Capacity and Redundancy (3)
 4. What is an SFP? Where would you expect to find one? (2)
-5. What are the following and how do they differ? (4)
-a. DAS b. SAN c. NAS
+5. What are the following and how do they differ? (4) a. DAS b. SAN c. NAS
 6. What is an IP­KVM, how does it differ from a regular KVM? (2)
 7. What is a DRAC? Why is it useful? How does it differ from an IP­KVM? (2)
 8. What does ECC used to describe? What does it mean? (2)
-9. List in Order of D ECREASING d ata transfer speed (fastest ­> Slowest) (3)
-a. IDE
-b. PCI­E x16 v3.0
-c. SATA­3
-d. SAS
-e. QSFP+
+9. List in Order of D ECREASING d ata transfer speed (fastest ­> Slowest) (3) a.
+   IDE b. PCI­E x16 v3.0 c. SATA­3 d. SAS e. QSFP+
 10. Why are PS/2 connectors still used on servers? (2)
-11. As an admin you will have to buy a server spec up a basic server; what are the
-Minimum requirements to run in the C URRENT  Redbrick infrastructure? (4)
+11. As an admin you will have to buy a server spec up a basic server; what are
+    the Minimum requirements to run in the C URRENT Redbrick infrastructure? (4)
 12. What is a HBA? How does it differ from a Raid Controller? (2)
 13. Where are UPSs usually placed in a rack and why? (2)
 14. In a Rack, where should switches go? (1)
-15. RS232 is common connector for what kind of connection? What would you connect
-to using this connection? (3)
+15. RS232 is common connector for what kind of connection? What would you
+    connect to using this connection? (3)
 
 Total /40
 
 ## Security
+
 1. What is the standard firewall bundled with Ubuntu? (1)
 2. Show me all the files the www­data user currently has open (1)
 3. What is fail2ban? How do you unban someone who has been fail2ban’d (3)
 4. What is PAM? Where do we use it? What do we use it in conjunction with?(3)
 5. Why don’t we use FTP,POP or Telnet? (2)
-6. You’re root; you attempt to ssh to another Redbrick server; why doesn’t this work? (1)
+6. You’re root; you attempt to ssh to another Redbrick server; why doesn’t this
+   work? (1)
 7. What is a chroot? When would you use one? (3)
 8. You have forgotten the passwordsafe password; how do you gain access? (2)
 9. What is a sticky bit? Why would you enable it? (2)
-10. What is a bastion host? Why would you use one? What considerations should be made when creating a bastion host? (5)
-11. What is wrong with the below? (3)
-­rw­r­­r­­ 1 subaqua club 418 Sep 25 2013 index.php
-­rw­r­­r­­ 1 subaqua club 19930 Jan 27 09:37 license.txt
-­rw­r­­r­­ 1 subaqua club 5035 Oct 6 22:56 wp­activate.php drwxr­xr­x 9 subaqua club 4096 Dec 8 23:45 wp­admin
-­rw­r­­r­­ 1 subaqua club 271 Jan 8 2012 wp­blog­header.php ­rw­r­­r­­ 1 subaqua club 1369 Oct 3 15:47 wp­comments­post.php ­rwxrwxrwx 1 subaqua club 3052 Jan 3 21:22 wp­config.php ­rw­r­­r­­ 1 subaqua club 2853 Jan 27 09:37 wp­config­sample.php drwxr­xr­x 6 subaqua club 103 Jan 27 09:37 wp­content
-­rw­r­­r­­ 1 subaqua club 3286 May 24 2015 wp­cron.php drwxr­xr­x 16 subaqua club 8192 Dec 8 23:45 wp­includes ­rw­r­­r­­ 1 subaqua club 2380 Oct 24 2013 wp­links­opml.php ­rw­r­­r­­ 1 subaqua club 3316 Nov 5 23:59 wp­load.php ­rw­r­­r­­ 1 subaqua club 33770 Jan 27 09:37 wp­login.php ­rw­r­­r­­ 1 subaqua club 7887 Oct 6 15:07 wp­mail.php ­rw­r­­r­­ 1 subaqua club 13021 Nov 20 07:24 wp­settings.php ­rw­r­­r­­ 1 subaqua club 28594 Oct 30 08:52 wp­signup.php ­rw­r­­r­­ 1 subaqua club 4035 Nov 30 2014 wp­trackback.php ­rw­r­­r­­ 1 subaqua club 3061 Oct 2 23:46 xmlrpc.php
-12. `echo $PATH` returns the following:
-/$HOME/bin/:/home/public_html/: /usr/local/bin:/usr/local/sbin:/usr/bin: /usr/sbin:/bin:/sbin:/usr/games
-Why is this concerning? How could this be exploited? (5)
+10. What is a bastion host? Why would you use one? What considerations should be
+    made when creating a bastion host? (5)
+11. What is wrong with the below? (3) ­rw­r­­r­­ 1 subaqua club 418 Sep 25 2013
+    index.php ­rw­r­­r­­ 1 subaqua club 19930 Jan 27 09:37 license.txt
+    ­rw­r­­r­­ 1 subaqua club 5035 Oct 6 22:56 wp­activate.php drwxr­xr­x 9
+    subaqua club 4096 Dec 8 23:45 wp­admin ­rw­r­­r­­ 1 subaqua club 271 Jan 8
+    2012 wp­blog­header.php ­rw­r­­r­­ 1 subaqua club 1369 Oct 3 15:47
+    wp­comments­post.php ­rwxrwxrwx 1 subaqua club 3052 Jan 3 21:22
+    wp­config.php ­rw­r­­r­­ 1 subaqua club 2853 Jan 27 09:37
+    wp­config­sample.php drwxr­xr­x 6 subaqua club 103 Jan 27 09:37 wp­content
+    ­rw­r­­r­­ 1 subaqua club 3286 May 24 2015 wp­cron.php drwxr­xr­x 16 subaqua
+    club 8192 Dec 8 23:45 wp­includes ­rw­r­­r­­ 1 subaqua club 2380 Oct 24 2013
+    wp­links­opml.php ­rw­r­­r­­ 1 subaqua club 3316 Nov 5 23:59 wp­load.php
+    ­rw­r­­r­­ 1 subaqua club 33770 Jan 27 09:37 wp­login.php ­rw­r­­r­­ 1
+    subaqua club 7887 Oct 6 15:07 wp­mail.php ­rw­r­­r­­ 1 subaqua club 13021
+    Nov 20 07:24 wp­settings.php ­rw­r­­r­­ 1 subaqua club 28594 Oct 30 08:52
+    wp­signup.php ­rw­r­­r­­ 1 subaqua club 4035 Nov 30 2014 wp­trackback.php
+    ­rw­r­­r­­ 1 subaqua club 3061 Oct 2 23:46 xmlrpc.php
+12. `echo $PATH` returns the following: /\$HOME/bin/:/home/public_html/:
+    /usr/local/bin:/usr/local/sbin:/usr/bin: /usr/sbin:/bin:/sbin:/usr/games Why
+    is this concerning? How could this be exploited? (5)
 
 ## BSD
+
 1. Where do we use BSD? Why? (2)
-2. You’re a new rootholder, you’ve added yourself to the root group on a BSD server
-why do you still have the power of a lowly user? (2)
+2. You’re a new rootholder, you’ve added yourself to the root group on a BSD
+   server why do you still have the power of a lowly user? (2)
 3. What is pf? How would you modify it’s parameters?
 4. How do you install precompiled binaries on a BSD environment? (3)
 5. What is a Jail and why would you use one? (3)
@@ -124,27 +139,24 @@ why do you still have the power of a lowly user? (2)
 Total /20
 
 ## Containers
+
 1. What is Docker? What does Redbrick use it for? (2)
 2. What command do you use to download a docker image? Give an example usage of
-this command. (3)
-3. Write down the command you would use to launch an interactive shell in a Ubuntu
-container. (4)
-4. What is one way to keep data persistent across Docker container instances? Give an
-example of how to launch a container this way. (4)
+   this command. (3)
+3. Write down the command you would use to launch an interactive shell in a
+   Ubuntu container. (4)
+4. What is one way to keep data persistent across Docker container instances?
+   Give an example of how to launch a container this way. (4)
 5. Write down the command you would use to network two containers together. (4)
-6. If you wanted to bind port 80 on the host machine to port 22000 on a container, what
-command would you type? (4)
+6. If you wanted to bind port 80 on the host machine to port 22000 on a
+   container, what command would you type? (4)
 7. What is Kubernetes? What does Redbrick use it for? (2)
 8. What is the name of the application used to control a Kubernetes cluster? (2)
-9. Describe the following terms in the context of Kubernetes:
-  a. Node
-  b. Pod
-  c. Service
-  d. Volume (8)
+9. Describe the following terms in the context of Kubernetes: a. Node b. Pod c.
+   Service d. Volume (8)
 10. What happens to the workers if a Kubernetes master goes down? (2)
 11. What happens if you have multiple masters in one cluster? (2)
-12. You try to run a container and it doesn’t start. How would you go about debugging
-the problem? (3)
+12. You try to run a container and it doesn’t start. How would you go about
+    debugging the problem? (3)
 
 Total /40
-
diff --git a/content/help/exams/admin-test-2016-egm.md b/content/help/exams/admin-test-2016-egm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/admin-test-2016-egm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/source/help/exams/admin-test-2017-agm/index.md b/content/help/exams/admin-test-2017-agm.md
similarity index 79%
rename from source/help/exams/admin-test-2017-agm/index.md
rename to content/help/exams/admin-test-2017-agm.md
index b965488..5ed60e1 100644
--- a/source/help/exams/admin-test-2017-agm/index.md
+++ b/content/help/exams/admin-test-2017-agm.md
@@ -1,4 +1,5 @@
 # Admin Exam 2017 AGM
+
 Total Marks: 80
 
 ![Good Luck](https://pbs.twimg.com/profile_images/733673042845503489/A0mCyCC-.jpg)
@@ -8,17 +9,17 @@ Total Marks: 80
 1. What is systemd? (2 marks)
 2. What does LVM stand for and what does that actually mean? (3 marks)
 3. A user has somehow renamed a file to a name with strange unicode characters
-   and you cannot delete that file by name. How would you go about deleting
-   that file? Give commands with parameters. (4 marks)
-4. You’ve just royally screwed your shell by running cat on a binary. How do you fix
-   this? (2 Marks)
+   and you cannot delete that file by name. How would you go about deleting that
+   file? Give commands with parameters. (4 marks)
+4. You’ve just royally screwed your shell by running cat on a binary. How do you
+   fix this? (2 Marks)
 5. You’re trying to unmount /storage, but it keeps complaining about being busy.
    How do you find out what/who is using it, and kill the process/user? Also,
    how do you unmount without killing the user/process? (4 marks)
-6. You have a list of compressed files in /var/log. You need to search through the logs.
-   Give 3 ways of doing this. (3 marks)
-7. Give 5 advantages of getting a package from a package manager rather than building
-   it from source. What command would you run to update packages on a
+6. You have a list of compressed files in /var/log. You need to search through
+   the logs. Give 3 ways of doing this. (3 marks)
+7. Give 5 advantages of getting a package from a package manager rather than
+   building it from source. What command would you run to update packages on a
    redbrick server? (5 marks)
 8. You want to create a user to be used by a daemon. What do you set its shell
    to? (2 marks)
@@ -42,23 +43,28 @@ Total Marks: 80
 ## Networking [ Marks]
 
 1. What is an SFP? Where would you expect to find one? (2)
-2. Why do we only allow packets through our firewall on a select number of ports? (2)
-3. No one can seem to connect to anything on Redbrick. Walk us through how you would go about trouble shooting this. [4]
-4. People seem to be able to connect via IP but not via DNS. Name some tools you could use to trouble shoot this. [4]
-5. How would you go about looking at a config on one our switches or SRX (juniper or cisco)
+2. Why do we only allow packets through our firewall on a select number of
+   ports? (2)
+3. No one can seem to connect to anything on Redbrick. Walk us through how you
+   would go about trouble shooting this. [4]
+4. People seem to be able to connect via IP but not via DNS. Name some tools you
+   could use to trouble shoot this. [4]
+5. How would you go about looking at a config on one our switches or SRX
+   (juniper or cisco)
 6. Give the syntax for adding an entry to DNS(bind9) with the following info
-    graphs.redbrick.dcu.ie point to 136.206.15.69
-    pretty.redbrick.dcu.ie point to graphs.redbrick.dcu.ie
-    graphs.redbrick.dcu.ie also point to 2001:41d0:e:1232::1 
-7. Explain briefy what happens when you type in redbrick.dcu.ie into a browser [4]
+   graphs.redbrick.dcu.ie point to 136.206.15.69 pretty.redbrick.dcu.ie point to
+   graphs.redbrick.dcu.ie graphs.redbrick.dcu.ie also point to
+   2001:41d0:e:1232::1
+7. Explain briefy what happens when you type in redbrick.dcu.ie into a browser
+   [4]
 8. When would you use tcpdump. Give an example of its syntax [3]
 9. What is a Vlan? what are they used for? [2]
 10. What is a virtual interface? What file would you modify to create one?
 
 ## File Systems [ Marks]
 
-1. ext4, used by most modern GNU/Linux systems, is a journaling filesystem.
-   What is meant by this? (2)
+1. ext4, used by most modern GNU/Linux systems, is a journaling filesystem. What
+   is meant by this? (2)
 2. What does RAID stand for? (2)
 3. Describe the structure of 3 different RAID variations, giving advantages and
    disadvantages for each. You may describe the structure in words, or with a
@@ -68,7 +74,8 @@ Total Marks: 80
 6. What protocol(s) might you use to mount a filesystem over a network? What one
    does Redbrick use? (3)
 7. What are fdisk and gdisk? What situation would you use each in? (2)
-8. What file would you modify to mount a filesystem to the mountpoint `/webtree/` on boot? (2)
+8. What file would you modify to mount a filesystem to the mountpoint
+   `/webtree/` on boot? (2)
 9. What does the command `sync` do? (1)
 10. What are the pros and cons of Hardware RAID & Software RAID.
 11. What is a UID and a GID? Why are they useful? (3)
@@ -80,42 +87,42 @@ Total Marks: 80
 2. Why might you want to run SSH on a non-standard port? (2)
 3. You have forgotten the passwordsafe password. How do you gain access? (2)
 4. `chmod -R 777 ./*` Why is this literally the worst thing ever? (3)
-5. A user has launched a new website for another society. They type ls -l and the following is output;
-   `gobshite@azazel (~/public_html/) -> ls -l [8:25] total 12K
-   -rwxrwxrwx 1 gobshite member 116 2013-10-21 19:55 blah.php
-   -rwxrwxrwx 1 gobshite member 50 2013-10-21 19:25 database.php
-   -rwxrwxrwx 1 gobshite member 1593 2013-10-21 19:17 index.php`
+5. A user has launched a new website for another society. They type ls -l and
+   the following is output;
+   `gobshite@azazel (~/public_html/) -> ls -l [8:25] total 12K -rwxrwxrwx 1 gobshite member 116 2013-10-21 19:55 blah.php -rwxrwxrwx 1 gobshite member 50 2013-10-21 19:25 database.php -rwxrwxrwx 1 gobshite member 1593 2013-10-21 19:17 index.php`
    How would a regular user go about exploiting this? (3)
-6. Apache runs as the www-data user, yet users scripts run as themselves. How is this done? (3)
+6. Apache runs as the www-data user, yet users scripts run as themselves. How is
+   this done? (3)
 7. What is wrong with the following?
-   `mysql -u root -h mysql.internal -p=ThisIsTheRootPassword redbrickdb`
-	(2)
+   `mysql -u root -h mysql.internal -p=ThisIsTheRootPassword redbrickdb` (2)
 8. Our servers are being hammered by a load of Russian IPs. What do you do? (2)
 9. Briefly explain the purpose of each of the following: (1 each)
-	- /etc/shadow and /etc/group
-	- SELinux
-	- dm-crypt
-	- SSL
-	- Telnet
+   - /etc/shadow and /etc/group
+   - SELinux
+   - dm-crypt
+   - SSL
+   - Telnet
 10. A major Linux security vulnerability has been announced. How do you go about
     patching your machines with minimal downtime? (5)
 
 ## Scripting [30 Marks]
+
 This Section can be answered in a language of your choice.
 
 1. Mailing lists are broken and we need to send the announce to all our users.
    Write a script to send the announce to our list of users, which is stored in
-   a csv file, of `name,username,alt-mail` called `iShouldntHaveThis.csv`. (3 marks)
-2. Write a script that takes usernames and password hashes from /etc/shadow.
-   The script should then try and crack them using john the ripper. If the
-   password is found in under 10 minutes email the user their password and tell
-   them it's shit. (10 marks)
+   a csv file, of `name,username,alt-mail` called `iShouldntHaveThis.csv`. (3
+   marks)
+2. Write a script that takes usernames and password hashes from /etc/shadow. The
+   script should then try and crack them using john the ripper. If the password
+   is found in under 10 minutes email the user their password and tell them it's
+   shit. (10 marks)
 3. You've realised that we run a 10 year old version of php and update it. All
    the old php scripts break. Turns out users with old mysql password, with a
    hash of length 16 bit, need to reset their password. Write a script to find
    all users who need to change their with the old passwords, email them saying
-   they need to change their password and that their php has been disabled.
-   The script should also disable those users php if it access mysql. (10 marks)
+   they need to change their password and that their php has been disabled. The
+   script should also disable those users php if it access mysql. (10 marks)
 4. Write a script to scan all users' web directories for world editable files.
    Change their permissions to the correct permissions and email the user
    telling them the file you changed and why this is important. (5 marks)
@@ -127,18 +134,19 @@ This Section can be answered in a language of your choice.
 2. How do you make data persist across a container restart? Give an example of
    the command. (2)
 3. What are 2 methods of getting logs out of a docker container? (2)
-4. You try to run a container and it doesn’t start. How would you go about debugging
-   the problem? (3)
+4. You try to run a container and it doesn’t start. How would you go about
+   debugging the problem? (3)
 5. What command do you use to update a docker image? (1)
-6. What is the difference between docker attach and docker exec? Why would
-   you use one over the other? (2)
+6. What is the difference between docker attach and docker exec? Why would you
+   use one over the other? (2)
 7. What Is Docker-compose? What does Redbrick use it for? (2)
 8. When should you use a docker-compose file vs a Dockerfile? (3)
 9. What is a container orchestrator? And why does Redbrick not currently use
    one? (2)
-10. Give the docker command to run a container with port 8000 on the container bound to port 80 on the host. (1)
+10. Give the docker command to run a container with port 8000 on the container
+    bound to port 80 on the host. (1)
 
-## Practical [45  Marks]
+## Practical [45 Marks]
 
 2. Login with the details provided and install apache.
 3. Serve some other page that isnt the default page.
@@ -146,7 +154,6 @@ This Section can be answered in a language of your choice.
 5. add 2 users of your choice
 6. enable one of these accounts to be able to use sudo
 
-
 ## BONUS ROUND [ALL THE INTERNET POINTS]
 
 1. You've got root, what now?
diff --git a/source/help/exams/admin-test-2018-agm/index.md b/content/help/exams/admin-test-2018-agm.md
similarity index 70%
rename from source/help/exams/admin-test-2018-agm/index.md
rename to content/help/exams/admin-test-2018-agm.md
index 5a9c205..25b05d8 100644
--- a/source/help/exams/admin-test-2018-agm/index.md
+++ b/content/help/exams/admin-test-2018-agm.md
@@ -1,84 +1,103 @@
 ## Redbrick System Administrator Exam 2018
 
 ### GNU/Linux
+
 1. What is 'systemd'? What would be considered an alternative?
-2. You are trying to unmount your '/storage' volume, but 'umount' keeps compaining about it being busy.
-how would you determine who/what is using it. and kill that process? How would you unmount it without ki
-lling the process?
+2. You are trying to unmount your '/storage' volume, but 'umount' keeps
+   compaining about it being busy. how would you determine who/what is using it.
+   and kill that process? How would you unmount it without ki lling the process?
 3. What is a chroot? Why would you use one?
-4. Give 5 distinct advantages of using a package manager rather than building a program from source. Wha
-t command would you run to fully update a typical Redbrick server?
-5. Ubuntu 12.04 is a pile of shit and you need to upgrade to the latest LTS release of Ubuntu. What is y
-our process for the upgrade, such that it inconveniences users of the system the least?
-6. You have a list of hundreds of comressed logfiles in /var/log. Give 3 ways of searching through these
- logs. Manually extracting and searching them is not an option.
+4. Give 5 distinct advantages of using a package manager rather than building a
+   program from source. Wha t command would you run to fully update a typical
+   Redbrick server?
+5. Ubuntu 12.04 is a pile of shit and you need to upgrade to the latest LTS
+   release of Ubuntu. What is y our process for the upgrade, such that it
+   inconveniences users of the system the least?
+6. You have a list of hundreds of comressed logfiles in /var/log. Give 3 ways of
+   searching through these logs. Manually extracting and searching them is not
+   an option.
 7. What does 'LVM' stand for, and what does that actually mean?
 8. Give a situation where you would use each of the following commands:
-  - dig
-  - swapon
-  - tcptraceroute
-  - w
-  - du
+
+- dig
+- swapon
+- tcptraceroute
+- w
+- du
+
 9. What is LDAP? What is it used for in Redbrick?
 10. What does FHS stand for? What is it?
 
-
 ### FreeBSD
-1. What does 'BSD' stand for? What version do Redbrick use? What do we use it for?
+
+1. What does 'BSD' stand for? What version do Redbrick use? What do we use it
+   for?
 2. Illustrate one difference between a BSD system and a Linux system.
 3. What is pf?
 4. How would you get a script 'resign.sh' to run at boot time?
 5. How would you bring up a network interface on a FreeBSD system?
 6. What does 'ports' mean in the context of a FreeBSD system?
 7. How would you install a new package on FreeBSD?
-8. You've added yourself to the group 'root' on your shiny new FreeBSD server. Why have you not gained a
-ny more priveliges than a normal user?
+8. You've added yourself to the group 'root' on your shiny new FreeBSD server.
+   Why have you not gained a ny more priveliges than a normal user?
 9. What is 'dtrace' and what does it do?
 10. What tool would you use to modify users and groups on FreeBSD?
 
 ### Hardware
+
 1. What does NIC stand for?
-2. You have 5 2TB drives in a RAID 6 array. Give a short explanation of what this means, and calculate h
-ow much storage you will have available for use in this situation.
+2. You have 5 2TB drives in a RAID 6 array. Give a short explanation of what
+   this means, and calculate h ow much storage you will have available for use
+   in this situation.
 3. What does UPS stand for? Where would you mount a UPS and why?
 4. What is DAS? Does Redbrick have any DAS and if so, where?
 5. The air conditioning in your server room has failed. What do you do?
 6. Order these protocols in terms of transfer speed, high to low.
-  - SATA
-  - ATA
-  - IDE
-  - SAS
-  - SCSI
-  - QSFP+
+
+- SATA
+- ATA
+- IDE
+- SAS
+- SCSI
+- QSFP+
 
 7. What is the UUID of a disk, and why would it be useful?
 8. What is an IP-KVM? Why should you use one?
 9. What is a PERC? What sort of server would you find a PERC in?
-10. ECC memory is used in all Redbrick servers as standard. What is an advantage of this?
-
+10. ECC memory is used in all Redbrick servers as standard. What is an advantage
+    of this?
 
 ### Networking
-1. Write a DNS entry to bind the address 136.206.15.25 to azazel.redbrick.dcu.ie, assumining your $ORIGI
-N is defined as redbrick.dcu.ie.
+
+1. Write a DNS entry to bind the address 136.206.15.25 to
+   azazel.redbrick.dcu.ie, assumining your \$ORIGI N is defined as
+   redbrick.dcu.ie.
 2. What does BGP stand for? What sitations would it typically be used in?
-3. What ports do the following services typically use? What protocols do they use?
-  - DNS
-  - HTTPS
-  - VNC
-  - IRC
-  - SMTP
+3. What ports do the following services typically use? What protocols do they
+   use?
+
+- DNS
+- HTTPS
+- VNC
+- IRC
+- SMTP
+
 4. What is SNMP? What could SNMP be used for?
 5. Redbrick owns 2x /24 of IPv4. What does this mean?
-6. What command would you run on one of our Ubuntu 14.04 machines to get rid of your current IP address,
- and request a new one?
-7. You should always change the serial number when modifying DNS entries. What does this mean, and why s
-hould you do it? What would happen if you didn't?
-8. What file would you modify on a Ubuntu system to make changes to network interfaces persistent?
-9. We use Cisco and Juniper switches in Redbrick. How would you view the currently running config on a C
-isco switch? How would you ensure this config remains persistent after a restart of the switch?
-10. How many disparate networks exist within Redbrick? What are they all used for?
+6. What command would you run on one of our Ubuntu 14.04 machines to get rid of
+   your current IP address, and request a new one?
+7. You should always change the serial number when modifying DNS entries. What
+   does this mean, and why s hould you do it? What would happen if you didn't?
+8. What file would you modify on a Ubuntu system to make changes to network
+   interfaces persistent?
+9. We use Cisco and Juniper switches in Redbrick. How would you view the
+   currently running config on a C isco switch? How would you ensure this config
+   remains persistent after a restart of the switch?
+10. How many disparate networks exist within Redbrick? What are they all used
+    for?
 
 ### File Systems
+
 1. What is an inode? How would you find one?
 2. What are symlinks? Give two ways in which they differ from hardlinks.
 3. Why does a user's public_html directory have the mode lrwxrwxrwx?
@@ -87,33 +106,44 @@ isco switch? How would you ensure this config remains persistent after a restart
 6. Express the following in octal format: drwxrw-rw-
 7. How would you mount the volume /dev/sda3 read-only to /redbrick/eggs?
 8. Briefly explain the following:
-  - RAID 10
-  - RAID 5
-  - ZFS
-  - umask
-  - Sticky Bit
+
+- RAID 10
+- RAID 5
+- ZFS
+- umask
+- Sticky Bit
+
 9. What are /etc/mtab and /etc/fstab used for?
 10. What is the difference between MBR and GPT?
 11. What are fdisk and gdisk, and in what situations would you use each?
 12. What does the 'sync' command do? When should it be used?
 
-
 ### Security
+
 1. On a Linux system, how would you disable SSH access for the root user?
 2. What is fail2ban? How would you help a user who has fallen foul of fail2ban?
 3. Briefly explain the purpose of each of the following:
-  - /etc/shadow
-  - SElinux
-  - dm-crypt
-  - SSL
-  - KPTI
+
+- /etc/shadow
+- SElinux
+- dm-crypt
+- SSL
+- KPTI
+
 4. What is wrong with the following command?
-  - mysql -uroot -hmysql.internal -p=HelloIAmTheRootPassword
-5. Our Apache servers run as the 'www-data' user, yet users' own scripts run as those users. How is this achieved?
-6. You see a massive spike in traffic from a pile of Chinese IP addresses. What do you do?
-7. What are Spectre and Meltdown? Briefly explain how ONE of them could be exploited.
+
+- mysql -uroot -hmysql.internal -p=HelloIAmTheRootPassword
+
+5. Our Apache servers run as the 'www-data' user, yet users' own scripts run as
+   those users. How is this achieved?
+6. You see a massive spike in traffic from a pile of Chinese IP addresses. What
+   do you do?
+7. What are Spectre and Meltdown? Briefly explain how ONE of them could be
+   exploited.
 8. Name 3 things you would do to secure a newly-installed Ubuntu 16.04 server.
-9. You left a terminal unlocked where you were logged into a Redbrick server as root. Someone has done something nefarious, and deleted the history files. How could you go about finding out what they did?
+9. You left a terminal unlocked where you were logged into a Redbrick server as
+   root. Someone has done something nefarious, and deleted the history files.
+   How could you go about finding out what they did?
 10. What is the difference between 'sudo' and 'su'?
 11. How would you view the currently enforced iptables rules on a system?
 12. What is PAM? What do we use it in conjunction with?
@@ -121,26 +151,33 @@ isco switch? How would you ensure this config remains persistent after a restart
 14. What is a CVE, and why should you care?
 15. Tell us something interesting you know about computer security.
 
-
 ### Containers & Process Isolation
+
 1. What is a container? How does one differ from a VM?
 2. What is LXC? List 2 differences between LXC and Docker.
-3. When running a Docker container, how would you bind port 22000 on the host to port 80 of the container?
-4. What command would you use to download a Docker image from a registy? Give an example usage of this command.
+3. When running a Docker container, how would you bind port 22000 on the host to
+   port 80 of the container?
+4. What command would you use to download a Docker image from a registy? Give an
+   example usage of this command.
 5. Illustrate 3 differences between Docker Swarm and Kubernetes.
 6. What is a container orchestrator?
 7. What is the difference between 'docker attach' and 'docker exec'?
 8. What is Rkt?
-9. In the context of a container orchestrator, what is the significance of the term 'consensus'?
+9. In the context of a container orchestrator, what is the significance of the
+   term 'consensus'?
 10. What command would you use to delete unused Docker images & volumes?
 
-
 ### Scripting
+
 1. Write a short script to amuse us.
-2. Given a list of Redbrick usernames, how would you send an email to all of those usernames, in the event our mailing lists were down?
-3. Write a script to retrieve the logs of all currently running Docker containers on a system, and compress each one into a .tar file with the same name as the source container.
+2. Given a list of Redbrick usernames, how would you send an email to all of
+   those usernames, in the event our mailing lists were down?
+3. Write a script to retrieve the logs of all currently running Docker
+   containers on a system, and compress each one into a .tar file with the same
+   name as the source container.
 
 ### Practical
+
 password is adminexam
 
 3. Install fail2ban
@@ -151,5 +188,3 @@ password is adminexam
 8. Create the 'haxor' user
 9. Remove pi user
 10. Create a new user called pi with no login shell
-
-
diff --git a/source/help/exams/exam.jpg b/content/help/exams/exam.jpg
similarity index 100%
rename from source/help/exams/exam.jpg
rename to content/help/exams/exam.jpg
diff --git a/source/help/exams/admin-test-2016-egm/gotroot.png b/content/help/exams/gotroot.png
similarity index 100%
rename from source/help/exams/admin-test-2016-egm/gotroot.png
rename to content/help/exams/gotroot.png
diff --git a/source/help/exams/helpdesk-test-2000-agm/index.md b/content/help/exams/helpdesk-test-2000-agm.md
similarity index 97%
rename from source/help/exams/helpdesk-test-2000-agm/index.md
rename to content/help/exams/helpdesk-test-2000-agm.md
index 8edf00f..a85be3a 100644
--- a/source/help/exams/helpdesk-test-2000-agm/index.md
+++ b/content/help/exams/helpdesk-test-2000-agm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2000 AGM'
+title: Helpdesk test 2000 AGM
 ---
 
 
-------------------------------Helpdesk Test April 2000-------------------------------
@@ -7,7 +7,7 @@ title: 'Helpdesk test 2000 AGM'
 1) "I want to change my real name to Ted Bundy, how do I do this?"
 
 2) "Hi this is munchkin mailing from bob's account. I've forgotten
-    my password, can u please send it to me at my hotmail addy: munchkin456@hotmail.com 
+    my password, can u please send it to me at my hotmail addy: munchkin456@hotmail.com
         - can it be quick I'm in a hurry to send an imortant mail
 
 3)  I can read the news groups okay but if I try to post it says that I am unable
@@ -46,7 +46,7 @@ if this helps
 13) I know u probally get asked this loadsbut how do u set up a web page?
 
 14) Hi, I've create dthe basics of a webpage following the instruction on ur help
-    page but when I go to access it I get the error message "U don't have permission 
+    page but when I go to access it I get the error message "U don't have permission
     to acceess /~prince_v/ on this server" can u help"
 
 15) How do I post messages to the news groups?
diff --git a/content/help/exams/helpdesk-test-2001-agm.md b/content/help/exams/helpdesk-test-2001-agm.md
new file mode 100644
index 0000000..6b7329e
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2001-agm.md
@@ -0,0 +1,69 @@
+---
+title: Helpdesk test 2001 AGM
+---
+
+1.  I want to make a webpage but I can’t copy my files from my floppy. I type in
+    : "cp a:\webpage\*.htm ~/public_html" but it doesn’t work. What am I doing
+    wrong?
+2.  My friend changed his password but he has forgotten what he changed it to
+    (excess alcohol seems to be the problem!). Can you mail me his password
+    please?
+3.  Please can you tell me how to attach a word file to an e-mail. the file is
+    on the a: drive When I try to attach it won't let me select a:
+4.  Just writing to ask if there is any way that I can access the newsgroups on
+    redbrick via email.  I'd like to be able to get them at home.
+5.  Can you please tell me how to chat to other Brickies online???
+6.  Is it possible to POP into my redbrick email (ie using hotmail for example)
+7.  On Mother, how does one make a web page?
+8.  How do I set up PGP for my mails?
+9.  I'd like to be able to sort all of my incoming mail into separate folders.
+    Is there any way that I could possibly do this? And if so, could you tell me
+    how please?
+10. I have this computer-freak friend, and he says SSH is cool. I don’t want to
+    sound silly, so can you tell me what it is, and tell me how I can set it up,
+    just so that I can impress this “friend”?
+11. I keep getting this message when I'm trying to get from tcsh into flin
+    ````
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	Directive: `Menu'
+    		calling func()
+    		define_menu()
+    	104: Unrecognized directive: `n'
+    	```
+    Know what causes it?
+    ````
+12. I suddenly realised that I'm not subscibed to the babble board! How could
+    this happen? Please help me get it back, because I can't survive long
+    without my daily dose of babble!!!!!
+13. Hi, I'm the new treasurer of the film soc. Can you tell me how to set up a
+    mailing list so that I can send a mail to all my members at once?
+14. I'm using elm, since I despise mutt, can you tell me how to set up my
+    signature please?
+15. I'm an erasmus student studying here for the year. I'd like to telnet to my
+    account over in Germany,is it possible to telnet outside of DCU?
+16. I'm in the Henry Gratten building at the moment, how can I telnet to
+    Redbrick? I can't find the Start button. (ooh, and how am I writing this
+    mail to you? ;) )
+17. What unix command lets you compare 2 similar text files? Can u view them
+    side by side?
+18. Hi, I just joined last week, and I have a wee problem. How in the name of
+    God do you set up an address book?! Please help. I'm tearing my hair out
+    here.
+19. I was trying to send mail, and the system asked me for a keyId, what does
+    that mean?
+20. What does it mean when it says that slrn is 'locked'? I wanna read the
+    messages. _Sniff_
diff --git a/source/help/exams/helpdesk-test-2002-agm/index.md b/content/help/exams/helpdesk-test-2002-agm.md
similarity index 96%
rename from source/help/exams/helpdesk-test-2002-agm/index.md
rename to content/help/exams/helpdesk-test-2002-agm.md
index c9c0c6f..87599ee 100644
--- a/source/help/exams/helpdesk-test-2002-agm/index.md
+++ b/content/help/exams/helpdesk-test-2002-agm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2002 AGM'
+title: Helpdesk test 2002 AGM
 ---
 
 
1) On Mother, how does one make a web page?
@@ -10,7 +10,7 @@ title: 'Helpdesk test 2002 AGM'
 
    what do I do? (and more importantly, how am I writing this mail. :-))
 
-3) I want to change my username to luser! 
+3) I want to change my username to luser!
 
 4) My friend tom has lost his password, can you send it to me?
 
@@ -20,7 +20,7 @@ title: 'Helpdesk test 2002 AGM'
 
 7) According to a friend of mine, I was told that there is something wrong
  with my path as I was unable to run some executable programs that I compiled
- myself in my own directory. Could you help me sort this problem out? 
+ myself in my own directory. Could you help me sort this problem out?
 
 8) I want to know how would I go about logging straight into a shell
 instead of Flin. What I mean is how do i change my shell from Flin to tcsh?
diff --git a/source/help/exams/helpdesk-test-2003-agm/index.md b/content/help/exams/helpdesk-test-2003-agm.md
similarity index 67%
rename from source/help/exams/helpdesk-test-2003-agm/index.md
rename to content/help/exams/helpdesk-test-2003-agm.md
index 3e557c3..4c100de 100644
--- a/source/help/exams/helpdesk-test-2003-agm/index.md
+++ b/content/help/exams/helpdesk-test-2003-agm.md
@@ -1,309 +1,508 @@
 ---
-title: 'Helpdesk test 2003 AGM'
+title: Helpdesk test 2003 AGM
 ---
 
-Howdy folks,  
-Below are 25 questions regarding "how do I use redbrick". All questions are in the form of a mail or hey from our imaginary user [jsmith@redbrick.dcu.ie](mailto:jsmith@redbrick.dcu.ie). All questions should be answered as if you were actually replying to him for real. Each question is worth either 3 or 4 marks but you should try and get as much into your answers as possible. As there may be more than 1 correct response. If a question has four marks going for it. It’s more than like gonna be long, or have a couple of parts   
-
-You can assume for the questions that the user is using the following programs.  
-Mutt    (for mail)  
-Slrn    (for news)  
-BitchX     (for chat)  
-
-Best of luck  
-
-Eoin ‘cambo’ Campbell  
-Declan ‘skyhawk’ McMullen  
-Declan ‘dec’ O’Neill  
-
-1.    (3 MARKS)  
-Dear Helpdesk,  
-    my name is john smith and i joined with the username jsmith  
-    on clubs and socs day. But i've lost my password. Can you send  
-    it to me again at my Computer Applications address  
-    jsmith-case3@computing.dcu.ie  
+Howdy
+folks,  
+Below
+are 25 questions regarding "how do I use redbrick". All questions are in the
+form of a mail or hey from our imaginary user
+[jsmith@redbrick.dcu.ie](mailto:jsmith@redbrick.dcu.ie).
+All questions should be answered as if you were actually replying to him for
+real. Each question is worth either 3 or 4 marks but you should try and get as
+much into your answers as possible. As there may be more than 1 correct
+response. If a question has four marks going for it. It’s more than like gonna
+be long, or have a couple of parts
+
+
+You
+can assume for the questions that the user is using the following
+programs.  
+Mutt
+(for mail)  
+Slrn
+(for news)  
+BitchX
+    (for chat)
+
+Best
+of luck
+
+Eoin
+‘cambo’ Campbell  
+Declan
+‘skyhawk’ McMullen  
+Declan
+‘dec’ O’Neill
+
+1.
+(3 MARKS)  
+Dear
+Helpdesk,  
+
+my name is john smith and i joined with the username jsmith  
+
+on clubs and socs day. But i've lost my password. Can you send  
+
+it to me again at my Computer Applications address  
+
+jsmith-case3@computing.dcu.ie  
 Cheers,  
 John.
 
-* * *
+---
 
-2*Marks for mailing admins CC'ing user.  
-1*Mark for reminding that'll go to his Stumail account for  
+2*Marks
+for mailing admins CC'ing user.  
+1*Mark
+for reminding that'll go to his Stumail account for  
  security
 
-* * *
+---
 
-2. (4 MARKS)  
-hey guys,  
-    jsmith here again. finally getting the hang of this whole unix  
-    thing. gotta a bit of a problem tho. I've been sending heys to  
-    the lads but every now and again the the terminal hangs and i  
-    have to quit redbrick. and other times the terminal closes  
-    straight after i send the hey. can you please tell me how i'm  
-    screwing up.  
+2.
+(4
+MARKS)  
+hey
+guys,  
+
+jsmith here again. finally getting the hang of this whole unix  
+
+thing. gotta a bit of a problem tho. I've been sending heys to  
+
+the lads but every now and again the the terminal hangs and i  
+
+have to quit redbrick. and other times the terminal closes  
+
+straight after i send the hey. can you please tell me how i'm  
+
+screwing up.  
 Cheers,  
 John.
 
-* * *
+---
 
-2*Marks for explaining CTRL-D and ignoreeof  
-2*Marks for the CTRL-S / CTRL-Q terminal freeze commands
+2*Marks
+for explaining CTRL-D and ignoreeof  
+2*Marks
+for the CTRL-S / CTRL-Q terminal freeze commands
 
-* * *
+---
 
-3. (4 MARKS)  
-Message from jsmith on prodigy (pts/999) [ Mon 01/Jan/2003 00:00:00 ] ...  
+3.
+(4
+MARKS)  
+Message
+from jsmith on prodigy (pts/999) [ Mon 01/Jan/2003 00:00:00 ] ...  
       oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-      o hey man                                                        o  
-      o was just reading the news groups but it my laptop went to cack o  
-      o and when i logged back in i cant read'em. this is what it says o  
-      o                                                                o  
-      o Reading startup file /usr/local/etc/slrn/slrn.rc.              o  
-      o loading /usr/local/etc/slrn/slrn.sl                            o  
-      o Reading startup file /home/member/j/jsmith/.slrnrc.            o  
-      o loading /usr/local/share/slrn/posthook.sl                      o  
-      o Using newsrc file /home/member/j/jsmith/.jnewsrc for server    o  
-      o news.redbrick.dcu.ie.slrn fatal error:                         o  
-      o slrn: pid 14212 is locking the newsrc file.                    o  
-      o                                                                o  
-      o whats up?                                                      o  
+      o
+hey man                                                        o  
+      o
+was just reading the news groups but it my laptop went to cack o  
+      o
+and when i logged back in i cant read'em. this is what it says o  
+      o
+                                                               o  
+      o
+Reading startup file /usr/local/etc/slrn/slrn.rc.              o  
+      o
+loading /usr/local/etc/slrn/slrn.sl                            o  
+      o
+Reading startup file /home/member/j/jsmith/.slrnrc.            o  
+      o
+loading /usr/local/share/slrn/posthook.sl                      o  
+      o
+Using newsrc file /home/member/j/jsmith/.jnewsrc for server    o  
+      o
+news.redbrick.dcu.ie.slrn fatal error:                         o  
+      o
+slrn: pid 14212 is locking the newsrc file.                    o  
+      o
+                                                               o  
+      o
+whats up?                                                      o  
       oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
 
 
-* * *
+---
 
-2*Marks for kill command / pid  
-2*for jobs/fg/CTRL-Z explanation
+2*Marks
+for kill command / pid  
+2*for
+jobs/fg/CTRL-Z explanation
 
-* * *
+---
 
-4. (4 MARKS)  
-yo dudes,  
-    cambo was telling me i should learn how to make my heys a  
-    little more personalised or something. any idea what he was talking  
-    about or pointers on how to do it.  
+4.
+(4
+MARKS)  
+yo
+dudes,  
+
+cambo was telling me i should learn how to make my heys a  
+
+little more personalised or something. any idea what he was talking  
+
+about or pointers on how to do it.  
 thanx,  
 john
 
-* * *
+---
 
-2*Marks on how to set ENV variables  
-1*Mark on hey parameters -t,-b etc...  
-1*Mark pointer to the helpdesk section on the website
+2*Marks
+on how to set ENV variables  
+1*Mark
+on hey parameters -t,-b etc...  
+1\*Mark
+pointer to the helpdesk section on the website
 
-* * *
+---
 
-5. (3 MARKS)  
-hey guys,  
-    3yr project is coming up in a few weeks and i wanna be on the  
-    ball. can i get you guys to setup a mysql account for me on  
-    redbrick and let me know how i start it.  
+5.
+(3
+MARKS)  
+hey
+guys,  
+
+3yr project is coming up in a few weeks and i wanna be on the  
+
+ball. can i get you guys to setup a mysql account for me on  
+
+redbrick and let me know how i start it.  
 cheers,  
 john
 
-* * *
+---
 
-1*Mark on mail admins CC user saying its being done  
-2*Marks on how to command - mysql -u jsmith -d jsmith -p
+1*Mark
+on mail admins CC user saying its being done  
+2*Marks
+on how to command - mysql -u jsmith -d jsmith -p
 
-* * *
+---
 
-6. (3 MARKS)  
-Message from jsmith on prodigy (pts/999) [ Mon 01/Jan/2003 00:00:00 ] ...  
-       x^^^^^^^^^^^^^^^^^^  -='., jsmith-hey ,.'=-  ^^^^^^^^^^^^^^^^^^x  
-       | hey eoin                                                     |  
-       | i'm sick to death of those colours that on the command       |  
-       | prompt as default. any way to change em. someone told me to  |  
-       | look in the .zshrc file for them but theres nothing in there |  
-       | really.                                                      |  
-       | cheers.                                                      |  
+6.
+(3
+MARKS)  
+Message
+from jsmith on prodigy (pts/999) [ Mon 01/Jan/2003 00:00:00 ] ...  
+       x^^^^^^^^^^^^^^^^^^
+ -='., jsmith-hey ,.'=-  ^^^^^^^^^^^^^^^^^^x  
+       |
+hey eoin                                                     |  
+       |
+i'm sick to death of those colours that on the command       |  
+       |
+prompt as default. any way to change em. someone told me to  |  
+       |
+look in the .zshrc file for them but theres nothing in there |  
+       |
+really.                                                      |  
+       |
+cheers.                                                      |  
        x--------------------------------------------------------------x  
 
 
-* * *
+---
 
-1*Mark for telling them that they are in /etc/zshrc which is why  
- they couldn't find em.  
-1*Marks for a quick explanation of PS1 / RPS1 / what they are,  
- how to set them  
-1*Mark for pointing them towards the relative helpdesk pages
+1*Mark
+for telling them that they are in /etc/zshrc which is why  
+ they
+couldn't find em.  
+1*Marks
+for a quick explanation of PS1 / RPS1 / what they are,  
+ how
+to set them  
+1\*Mark
+for pointing them towards the relative helpdesk pages
 
-* * *
+---
 
-7. (3 MARKS)  
-Hey guys,  
-I was talking to cambo on hey, and he pointed me the right direction  
-for a nice colouredy command prompt. is there anyway to colour in the  
-result of commands to. I want to be able to give different types of  
-files a different colour when i LS a directory  
+7.
+(3
+MARKS)  
+Hey
+guys,  
+I
+was talking to cambo on hey, and he pointed me the right direction  
+for
+a nice colouredy command prompt. is there anyway to colour in the  
+result
+of commands to. I want to be able to give different types of  
+files
+a different colour when i LS a directory  
 cheers,  
-John Smith
+John
+Smith
 
-* * *
+---
 
-3*Marks alias ls='colorls -FGal'  
-     or  
-     alias ls='gls --color -al'
+3\*Marks
+alias ls='colorls -FGal'  
+
+ or  
+
+ alias ls='gls --color -al'
 
-* * *
+---
 
-8. (3 MARKS)  
-Its the last prompt-ey question i promise ;)  
-just wondering how i do that thing that tells you  
-when people login or out of the system.
+8.
+(3
+MARKS)  
+Its
+the last prompt-ey question i promise ;)  
+just
+wondering how i do that thing that tells you  
+when
+people login or out of the system.
 
-* * *
+---
 
-2*Marks for  
-    LOGCHECK=1;  
-    WATCHFMT="%b[%B%n%b] %U%a%u from terminal %M %Uat %T%u";  
-    watch=all  
+2\*Marks
+for  
+
+LOGCHECK=1;  
+
+WATCHFMT="%b[%B%n%b] %U%a%u from terminal %M %Uat %T%u";  
+
+watch=all
 
-1*Mark for watch=(`cat ~/.friends`)
+1\*Mark
+for watch=(`cat ~/.friends`)
 
-* * *
+---
 
-9. (4 MARKS)  
-Hey skyhawk,  
-    you see that post on the boards about the grand prix. how  
-    would i go about saving that to a text file in my account.  
-    and how do i send a post via mail to someone else.  
+9.
+(4
+MARKS)  
+Hey
+skyhawk,  
+
+you see that post on the boards about the grand prix. how  
+
+would i go about saving that to a text file in my account.  
+
+and how do i send a post via mail to someone else.  
 Cheers,  
 J
 
-* * *
+---
 
-2*Marks for telling them how to forward a post via mail ‘F’  
-2*Marks for telling them how to save a post to a text file ‘o’
+2*Marks
+for telling them how to forward a post via mail ‘F’  
+2*Marks
+for telling them how to save a post to a text file ‘o’
 
-* * *
+---
 
-10. (3 MARKS)  
-Message from jsmith on prodigy (pts/999) [ Mon  01/Jan/2003 00:00:00 ] ...  
-                   x^^^^^^  -='., jsmith-hey ,.'=-  ^^^^^^x  
-                   | hey bud,                             |  
-                   | is there anyway to spell check posts |  
-                   | in slrn before i post them.          |  
-                   | thanx                                |  
+10.
+(3
+MARKS)  
+Message
+from jsmith on prodigy (pts/999) [ Mon  01/Jan/2003 00:00:00 ] ...  
+                   x^^^^^^
+ -='., jsmith-hey ,.'=-  ^^^^^^x  
+                   |
+hey bud,                             |  
+                   |
+is there anyway to spell check posts |  
+                   |
+in slrn before i post them.          |  
+                   |
+thanx                                |  
                    x--------------------------------------x  
 
 
-* * *
+---
 
-3*Marks For the command and correct syntax of the command  
- interpret "/usr/local/share/slrn/posthook.sl"
+3\*Marks
+For the command and correct syntax of the command  
+ interpret
+"/usr/local/share/slrn/posthook.sl"
 
-* * *
+---
 
-11. (4 MARKS)  
-hey lads,  
-    Just wondering, can you change the order of the posts in slrn.  
-    i'd like to have them in order of date rather than alphabetically.  
+11.
+(4
+MARKS)  
+hey
+lads,  
+
+Just wondering, can you change the order of the posts in slrn.  
+
+i'd like to have them in order of date rather than alphabetically.  
 Cheers,  
 John.
 
-* * *
+---
 
-2*Marks for command on ESC-s followed by '8' or '9' for threaded  
-    and non threaded sorting by date  
-2*Marks for "set sorting_method 9" command in .slrnrc
+2*Marks
+for command on ESC-s followed by '8' or '9' for threaded  
+
+and non threaded sorting by date  
+2*Marks
+for "set sorting_method 9" command in .slrnrc
 
-* * *
+---
 
-12. (3 MARKS)  
-My christ,  
-    sorry for the rant but if i have to see one more post from those  
-    contrary fucking associates i'll scream. any way to block posts for a user.  
-    
+12.
+(3
+MARKS)  
+My
+christ,  
+
+sorry for the rant but if i have to see one more post from those  
+
+contrary fucking associates i'll scream. any way to block posts for a
+user.  
+
+
 
-* * *
+---
 
-2*Marks for creatings a .scorefile and adding 'set scorefile ".scorefile"'  
-    to the .slrnrc  
-1*Marks for using the 'k' button in slrn to block posts.
+2*Marks
+for creatings a .scorefile and adding 'set scorefile ".scorefile"'  
+
+to the .slrnrc  
+1*Marks
+for using the 'k' button in slrn to block posts.
 
-* * *
+---
 
-13. (4 MARKS)  
-lads got a quick question,  
-    how do i go into chat with a different nickname? i know i'm not  
-    supposed to (thats what i hear anyway) but just for the laugh i'd  
-    like to know how to do it. some people login as different names and  
-    some people change their name in there so i'd like to know both ways.  
+13.
+(4
+MARKS)  
+lads
+got a quick question,  
+
+how do i go into chat with a different nickname? i know i'm not  
+
+supposed to (thats what i hear anyway) but just for the laugh i'd  
+
+like to know how to do it. some people login as different names and  
+
+some people change their name in there so i'd like to know both ways.  
 thanks,  
-john.  
+john.
 
-* * *
+---
 
-2*Marks for BitchX name irc.redbrick.dcu.ie -c "#lobby"  
-2*Marks for /name new_name
+2*Marks
+for BitchX name irc.redbrick.dcu.ie -c "#lobby"  
+2*Marks
+for /name new_name
 
-* * *
+---
 
-14. (3 MARKS)  
-me again,  
-    meant to ask the last time, how do i send a message that only  
-    one person will be able to see.  
+14.
+(3
+MARKS)  
+me
+again,  
+
+meant to ask the last time, how do i send a message that only  
+
+one person will be able to see.  
 thanx
 
-* * *
+---
 
-3*Marks /msg username this is my message
+3\*Marks
+/msg username this is my message
 
-* * *
+---
 
-15. (3 MARKS)  
-hey cambo,  
-    I know you told me that redbrick was cool for email but i'm  
-    just pissed off with that shitty text only interface. can i  
-    read and send mails from my redbrick account using outlook.  
-    how do i set it up.  
+15.
+(3
+MARKS)  
+hey
+cambo,  
+
+I know you told me that redbrick was cool for email but i'm  
+
+just pissed off with that shitty text only interface. can i  
+
+read and send mails from my redbrick account using outlook.  
+
+how do i set it up.  
 thanx,  
 j
 
-* * *
+---
+
+3\*Marks
+For Mail receiving setup. POP/SMTP = prodigy.redbrick.dcu.ie  
+username
+and password
+
+---
 
-3*Marks For Mail receiving setup. POP/SMTP = prodigy.redbrick.dcu.ie  
-username and password
+16.
+(3
+MARKS)  
+hey
+again eoin,  
+
+well that didn't take long for outlook express to get on  
+
+my tits. I'm gonna give text based email another chance  
+
+but is there anyway for me to setup mail folders/filters  
+
+in redbrick. how do i setup a folder so that all mail that comes  
+
+in forwarded from my yahoo account gets filtered to it.
 
-* * *
+---
 
-16. (3 MARKS)  
-hey again eoin,  
-    well that didn't take long for outlook express to get on  
-    my tits. I'm gonna give text based email another chance  
-    but is there anyway for me to setup mail folders/filters  
-    in redbrick. how do i setup a folder so that all mail that comes  
-    in forwarded from my yahoo account gets filtered to it.
+1*Mark
+for yes its possible using procmail, and a procmailrc file  
+2*Marks
+for this rule in your procmailrc  
+
+:0 :.myyahoolock  
+
 
-* * *
+- ^(To|Cc|Delivered-to): .\*jsmith@yahoo.com.\*  
+  
+  myyahoomail
 
-1*Mark for yes its possible using procmail, and a procmailrc file  
-2*Marks for this rule in your procmailrc  
-    :0 :.myyahoolock  
-    * ^(To|Cc|Delivered-to): .*jsmith@yahoo.com.*  
-    myyahoomail  
+---
 
-* * *
+17.
+(3
+MARKS)  
+Message
+from jsmith on prodigy (pts/999) [ Mon  01/Jan/2003 00:00:00 ] ...  
+   x^^^^^^^^^^^^^^^^^^^^^^
+ -='., jsmith-hey ,.'=-  ^^^^^^^^^^^^^^^^^^^^^^x  
+   |
+oh yeah...... i've another procmail question                         |  
+   |
+what sort of rule would i need for filtering my CA tutoring mail.    |  
+   |
+it can come from a few different lecturers but it always has "CA103" |  
+   |
+somewhere in the subject                                             |  
+   x----------------------------------------------------------------------x
 
-17. (3 MARKS)  
-Message from jsmith on prodigy (pts/999) [ Mon  01/Jan/2003 00:00:00 ] ...  
-   x^^^^^^^^^^^^^^^^^^^^^^  -='., jsmith-hey ,.'=-  ^^^^^^^^^^^^^^^^^^^^^^x  
-   | oh yeah...... i've another procmail question                         |  
-   | what sort of rule would i need for filtering my CA tutoring mail.    |  
-   | it can come from a few different lecturers but it always has "CA103" |  
-   | somewhere in the subject                                             |  
-   x----------------------------------------------------------------------x  
+---
 
-* * *
+3\*Marks  
+
+:0 :.ca103lock  
+
 
-3*Marks  
-    :0 :.ca103lock  
-    * ^(Subject): .*CA103.*  
-    CA103Mail
+- ^(Subject): ._CA103._  
+  
+  CA103Mail
 
-* * *
+---
 
-18. (3 MARKS)  
-Well lads,  
-    I decided that since I'll have a few weeks off over the hols, i'm gonna
+18.
+(3
+MARKS)  
+Well
+lads,  
+
+I decided that since I'll have a few weeks off over the hols, i'm gonna
diff --git a/source/help/exams/helpdesk-test-2004-agm/index.md b/content/help/exams/helpdesk-test-2004-agm.md
similarity index 74%
rename from source/help/exams/helpdesk-test-2004-agm/index.md
rename to content/help/exams/helpdesk-test-2004-agm.md
index 05ecada..d544f07 100644
--- a/source/help/exams/helpdesk-test-2004-agm/index.md
+++ b/content/help/exams/helpdesk-test-2004-agm.md
@@ -1,103 +1,120 @@
 ---
-title: 'Helpdesk test 2004 AGM'
+title: Helpdesk test 2004 AGM
 ---
 
 Howdy,  
-         Below are 33 questions regarding ``how do I use redbrick''. All questions are in the  
-form of a mail or hey from our imaginary user jblg@rebrick.dcu.ie. All questions should be  
-answered as if you were actually replying to him for real. Each question is worth either 3  
-but you should try and get as much into your answers as possible, as there may be more  
-than 1 correct response.  
-
-You can assume for the questions that the user is using the following programs.  
+         Below are 33 questions regarding ``how do I use redbrick''. All
+questions are in the  
+form of a mail or hey from our imaginary user
+jblg@rebrick.dcu.ie.
+All questions should be  
+answered as if you were actually replying to him for real. Each question is
+worth either 3  
+but you should try and get as much into your answers as possible, as there may
+be more  
+than 1 correct response.
+
+You can assume for the questions that the user is using the following
+programs.  
 Mutt     (for mail)  
 Slrn     (for news)  
-BitchX   (for chat)  
+BitchX   (for chat)
 
-Best of luck  
+Best of luck
 
 Eoin `cambo' Campbell  
 Una 'keloe' Kehoe  
-Ning 'sunshine' Sun  
+Ning 'sunshine' Sun
 
----------------------------------------------------EXAM-----------------------------------------------------------QUESTION 1  
+---------------------------------------------------EXAM-----------------------------------------------------------QUESTION
+1  
          Dear Helpdesk,  
-        Everytime when I hey mates I have to type "hey -b -t..." It's pain in the neck,  
+        Everytime when I hey mates I have to type "hey -b -t..." It's pain in
+the neck,  
          How do I make it short?  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 2  
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:25:18 ] ...  
-+------------------------------------- joe blogg -----------------------------------------------+  
++------------------------------------- joe blogg
+-----------------------------------------------+  
 | hey guys, how do I make changes to my plan so people can see it      |  
 | when they finger me ?                           |  
-+_______________________________________________________+  
++\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***\_\_\_\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***+  
   
 QUESTION 3.  
          Helpdesk,  
-         Hi can you help me with this: I'm using a screen window for receiving heys, I just  
-         realised that even if i'm mesg y i don't receive heys.Whats up with this?  
-         Joe Blogg  
+         Hi can you help me with this: I'm using a screen window for receiving
+heys, I just  
+         realised that even if i'm mesg y i don't receive heys.Whats up with
+this?  
+         Joe Blogg
 
 QUESTION 4\.  
          Helpdesk,  
-         How do I set up the file permissions for my .project? And are they the same permission for a perl  
+         How do I set up the file permissions for my .project? And are they the
+same permission for a perl  
          script? If not, what are it the permissions for a script?  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 5\.  
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:38:58 ] ...  
-+--------------------------------- joe blogg----------------------------------+  
++--------------------------------- joe
+blogg----------------------------------+  
 | How do I go about setting up a webpage on redbrick? I.e where do i    |  
 | put my files and what permissions should i use? |  
-+__________________________________________________________+  
-EOF  
++\***\*\*\*\*\*\*\***\*\*\*\*\***\*\*\*\*\*\*\***\_\_\***\*\*\*\*\*\*\***\*\*\*\*\***\*\*\*\*\*\*\***+  
+EOF
 
 QUESTION 6  
          Helpdesk,  
-        What does PHP stand for? What kind of programming language is PHP? what are the  
-         permissions for PHP files? why is all the PHP files on Redbrick having  
+        What does PHP stand for? What kind of programming language is PHP? what
+are the  
+         permissions for PHP files? why is all the PHP files on Redbrick
+having  
         #!/usr/local/bin/php as the first line?  
-         Joe Blogg  
+         Joe Blogg
 
-QUESTION 7  
+QUESTION 7
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:43:47 ] ...  
 +-------------------------------- joe blogg ---------------------------------+  
 | How do I go about changing my signature on emails from my redbrick    |  
 | a/c?                                     |  
-+________________________________________________________+  
++\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***\_\_\_\_\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***+
 
 QUESTION 8  
          Helpdesk,  
          How do I change my right and left side command prompt?  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 9  
          Helpdesk,  
          I want to password protect a section of my website.  
          How do I do it?  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 10  
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:47:29 ] ...  
 +---------------------------- joe blogg -----------------------------+  
 | How do I get rid of window return character, i.e ^M, in files on rb? |  
-+___________________________________________________+  
-EOF  
++\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***\_\_\_\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***+  
+EOF
 
 QUESTION 11  
-Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:38:43 ] ...  
+Message from
+jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:38:43 ] ...  
 +--------------------------- joe blogg ----------------------------+  
 | i've set my public_html directory on redbrick with chmod 755 |  
 | public_html and the all the files in it with chmod -R public_html/ |  
 | but i can't see any of the files from my web browser. Whats up? |  
-+__________________________________________________+  
++\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***\_\_\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***+  
 EOF  
   
 QUESTION 12  
 Message from jblg@carbon on pts/47 at [ Sat 10/Apr/2004 17:36:09 ] ...  
-ooooooooooooooooooo --] | jblg-hey | [-- oooooooooooooooooooo  
+ooooooooooooooooooo
+--] | jblg-hey | [-- oooooooooooooooooooo  
 O how's it going folks. O  
 O just tried to open the boards there but go this error                  O  
 O any idea whats up                       O  
@@ -116,7 +133,7 @@ ooooooooooooooo --] | jblg-hey | [-- ooooooooooooooooo
 O hey mr. helpdesk                       O  
 O when i open slrn theres only a handful of boards               O  
 O visible. how do i get to see the master list.                  O  
-ooooooooooooooooooooooooooooooooooooooooooooooooo  
+ooooooooooooooooooooooooooooooooooooooooooooooooo
 
 QUESTION 14  
 Message from jblg@carbon on pts/47 at [ Sat 10/Apr/2004 17:49:40 ] ...  
@@ -127,20 +144,23 @@ O in alphabetical order                  O
 O is there anyway to get them in most-recent-first order but keep       O  
 O them threaded together                 O  
 O cheers                          O  
-ooooooooooooooooooooooooooooooooooooooooooooooooooooo  
+ooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
 QUESTION 15  
          Helpdesk,  
-         Planning to break up my email into seperate folders. i know how to use procmail but  
-i'm just wondering how i create a new mailbox folder and add it to the list that mutt  
+         Planning to break up my
+email into seperate folders. i know how to use procmail but  
+i'm just wondering how i create a new mailbox folder and add it to the list that
+mutt  
 sees.  
-        Thanx  
+        Thanx
 
 QUESTION 16  
          Helpdesk,  
-        I'm trying to move several message from one mailbox in mutt to another.  
+        I'm trying to move several message from one mailbox in mutt to
+another.  
          Whats the quickest way? Theres about 50 emails.  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 17  
 Message from jblg@carbon on pts/47 at [ Sat 10/Apr/2004 18:08:32 ] ...  
@@ -150,7 +170,7 @@ O up til now i've had mutt configured to read my email directly out of O
 O the maildir folder in my homedir, but i wanna setup IMAP access for O  
 O mutt so i can read my imap mail thru mutt             O  
 O anyidea how to set that up             O  
-ooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
 QUESTION 18  
 Message from jblg@carbon on pts/47 at [ Sat 10/Apr/2004 19:44:32 ] ...  
@@ -159,13 +179,14 @@ O i've decided to start using IRSSI for internet relay chat.    O
 O could you give me a quick run down on the commands to         O  
 O connect to redbrick chat, enter the lobby, and exit the program       O  
 O please                          O  
-oooooooooooooooooooooooooooooooooooooooooooooooooooo  
+oooooooooooooooooooooooooooooooooooooooooooooooooooo
 
 QUESTION 19  
          Hey,  
-         I've alot of important stuff in my rb account and wanna make a tarball/gzip backup of it.  
+         I've alot of important stuff in my rb account and wanna make a
+tarball/gzip backup of it.  
          whats the command/s to do this?  
-         Joe Blogg  
+         Joe Blogg
 
 QUESTION 20  
 Message from jblg@carbon on pts/47 at [ Sat 10/Apr/2004 19:49:18 ] ...  
@@ -174,12 +195,12 @@ O hey dude,                       O
 O any chance you could throw together a small one line script for       O  
 O adding a name to                        O  
 O my .friends file so the file stays in alphabetical order               O  
-oooooooooooooooooooooooooooooooooooooooooooooooooooo  
+oooooooooooooooooooooooooooooooooooooooooooooooooooo
 
 QUESTION 21  
          Hey man...  
          Could you briefly explain how chmod works.  
-         Thanx  
+         Thanx
 
 QUESTION 22  
 Message from jblg@carbon on pts/47 at [ Sun 11/Apr/2004 00:25:17 ] ...  
@@ -192,30 +213,33 @@ oooooooooooooooooooooooooooooooooooooooooooooooo
   
 QUESTION 23  
   
-         Helpdesk,  
+         Helpdesk,
 
-         I've heard someone saying they could logon to redbrick with ssh but don't have to  
-give their password. Where can i get information on it Redbrick? What is he doing?  
+I've heard someone saying they could logon to redbrick with ssh but don't have
+to  
+give their password. Where can i get information on it Redbrick? What is he
+doing?
 
-         Joe Blogg  
+Joe Blogg
 
-QUESTION 24  
+QUESTION 24
 
-         Helpdesk,  
-         I have a file called indo.txt on another debian machine and I want to scp it to redbrick. Problem is I have  
+Helpdesk,  
+         I have a file called indo.txt on another debian machine and I want to
+scp it to redbrick. Problem is I have  
 forgotten the syntax, could you remind me?  
-         Joe Blogg  
+         Joe Blogg
 
-QUESTION 25  
+QUESTION 25
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:16:38 ] ...  
 +------------------------- joe blog----------- ---------------+  
 | I have some .jspin my public_html folder. They have the right |  
 | permissions but i can't see them from the web. Any ideas? |  
-+______________________________________________+  
-EOF  
++\***\*\*\*\*\***\*\*\***\*\*\*\*\***\_\_\***\*\*\*\*\***\*\*\***\*\*\*\*\***+  
+EOF
 
-QUESTION 26  
+QUESTION 26
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:19:58 ] ...  
 +------------------------------- joe blogg ------------------------------+  
@@ -223,41 +247,45 @@ Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:19:58 ] ...
 | I've tried www.redbrick.dcu.ie/~jblg/WEB-INF but i get a permission |  
 | denied error. I've tried changing my permissions to make the folder   |  
 | completely readable but nothing seems to work. Any help? |  
-+______________________________________________________ +  
-EOF  
++\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***\_\_\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\*** +  
+EOF
 
-QUESTION 27  
+QUESTION 27
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:22:21 ] ...  
 +---------------------------- joe blogg -----------------------------+  
 | i've got some files on a floppy disk and want to transfere them to    |  
-| redbrick. When i run winftp it won't let me connect to redbrick. I'm          |  
+| redbrick. When i run winftp it won't let me connect to redbrick. I'm         
+|  
 | using:                          |  
 | hostname = redbrick.dcu.ie             |  
 | username = jblg                         |  
-| password = *******             |  
-+___________________________________________________+  
-EOF  
+| password = **\*\*\***             |  
++\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***\_\_\_\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***+  
+EOF
 
-QUESTION 28  
+QUESTION 28
 
-         Helpdesk,  
-         I just broke my java program I was working on. I have the working version but would  
-         like to know what i did wrong. Is there anyway i of comparing the two files side-by-side?  
-         Joe Blogg  
+Helpdesk,  
+         I just broke my java program I was working on. I have the working
+version but would  
+         like to know what i did wrong. Is there anyway i of comparing the two
+files side-by-side?  
+         Joe Blogg
 
-QUESTION 29  
+QUESTION 29
 
-         Helpdesk,  
-         Some people have a little comment about themselves on the redbrick website where it  
+Helpdesk,  
+         Some people have a little comment about themselves on the redbrick
+website where it  
 lists the users. How can i do this?  
-         Joe Blogg  
+         Joe Blogg
 
-QUESTION 30  
+QUESTION 30
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 17:44:45 ] ...  
 +------------------ the world is one hell of a place -------------------+  
-| i have a file called myservlet.java and when i tried to compile it i          |  
+| i have a file called myservlet.java and when i tried to compile it i |  
 | got a weird error message in colourdy writing. whats wong?    |  
 |                         |  
 | I thought carbon was supposed to make life easier? Also i have a      |  
@@ -268,9 +296,9 @@ Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 17:44:45 ] ...
 | testServlet.class              |  
 |                         |  
 | Whats up?              |  
-+____________________________________________________+  
++\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***\_\_\_\_\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***+
 
-QUESTION 31  
+QUESTION 31
 
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:41:37 ] ...  
 +------------------------------ joe blogg --------------------------+  
@@ -280,31 +308,34 @@ Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 14:41:37 ] ...
 | 146: No database selected" |  
 | What am i doing wrong? Oh and is there a shorter way to get into |  
 | mysql on redbrick?             |  
-+____________________________________________________+  
-EOF  
++\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***\_\_\_\_\***\*\*\*\*\***\*\*\*\*\***\*\*\*\*\***+  
+EOF
 
-QUESTION 32  
+QUESTION 32
 
-         Helpdesk,  
-         I was at the postgres tutorial and have written a small perl script to connect to postgres  
-        but it won't run. Here's my script:  
+Helpdesk,  
+         I was at the postgres tutorial and have written a small perl script to
+connect to postgres  
+        but it won't run. Here's my script:
 
-         #/usr/bin/perl -w  
+#/usr/bin/perl -w  
                   use DBI;  
-                  dbh = DBI-> connect('dbi:Pg:dbname=jblg; host=postgres.internal');  
-                  sth = dbh->prepare("select * from myTable");  
-                  sth->execute;  
+                  dbh = DBI-> connect('dbi:Pg:dbname=jblg;
+host=postgres.internal');  
+                  sth = dbh->prepare("select \* from myTable");  
+                  sth->execute;
 
-         Any clues to whats wrong?  
-         Joe Blogg  
+Any clues to whats wrong?  
+         Joe Blogg
 
-QUESTION 33  
+QUESTION 33
 
 Message from keloe@carbon on pts/192 at [ Tue 13/Apr/2004 14:58:10 ] ...  
 +------------------------------- Joe Blogg---------------------------------+  
-| i'm a big nano fan but recently i seen a friend using vim and it              |  
-| looked all nice and colour'dy. Any chance you could tell me where to          |  
+| i'm a big nano fan but recently i seen a friend using vim and it |  
+| looked all nice and colour'dy. Any chance you could tell me where to         
+|  
 | get info about vim and how do i turn the colours on?                   |  
-+_________________________________________________________+  
++\***\*\*\*\*\*\*\***\*\*\*\*\***\*\*\*\*\*\*\***\_\***\*\*\*\*\*\*\***\*\*\*\*\***\*\*\*\*\*\*\***+
 
 The bonus question on the night was "What does RTFM stand for?
diff --git a/source/help/exams/helpdesk-test-2005-egm-2/index.md b/content/help/exams/helpdesk-test-2005-egm-2.md
similarity index 84%
rename from source/help/exams/helpdesk-test-2005-egm-2/index.md
rename to content/help/exams/helpdesk-test-2005-egm-2.md
index 7f8ddd5..dd649e0 100644
--- a/source/help/exams/helpdesk-test-2005-egm-2/index.md
+++ b/content/help/exams/helpdesk-test-2005-egm-2.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2005 EGM 2'
+title: Helpdesk test 2005 EGM 2
 ---
 
 Instructions:  
@@ -8,15 +8,15 @@ Instructions:
 3\. Write your answers on a separate page and number them for ease of  
 correction.  
 4\. You can assume for the questions, that the user is using the following  
-programs (unless specified otherwise):    
-•  Email: mutt  
+programs (unless specified otherwise): •  Email: mutt  
 •  News: slrn  
 •  IRC: irssi  
-5\. Unless otherwise specified, each question is worth 3 marks.    
-6\. Some questions won’t have obvious answers, in this case you’ll get marks  
+5\. Unless otherwise specified, each question is worth 3 marks. 6\. Some
+questions won’t have obvious answers, in this case you’ll get marks  
 for knowing what to ask the user next (i/e user:‘whats my username’ –  
 you:‘erm, what’s your DCU mail address and I’ll look you up?’)  
-7\. ‘RTFM’ / ‘Just Google it’ is not a valid answer to most questions. It might  
+7\. ‘RTFM’ / ‘Just Google it’ is not a valid answer to most questions. It
+might  
 sometimes be acceptable, but you’ll need to be a little more specific than  
 that.  
 8\. Possible bonus marks for amusing answers. ASCII porn not accepted.
@@ -26,7 +26,7 @@ Question 1
 Subject: [Helpdesk] Webpage  
 hi,  
 how do i upload stuff on to my website do i use WINSCP or what???????  
-Could you let me know thanks.  
+Could you let me know thanks.
 
 Question 2  
 Hi, I just joined Redbrick and was given a username but no password.  
@@ -36,14 +36,20 @@ Thanks, Eoghan.
 
 Question 3  
 hey guys,  
-i have a script that's supposed to open files for writing, and put some content in  
-them. i managed to fopen() them properly and they're also "is_writable()", however i  
-cannot fwrite() to them - fwrite() writes nothing and my file ends up zero-length or  
+i have a script that's supposed to open files for writing, and put some content
+in  
+them. i managed to fopen() them properly and they're also "is_writable()",
+however i  
+cannot fwrite() to them - fwrite() writes nothing and my file ends up
+zero-length or  
 the same version as before.  
-i read in some php.net comment that the issue is known for "filesystems that are  
-full". (what the heck that's supposed to mean). still, do you guys have any idea about  
+i read in some php.net comment that the issue is known for "filesystems that
+are  
+full". (what the heck that's supposed to mean). still, do you guys have any idea
+about  
 that?  
-the account i'm working in is  XXXXXXXXXX and my script is in admin/change.php.  
+the account i'm working in is  XXXXXXXXXX and my script is in
+admin/change.php.  
 Best regards
 
 Rob Section 2 – Not Quite so actual…  
@@ -51,7 +57,8 @@ Question 4
 To: helpdesk@redbrick.dcu.ie  
 From: omfg@redbrick.dcu.ie  
 Subject: Oh Noes!!!!!!!!shift-one  
-Hrm, my terminal has suddenly stopped responding but my net connection is fine, whats  
+Hrm, my terminal has suddenly stopped responding but my net connection is fine,
+whats  
 up?  
 -omfg
 
@@ -106,8 +113,9 @@ Message from keloe@carbon on pts/315 at [ Fri 11/Feb/2005 15:38:54 GMT ] ...
                | Just two short questions:                      |  
                | 1) How do I create a signature for my emails?  |  
                | 2) How do I attach a file to an email in mutt? |  
-               |                                                |  
-               +________________________________________________+  
+               |                                                |
+
++\***\*\*\*\*\***\*\*\***\*\*\*\*\***\_\_\_\_\***\*\*\*\*\***\*\*\***\*\*\*\*\***+  
 EOF
 
 Question 12  
@@ -126,10 +134,8 @@ Message from testing@carbon on pts/334 at [ Mon 17/Oct/2005 16:57:41 IST ] ...
 
 Question 14  
 Date: Mon, 14 Feb 2014 12:34:56 +0000  
-From: jailbait    
-Subject: Prompt questions  
-To: Helpdesk    
-Hi,  
+From: jailbait Subject: Prompt questions  
+To: Helpdesk Hi,  
   I created a .procmailrc in my home directory and placed this rule into it:  
        :0:  
        *^(TT|CC|Delivered-To): .*omfg@redbrick.dcu.ie  
@@ -150,25 +156,28 @@ Message from testing@carbon on pts/334 at [ Mon 17/Oct/2005 16:09:31 IST ] ...
 EOF
 
 Question 16  
-Message from jailbait@carbon on pts/379 at [ Fri 11/Feb/2005 17:02:52 GMT ] ...  
+Message from jailbait@carbon on pts/379 at [ Fri 11/Feb/2005 17:02:52 GMT ]
+...  
              ooooooooooooooooooooooooooooooooooooooooooooooooooooo  
              O hey, how do i get an account on the mysql server? O  
              ooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-EOF  
+EOF
 
 Question 17  
-Message from jailbait@carbon on pts/272 at [ Thu 10/Feb/2005 21:13:24 GMT ] ...  
+Message from jailbait@carbon on pts/272 at [ Thu 10/Feb/2005 21:13:24 GMT ]
+...  
     ooooooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooooooo  
     O sorry about bugging you. i've got the mail about the Mysql details, O  
     O but how do i log in?                                                O  
     ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-EOF  
+EOF
 
 Question 18  
 To: helpdesk@redbrick.dcu.ie  
 From: omfg@redbrick.dcu.ie  
 Subject: My Intarnets are b0rked!  
-I just uploaded my PHP files that I use on my other website to redbrick, but when I go  
+I just uploaded my PHP files that I use on my other website to redbrick, but
+when I go  
 to access them I get a giant SERVER ERROR message, what’s going on?  
 -Little Jimmy
 
@@ -176,8 +185,10 @@ Question 19
 To: helpdesk@redbrick.dcu.ie  
 From: omfg@redbrick.dcu.ie  
 Subject: Oh Noes!!!!!!!!shift-one  
-I tried compiling a java program on redbrick and it gave me a big error saying to use  
-a different server, I went to log in and it asked me for a password, is this the same  
+I tried compiling a java program on redbrick and it gave me a big error saying
+to use  
+a different server, I went to log in and it asked me for a password, is this the
+same  
 password I use to get onto redbrick in the first place?  
 -Joey Jo Jo Junior
 
@@ -259,28 +270,36 @@ Message from testing@carbon on pts/334 at [ Mon 17/Oct/2005 18:38:57 IST ] ...
 EOF
 
 Question 29  
-Spot the errors in the script:  
----  
-#  
-# Script to print user information who currently login, current date  
-& time  
-#  
+Spot the errors in the script:
+
+---
+
+#
+
+# Script to print user information who currently login, current date
+
+& time
+
+#
+
 clear  
-echo "Hello $_USER"  
+echo "Hello \$\_USER"  
 echo "Today is \c ";date  
 echo "Number of user login : \c" ; who > wc -l  
 echo "Calendar"  
 calender  
-exit 0  
+exit 0
+
 ---
 
 Question 30  
 Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:25:18 ] ...  
-    +---------------------------- Joe Bloggs  -----------------------------+       
-    | I have found that all my mail from RedBrick is going to my DCU mail  |  
+    +---------------------------- Joe Bloggs  -----------------------------+
+
+| I have found that all my mail from RedBrick is going to my DCU mail  |  
     | account. How do I stop my mail forwarding to my DCU mail? I'm only a |  
     | newbie                                                               |  
-    +______________________________________________________________________+  
+    +**\*\***\*\*\*\***\*\***\*\***\*\***\*\*\*\***\*\***\_\_**\*\***\*\*\*\***\*\***\*\***\*\***\*\*\*\***\*\***+  
 EOF
 
 Question 31  
@@ -293,15 +312,16 @@ Question 31
 \                                                        /  
 \ upsmon parent process died - shutdown impossible       /  
 \                                                        /  
-\ what the hell? i keep getting weird messages like this /  
-----------------------------------------------------------
+\ what the hell? i keep getting weird messages like this /
+
+---
 
 Question 32  
          Helpdesk,  
-         Hi can you help me with this: I'm using a screen window for receiving heys, I  
-just    
-         realised that even if i'm mesg y i don't receive heys.Whats up with this?    
-         Joe Blogg
+         Hi can you help me with this: I'm using a screen window for receiving
+heys, I  
+just          realised that even if i'm mesg y i don't receive heys.Whats up
+with this?          Joe Blogg
 
 Question 33  
 Message from testing@carbon on pts/334 at [ Mon 17/Oct/2005 18:43:46 IST ] ...  
@@ -316,7 +336,8 @@ Message from testing@carbon on pts/334 at [ Mon 17/Oct/2005 18:43:46 IST ] ...
           O localhost.slrn fatal error:                              O  
           O slrn: pid 14234 is locking the newsrc file.              O  
           O                                                          O  
-          oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo Section 3 – Bonus Round
+          oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo Section 3
+– Bonus Round
 
 Question 34  
 How would you deal with this hey?  
@@ -324,27 +345,19 @@ How would you deal with this hey?
 oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
 O                |      \             \            /    \        | O  
 O                |       |             \          |      |       | O  
-O                |       `.             |         |       :      | O  
-O                |        |             |        \|       |      | O  
-O                |        | /       /  \\\   --__ \\       :     | O  
-O                | \      \/   _--~~          ~--__| \     |     | O  
-O                |  \      \_-~                    ~-_\    |     | O  
-O                |   \_     \        _.--------.______\|   |     | O  
-O                |     \     \______// _ ___ _ (_(__>  \   |     | O  
-O                |      \   .  C ___)  ______ (_(____>  |  /     | O  
-O                |      /\ |   C ____)/      \ (_____>  |_/      | O  
-O                |     / /\|   C_____)       |  (___>   /  \     | O  
-O                |    |   (   _C_____)\______/  // _/ /     \    | O  
-O                |    |    \  |__   \\_________// (__/       |   | O  
-O                |   | \    \____)   `----   --'             |   | O  
-O                |   |  \_          ___\       /_          _/ |  | O  
+O                |
+`. | | : | O O | | | \| | | O O | | / / \\\ --__ \\ : | O O | \ \/ _--~~ ~--__| \ | | O O | \ \_-~ ~-_\ | | O O | \_ \ _.--------.______\| | | O O | \ \______// _ ___ _ (_(__> \ | | O O | \ . C ___) ______ (_(____> | / | O O | /\ | C ____)/ \ (_____> |_/ | O O | / /\| C_____) | (___> / \ | O O | | ( _C_____)\______/ // _/ / \ | O O | | \ |__ \\_________// (__/ | | O O | | \ \____)`----
+--'             |   | O  
+O                |   |  \_          ***\       /*          \_/ |  | O  
 O                |  |              /    |     |  \            |  | O  
 O                |  |             |    /       \  \           |  | O  
 O                |  |          / /    |         |  \           | | O  
-O                |  |         / /      \__/\___/    |          | | O  
+O                |  |         / /      \_\_/\_**/    |          | | O  
 O                | |         / /        |    |       |         | | O  
 O                | |          |         |    |       |         | | O  
-O                \_______________________________________________/ O  
+O               
+\_\***\*\*\*\*\***\*\*\***\*\*\*\*\***\_\_\***\*\*\*\*\***\*\*\***\*\*\*\*\***/
+O  
 O                                                                  O  
 Oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
diff --git a/content/help/exams/helpdesk-test-2005-egm.md b/content/help/exams/helpdesk-test-2005-egm.md
new file mode 100644
index 0000000..d2958e5
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2005-egm.md
@@ -0,0 +1,429 @@
+---
+title: Helpdesk test 2005 EGM
+---
+
+G'day, Below are 33 questions, regarding 'how do i use redbrick?'. All of these
+questions are in the form of a mail or a hey from an imaginary user, called Joe
+Bloggs (jb@redbrick.dcu.ie). **All questions should be answered as if you were
+replying to him for real**. Each question is worth 3 marks, but you should try
+to get as much into your answers as possible, as there may be more than one
+correct answer.
+
+You can assume for the questions, that the user is using the following programs
+(unless specified otherwise):
+
+- Email: mutt
+- News: slrn
+- IRC: BitchX
+
+> Eoghan 'atlas' Gaffney Una'keloe' Kehoe John `art_wolf' Doyle
+
+## Best of Luck.
+
+1.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 20:35:01 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O Hey, a friend of mine was telling me that i'm able to log in to     O
+  O redbrick from my linux machine without having to put in a password. O
+  O Is this possible?                                                   O
+  O                                                                     O
+  O How do i do this? Would it be a bad idea?                           O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+2.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 20:43:18 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O Hi, i've a slight problem here. I'm trying to use WS_FTP Pro here to O
+  O upload some files on to redbrick, but it won't connect for some      O
+  O reason. It's set to ftp mode, and definately the right password.     O
+  O Also, how much disk space do we get?                                 O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+3.
+
+```
+Date: Wed, 9 Feb 2005 16:05:51 +0000
+From: joe.bloggs@mail.dcu.ie
+To: helpdesk@redbrick.dcu.ie
+Subject: [Helpdesk] Website Problems.
+
+Hi, Sorry to bother you guys again, but i have a question.
+
+I just ran ls -al ~. Why is my public_html directory lrwxrwxrwx. Does that mean that my public_html dir is writable to everyone?
+
+JB
+```
+
+4.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 20:49:53 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O i don't know what you guys see in this newsboards thing. O
+  O i can only see one or two boards. are there more?        O
+  O how do i subscribe to them if i can't see them?          O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+5.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 20:51:45 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O OMG. I just lost a hey from someone. i think it might have been     O
+  O important. i was posting to the boards, i saw it for a sec, then it O
+  O disappeared. how do i find out who it was?                          O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+6.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 20:54:13 GMT ] ...
+  .------------------------------ JB-HEY ------------------------------.
+  | Hey, i've a question. lots of my friends can hey people with fancy |
+  | borders (like mine) but don't have to type -b and -t and all that. |
+  | How do i be cool like them?                                        |
+  .--------------------------------------------------------------------.
+EOF
+```
+
+7.  Name 5 of the redbrick servers. (Slightly off topic).
+
+8.
+
+```
+Date: Wed, 12 Feb 2005 24:05:51 +0000
+From: joe.bloggs@mail.dcu.ie
+To: helpdesk@redbrick.dcu.ie
+Subject: [Helpdesk] Fingering?
+
+Hey, I've just noticed that when i finger people, they have cool stuff in their plan and project.
+How do i do something like that?
+
+Ta, JB
+```
+
+9.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 21:07:08 GMT ] ...
+  oooooooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooooooo
+  O yo. i'm doing one of those stupid Java assignments. was about to try O
+  O compiling it on carbon, when someone said i wouldn't be able to.     O
+  O what's the story?                                                    O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+10.
+
+```
+Message from jb@carbon on pts/379 at [ Fri 11/Feb/2005 17:02:52 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hey, how do i get an account on the mysql server? O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+11.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 21:13:24 GMT ] ...
+  ooooooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooooooo
+  O sorry about bugging you. i've got the mail about the Mysql details, O
+  O but how do i log in?                                                O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+12.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 21:17:00 GMT ] ...
+  ooooooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooooooo
+  O MySQL is teh gh3y. It's broken  more than it's working. I've got a  O
+  O brand spanking new Postgres account. Is there any way to convert my O
+  O mysql tables to postgres format?                                    O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+13.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 21:33:30 GMT ] ...
+  ooooooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooooooo
+  O hey, this irc lark is fun. i'm using bitchX at the moment, but when O
+  O i join other rooms, the people in the first room can't see what i'm O
+  O saying, only the ones in the new one. How do i talk in the first    O
+  O room again?                                                         0
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+14. `21:37:17  hey, i'm using irssi now. it's cooool. Loads of people are using colours. how do i do that?`
+15.
+
+```
+Date: Thu, 10 Feb 2005 19:56:56 +0000
+From: JoE bLoGgS
+To: Eoghan Gaffney
+Subject: [Helpdesk] Editors?
+
+Hey, how do i save something in Nano without having to exit? It's being a real pain. Ta
+```
+
+16.
+
+```
+Message from jb@carbon on pts/331 at [ Mon 14/Feb/2005 01:53:56 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hey, i want to change my finger info? how do i do this? O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+17.
+
+```
+Message from jb@carbon on pts/331 at [ Mon 14/Feb/2005 01:58:45 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O I've a slight problem. I suspended 3 different processes. How do i O
+  O get a list of what i have suspended? Also, how would i resume the  O
+  O second one?                                                        O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+18.
+
+```
+Message from jb@carbon on pts/331 at [ Mon 14/Feb/2005 02:07:38 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O i've a process running in the background, and i just want to get rid O
+  O of it without resuming it. what should i do?                         O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+19.
+
+```
+Message from jb@carbon on pts/331 at [ Mon 14/Feb/2005 02:11:14 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O what's an ACL? someone said they're really handy. Can i use them? O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+20.
+
+```
+Message from jb@carbon on pts/272 at [ Thu 10/Feb/2005 21:53:36 GMT ] ...
+  ooooooooooooooooooooooooooo JB-HEY oooooooooooooooooooooooooooo
+  O yo. nano has pissed me off once too many.                   O
+  O i've started using vim. are there any tutorials on redbrick?O
+  O how do i save things and quit?                              O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+21. Spot the errors in the script:
+
+```bash
+#
+# Script to print user information who currently login, current date & time
+#
+clear
+echo "Hello $_USER"
+echo "Today is \c ";date
+echo "Number of user login : \c" ; who > wc -l
+echo "Calendar"
+calender
+exit 0
+```
+
+22. And again...
+
+```
+print "Wow, my first perl program!";
+```
+
+Errors recieved:
+
+```
+Warning: unknown mime-type for "Wow, my first perl program!" -- using
++"application/*"
+Error: no such file "Wow, my first perl program!"
+```
+
+23.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 00:59:08 GMT ] ...
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hi, i'm working on my website at the moment. i have some .jsp files O
+  O in my public_html dir, and was wondering why they're not working?   O
+  O thanks, joe                                                         O
+  ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+24.
+
+```
+Date: Mon, 14 Feb 2005 00:52:44 +0000
+From: jb
+Subject: Website Woes
+To: Helpdesk
+
+Hey,
+I've a servlet here that writes to a file, but this isn't working. Any ideas why?
+
+Joe
+```
+
+25.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 01:02:56 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hey, my mate said it's possible to reattach a screen session (even O
+  O if you have it attached somewhere else already) and keep them in   O
+  O sync with each other. How do i do this?                            O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+26.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 01:05:14 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hey, i just tried running screen, and i got this error. I want to    O
+  O get rid of the second screen that's listed, but i don't want to have O
+  O to log reattach and close each window. How do i do this?             O
+  O                                                                      O
+  O jb@carbon: screen -r                                                 O
+  O There are several suitable screens on:                               O
+  O  21664.pts-170.carbon (Detached)                                     O
+  O  10948.pts-454.carbon (Detached)                                     O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+27.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 01:09:20 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O Hey, i've just uploaded my website to redbrick, using winscp, but    O
+  O when i go to my website, (www.redbrick.dcu.ie/~jb) it's not working. O
+  O it's definately working on my local machine, and it's only html. can O
+  O you help?                                                            O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+28.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 01:12:08 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O Hey, how do i go about changing the colours on the command prompt? O
+  O My friend was telling me that it's something to do with my .zshrc, O
+  O but i'm totally lost. Any chance of a bit of info?                 O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
+
+29.
+
+```
+Date: Mon, 14 Feb 2005 00:52:44 +0000
+From: jb
+Subject: Prompt questions
+To: Helpdesk
+
+
+Hey, i was wondering if you could tell me how i would set my command prompt so when i log in, i get:
+
+username@carbon.redbrick.dcu.ie:          2005-02-11:pts/100
+
+(where pts/100 is my current tty)
+
+Thanks
+```
+
+30.
+
+```
+Message from jblg@carbon on pts/192 at [ Tue 13/Apr/2004 13:25:18 ] ...
+  +---------------------------- Joe Bloggs  -----------------------------+
+  | I have found that all my mail from RedBrick is going to my DCU mail  |
+  | account. How do I stop my mail forwarding to my DCU mail? I'm only a |
+  | newbie                                                               |
+  +______________________________________________________________________+
+EOF
+```
+
+31.
+
+```
+Date: Mon, 14 Feb 2005 00:52:44 +0000
+From: jb
+Subject: Prompt questions
+To: Helpdesk
+
+Hi,
+I created a .procmailrc in my home directory and placed this rule into it:
+
+     :0:
+     *^(TT|CC|Delivered-To): .*dcu@redbrick.dcu.ie
+     .dcue/
+
+My muttrc contains the following:
+  set folder=~/Maildir
+  set spoolfile=~/Maildir
+  mailboxes =.dcu
+
+But when i type "mutt" I only see a blank screen, what am i doing wrong?
+
+Joe Bloggs
+```
+
+32.
+
+```
+Message from keloe@carbon on pts/315 at [ Fri 11/Feb/2005 15:38:54 GMT ] ...
+  +------- the world is one hell of a place -------+
+  | Just two short questions:                      |
+  | 1) How do I create a signature for my emails?  |
+  | 2) How do I attach a file to an email in mutt? |
+  |                                                |
+  +________________________________________________+
+EOF
+```
+
+33.
+
+```
+Message from jb@carbon on pts/272 at [ Mon 14/Feb/2005 01:21:57 GMT ] ...
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+  O hey, i've had enough of mutt, and want something nicer. I've heard i O
+  O can check my redbrick mail through a browser, can you tell me the    O
+  O URL?                                                                 O
+  oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+EOF
+```
diff --git a/source/help/exams/helpdesk-test-2006-agm/index.md b/content/help/exams/helpdesk-test-2006-agm.md
similarity index 98%
rename from source/help/exams/helpdesk-test-2006-agm/index.md
rename to content/help/exams/helpdesk-test-2006-agm.md
index 43c3138..6485db1 100644
--- a/source/help/exams/helpdesk-test-2006-agm/index.md
+++ b/content/help/exams/helpdesk-test-2006-agm.md
@@ -1,8 +1,8 @@
 ---
-title: 'Helpdesk test 2006 AGM'
+title: Helpdesk test 2006 AGM
 ---
 
-
Q. 1 -   
+
Q. 1 -
 Hey,  
          Im having a problem, i dont know how to connect to redbrick,  
 every time i try to type my password, nothing comes up on the black screen!!  
@@ -147,11 +147,11 @@ I'm getting tired of my prompt, I'd like to change it around, maybe add a few th
 --  
 24.  
 Hi!  
-I just started my own channel on IRC, but I was wondering how can I make it password protected? Can you tell me a few of the other modes that I can use for my channel? I'd also like to know how to give my friends ops and stuff.   
+I just started my own channel on IRC, but I was wondering how can I make it password protected? Can you tell me a few of the other modes that I can use for my channel? I'd also like to know how to give my friends ops and stuff.
 
 --  
 25.  
-Hi,   
+Hi,
 One of my windows just froze up! It doesn't seem to be responding to any commands or anything... how can I fix it?  
 
 --  
@@ -164,7 +164,7 @@ Ok, I think I just missed an important hey, how do I check who's been sending me
 
 --  
 28.  
-Hi,   
+Hi,
 I've been using IRC on the Redbrick server, but I'd also like to connect to a few channels on other IRC servers too. How do I go about using two servers at once, and how do I switch between the two of them?  
 
 --  
diff --git a/source/help/exams/helpdesk-test-2006-egm/index.md b/content/help/exams/helpdesk-test-2006-egm.md
similarity index 98%
rename from source/help/exams/helpdesk-test-2006-egm/index.md
rename to content/help/exams/helpdesk-test-2006-egm.md
index afe49db..f66dda1 100644
--- a/source/help/exams/helpdesk-test-2006-egm/index.md
+++ b/content/help/exams/helpdesk-test-2006-egm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2006 EGM'
+title: Helpdesk test 2006 EGM
 ---
 
 
1.  
@@ -129,11 +129,11 @@ I think I've finally got the hang of this permissions thing, but how would I che
 --  
 24.  
 Hi!  
-I just started my own channel on IRC, but I was wondering how can I make it password protected? Can you tell me a few of the other modes that I can use for my channel? I'd also like to know how to give my friends ops and stuff.   
+I just started my own channel on IRC, but I was wondering how can I make it password protected? Can you tell me a few of the other modes that I can use for my channel? I'd also like to know how to give my friends ops and stuff.
 
 --  
 25.  
-Hi,   
+Hi,
 One of my windows just froze up! It doesn't seem to be responding to any commands or anything... how can I fix it?  
 
 --  
@@ -147,7 +147,7 @@ Ok, I think I just missed an important hey, how do I check who's been sending me
 
 --  
 28.  
-Hi,   
+Hi,
 I've been using IRC on the Redbrick server, but I'd also like to connect to a few channels on other IRC servers too. How do I go about using two servers at once, and how do I switch between the two of them?  
 
 --  
diff --git a/content/help/exams/helpdesk-test-2007-egm.md b/content/help/exams/helpdesk-test-2007-egm.md
new file mode 100644
index 0000000..f76c2d7
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2007-egm.md
@@ -0,0 +1,115 @@
+---
+title: Helpdesk test 2007 EGM
+---
+
+[![Redbrick Logo](/assets/images/logo.png)](../../ 'Redbrick Homepage')
+
+- How do I send a private message to someone on chat?
+- Hey,  
+  I've been using chat on Redbrick, but I can't figure it out. How do I join and
+  leave channels, and is there anyway to see a list of all the rooms?
+- Hey guys,  
+  I've got the original password here, but it has all these funny letters and
+  numbers in it. How do I change it?
+- How do I put my website on Redbrick? I've written it on my pc, and it looks
+  really pretty, but I can't get it onto the intertron :(
+- Hey, I've just uploaded my website the way you told me, but I still can't see
+  it. I get this stupid picture of a brick with some stupid error message.
+- someone told me to /disco and it broke my chat. How do I get it working again?
+- What's a "hey"? how do I use it? what's it for?
+- what's this finger thing people keep talking about? is it some sort of
+  perverted reference like FAP FAP FAP?
+- Hi, I'm in first year of CA and I'm doing my programming 1 assignment on
+  redbrick. The program works in the labs, but it prints i out some weird error
+  about classpaths on redbrick. What's wrong with it?
+- Hey,  
+  I want to be 1337 like the admins. How do I use this vim thing they keep going
+  on about?  
+  I launched it, and I can't type, or get out of it
+- Hi,  
+  The Redbrick boards look really cool, but I can't figure out how to use slrn.
+  Is there an alternative?
+- People can't download the .wmas I put up for them to warez? what's going on?!?
+- Hey,  
+  Everytime I try top run this super script I wrote, it tells me that permission
+  is denied? What's going on man?
+- Hi,  
+  I'm sick of this webmail bollocks, redbrick's client's suck. What's this mutt
+  thing the associates keep going on about? how do I send mails from it?
+- Hi!  
+  I hear Redbrick has a photo gallery.
+- How do I make my hey border permanent? I hate typing it in every time I hey
+  someone...
+- Hey,  
+  this zsh thing is kinda lame. I saw an admin's screen yesterday and he had a
+  super 1337 prompt, with the time of day in it. How do I get a prompt like
+  that?
+- Hey!  
+  I've started using mutt. It's really cool, but I'd like to have my own
+  signature at the end of all my mails. How do I set that up with mutt?
+- Hey,  
+  I've decided I wantto use pidgin on redbrick, but I can't install it, sudo
+  won't work! how do I get root, and install it?
+- Hi, I'd like to make a section on my website password protected, any idea how
+  I could do this?
+- Yo,  
+  I think I've finally got the hang of this permissions thing, but how would I
+  check what permissions a file has?
+- Hi!  
+  I just started my own channel on IRC, but I was wondering how can I make it
+  password protected? Can you tell me a few of the other modes that I can use
+  for my channel? I'd also like to know how to give my friends ops and stuff.
+- Hi,  
+  One of my windows just froze up! It doesn't seem to be responding to any
+  commands or anything... how can I fix it?
+- Hi,  
+  I'd like a postgresql account on RB, how would I go about getting one?
+- Ok, I think I just missed an important hey, how do I check who's been sending
+  me heys I got?
+- Hey,  
+  I started using screen yesterday, and mine just stopped working. It said
+  "detached" and I typed go again like I was told to, but it just started
+  another one. How do I fix my screen?
+- I've been trying to use Screen recently, what's the difference between
+  reattaching with screen -DR and screen -x?
+- I don't like this stupid terminal. How do I connect to irc.redbrick.dcu.ie
+  with mIRC?
+- #### The Following questions are bassed off actual emails recieved by Helpdesk
+
+  Please Respond as if you were answering the emails.
+
+- Hi,  
+  I'm having a problem with getting java to work through command prompt. When I
+  type in 'javac' the error message I keep getting is "javac is not recognised
+  as an internal or external command,operable program or batch file."I've tried
+  re-installing the cd several times but keep getting the same problem. Do you
+  have any ideas on how to fix this?  
+  Thanks,  
+  A Person.
+- I'm having issues changing my display name. CHFN doesn't seem to be working
+  for me. I'd appreciate any help you could give me on this. I created a thread
+  on redbrick.babble called 'Changing Display Name??' which has some more info
+  on it.  
+  Shadow just suggested using `/local/bin/chfn` as that worked for him but I get
+  the same result..  
+  Regards  
+  A N Other Person
+- Helpdesk,  
+  What does PHP stand for?
+- Helpdesk,  
+  I've heard someone saying they could logon to redbrick with ssh but don't have
+  to give their password. Where can i get information on it Redbrick? What is he
+  doing?  
+  Joe Blogg
+- #### **\*** SUPER BONUS QUESTION ROUND!!! **\***
+
+  1.  what's redbrick about?
+  2.  Why are you cooler than the other candidates?
+  3.  Who's the most sarcastic member of redbrick?
+  4.  redbrick.dcu.ie - explain
+
+  Author's Note: At the time of writing the website was not accessible via
+  http://redbrick.dcu.ie for historical reasons. This issue has since been
+  resolved.
+
+  1.  screen.
diff --git a/source/help/exams/helpdesk-test-2008-agm/index.md b/content/help/exams/helpdesk-test-2008-agm.md
similarity index 95%
rename from source/help/exams/helpdesk-test-2008-agm/index.md
rename to content/help/exams/helpdesk-test-2008-agm.md
index b316abf..b774e94 100644
--- a/source/help/exams/helpdesk-test-2008-agm/index.md
+++ b/content/help/exams/helpdesk-test-2008-agm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2008 AGM'
+title: Helpdesk test 2008 AGM
 ---
 
 
FAILDESK TEST - 2008 AGM  
@@ -21,13 +21,13 @@ ROOLZ!!!11eleventyone!11!!!
    mail: mutt  
    news: slrn  
 
-5\. If you don't know the answer, you can still receive partial marks for telling the user exactly where to find it (for example, if they want to know   
-how to view the permissions for their files in a directory and you don't know about ls -l you can tell them that man ls will give them the info they   
+5\. If you don't know the answer, you can still receive partial marks for telling the user exactly where to find it (for example, if they want to know
+how to view the permissions for their files in a directory and you don't know about ls -l you can tell them that man ls will give them the info they
 need.)  
 
 6\. Answers such as "RTFM" and "check a search engine" won't get you any marks.  
 
-The internet is full of idiots. RedBrick is no exception. As a member of helpdesk your mission is to break your back helping people who are less   
+The internet is full of idiots. RedBrick is no exception. As a member of helpdesk your mission is to break your back helping people who are less
 knowledgeable than you. It's a difficult, thankless job, but somebody has to do it. Will that somebody be you? *dramatic music*  
 
 Good luck!  
@@ -73,7 +73,7 @@ Thank you, O Gods of Helpdesk.
 
 Question 6  
 
-OMG HAI2U!1 I'M LIEK, TOOOTALLY SOOO EXCITIED TO B A MEMBER OF REDBRICK LOL!! JST 1 QUICK QUESTION! IM TRYING 2 CONNECT 2 MY ACCOUNT USING MY FTP   
+OMG HAI2U!1 I'M LIEK, TOOOTALLY SOOO EXCITIED TO B A MEMBER OF REDBRICK LOL!! JST 1 QUICK QUESTION! IM TRYING 2 CONNECT 2 MY ACCOUNT USING MY FTP
 PROGRAM BUT ITS NOT LETTING ME IN  
 
 im using this login info  
@@ -108,17 +108,17 @@ aids
 
 Question 8  
 
-hi i need help, im trying to learn C++, does rb have any resources for getting started with this language? also can you recommend a decent website   
+hi i need help, im trying to learn C++, does rb have any resources for getting started with this language? also can you recommend a decent website
 for more advanced techniques, or a rb member who can help me out? thx.  
 
 Question 9  
 
-i uploaded my website to my redbrick public_html folder but whenever i go to look at it i get an error "access forbidden"? WTF?!?!?!???? How do i fix   
+i uploaded my website to my redbrick public_html folder but whenever i go to look at it i get an error "access forbidden"? WTF?!?!?!???? How do i fix
 this?!  
 
 Question 10  
 
-I was in the labs the other day and this talk, lanky fellow with punk clothes from Donegal was able to log into redbrick WITHOUT USING A PASSWORD!!   
+I was in the labs the other day and this talk, lanky fellow with punk clothes from Donegal was able to log into redbrick WITHOUT USING A PASSWORD!!
 What is this sorcery and how do I subscribe to it?  
 
 Question 11  
@@ -134,7 +134,7 @@ how do I access the boards and post messages?
 
 Question 13  
 
-ive been using chat for a while but lobby is getting boring without zyox and goldfish's lulzy antics to keep me entertained. are there any other good   
+ive been using chat for a while but lobby is getting boring without zyox and goldfish's lulzy antics to keep me entertained. are there any other good
 channels? how do i access them?  
 
 Question 14  
@@ -143,7 +143,7 @@ what is screen? how do i set it up?
 
 Question 15  
 
-my screen just crashed!! i detached it but now i can't reattach it. when i type 'screen -ls' it says my session is still detached though, and 'screen   
+my screen just crashed!! i detached it but now i can't reattach it. when i type 'screen -ls' it says my session is still detached though, and 'screen
 -wipe' doesn't work. how do i kill screen and start over?  
 
 Question 16  
@@ -186,7 +186,7 @@ i stopped forwarding my redbrick e-mail to my dcu account. how do i read the e-m
 
 Question 25  
 
-bollocks!! I think i lost a hey from someone.. I was posting to the boards and the hey popped up for a second but now it's gone. can i find it   
+bollocks!! I think i lost a hey from someone.. I was posting to the boards and the hey popped up for a second but now it's gone. can i find it
 somewhere or at least find out who sent it? thanks!  
 
 Question 26  
@@ -207,19 +207,19 @@ my terminal has stopped responding but my net connection is fine. any explanatio
 
 Question 30  
 
-Can you recommend any decent text editors on RedBrick? I need to edit my website but I'd prefer not to have to upload the HTML file every time. Which   
+Can you recommend any decent text editors on RedBrick? I need to edit my website but I'd prefer not to have to upload the HTML file every time. Which
 is easiest to use?  
 
 Question 31 (9 marks)  
 
-Explain how you would go about setting up a tutorial for DCU students on some technical-related matter, in conjunction with your two helpdesk   
+Explain how you would go about setting up a tutorial for DCU students on some technical-related matter, in conjunction with your two helpdesk
 buddies. It can be about anything you want (previous tutorials have covered topics such as Photoshop, how to install/use Linux, etc.)  
 
 BONUS ROUND  
 
 Question 32  
 
-Someone keeps e-mailing you about their account not being active. You've told them to go away but they are persisting. Explain in great detail what   
+Someone keeps e-mailing you about their account not being active. You've told them to go away but they are persisting. Explain in great detail what
 you would like to do to this person (and no, they are not a girl with a DD cup).  
 
 Question 100001  
diff --git a/source/help/exams/helpdesk-test-2008-egm/index.md b/content/help/exams/helpdesk-test-2008-egm.md
similarity index 99%
rename from source/help/exams/helpdesk-test-2008-egm/index.md
rename to content/help/exams/helpdesk-test-2008-egm.md
index 938751b..b799528 100644
--- a/source/help/exams/helpdesk-test-2008-egm/index.md
+++ b/content/help/exams/helpdesk-test-2008-egm.md
@@ -1,5 +1,5 @@
 ---
-title: 'Helpdesk test 2008 EGM'
+title: Helpdesk test 2008 EGM
 ---
 
 Instructions:  
@@ -16,7 +16,8 @@ programs (unless specified otherwise):
 6\. Some questions won’t have obvious answers, in this case you’ll get marks  
 for knowing what to ask the user next (i/e user:‘whats my username’ –  
 you:‘erm, what’s your DCU mail address and I’ll look you up?’)  
-7\. ‘RTFM’ / ‘Just Google it’ is not a valid answer to most questions. It might  
+7\. ‘RTFM’ / ‘Just Google it’ is not a valid answer to most questions. It
+might  
 sometimes be acceptable, but you’ll need to be a little more specific than  
 that.  
 8\. Possible bonus marks for amusing answers. ASCII porn not accepted.
diff --git a/content/help/exams/helpdesk-test-2010-agm.md b/content/help/exams/helpdesk-test-2010-agm.md
new file mode 100644
index 0000000..dec0b14
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2010-agm.md
@@ -0,0 +1,207 @@
+---
+title: Super Cool Helpdesk Candidate Test for 2010/2011 AGM
+---
+
+```
+                         )      /
+                    (   (     (##)---._ _
+                     )   b     "'        `-----
+_ _ _       \       (    88_
+     `-----(##)       ___888b__
+            "'      _d888888888b   (
+           (    ___d888888888888_   )
+            )  d88888888888888888b (
+           (  d8888888888888888888__
+           ___8888888888888888888888b
+          d88888888888888888888888888b
+          888888888888888888888888888P
+          Y8888Zot888888888888888888P
+```
+
+Instructions:
+
+1.  Most questions appear in the form of a hey/email from a user
+2.  Try to answer as if you were replying to the user
+3.  Write your answers on a separate page and number them for ease of correction
+4.  You can assume for the questions, unless otherwise specified, that the user
+    is using the following programs:
+
+- IRC: irssi
+- News: Slrn
+- Email: mut
+
+5.  All questions carry equal marks (3 marks)
+6.  Some questions won't have an obvious answer, in this case you'll be rewarded
+    for knowing what to ask the user next.
+7.  RTFM/Just google it are NOT acceptable answers
+8.  Possible bonus marks for amusing/helpful answers
+9.  Ask credak if you have any questions/problems.
+10. Best of Luck :)
+
+11. Hey guys, I was using bash a while ago until I realised that zsh is
+    uber 1337. Anyway, when I ls'd while using bash my directories, executables
+    and files were all colouredy. Any way to do this with zsh/other shells? Newb
+12. [================== Hey guys ==================] Listen, #lobby is epic and
+    all with HAUK and LITHIUM talking about brewing and gardening all day, but
+    are there any other channels out there? If so, how do I find out what they
+    are? Oh, and can I make my own? Thanks, HAUKIUM [================== Bye guys
+    ==================]
+13. Hey helpdesk, So here's the thing, my gmail gets forwarded to my redbrick
+    account, but it all gets mixed up with my really important redbrick emails.
+    So, I was wondering if there is anyway to have filters or something in mutt?
+    And how would I filter my mail from gmail and redbrick if I can do this?
+    Jane Smith
+14. Can you recommend any text editors on redbrick? I need to edit my website
+    but I don't want to upload the html file every time.
+15. Hey, I made a webpage on my laptop and I was wondering how I can FTP it up
+    onto redbrick? Thanks John Smith
+16. Howdy :D I just wanted to know is there something anywhere to teach vim to
+    users? And the last time I tried to use vim I couldn't close it for the life
+    of me, how do I close it?
+17. Hey, so Cindella was teaching me this thing where I can stay logged into
+    chat and that sort of stuff, but I didn't really get it. What is this
+    witchcraft? Oh! And how do I get back to chat after I close my terminal?
+    Kthnxbai
+18. Hey, So I was heying some friends the other day and I noticed that my
+    friends border was really sweet, any tips on how to get some nice heys going
+    on? They were using some commandline arguments I think. Is there an easier
+    way?
+19. Message from newb@minerva on pts/999 at 13:37 ... [=================== ^_^
+    HI ^_^ ===================] I got a VM from the admins and installed ubuntu
+    8.04 on it(Everything installed fine) but I can't ssh to it from my home
+    machine... Am I doing something wrong or is it a bug in the system?
+    [=================== ^_^ ^_^ ===================] 
+20. Message from crustyAssociate@minerva on pts/998 at 18:44 ...
+    oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo o hey man
+    o o was just reading the news groups but it my laptop went to cack o o and
+    when i logged back in i cant read'em. this is what it says o o o o slrn
+    0.9.8.1pl1 [2005-02-17] o o o o Reading startup file /etc/news/slrn.rc. o o
+    loading /etc/news/slrn.sl o o Using newsrc file
+    /home/committe/train/.jnewsrc for server o o carbon.internal.slrn fatal
+    error: o o slrn: pid 23242 is locking the newsrc file. o o o o whats up? o
+    oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo 
+21. Hey again, Thanks for the tip about my emails the other day, but I have
+    another question, I've gotten pretty used to vim and I'd like to use it to
+    write my emails in mutt, is there a way to do this?
+22. Hewwo, So, I tried logging in there a few times, and now I can't login at
+    all. I dunno if its a problem with my putty or something on RedBrick's end.
+    My password is 8eduin-1\. Halp!? darrenz0 in Distress
+23. Sup? Is there a way to receive heys when I'm not logged in?
+24. Message from newb@minerva on pts/999 at 21:13 [:::::::::::::::::::: xXx
+    ::::::::::::::::::] "Hey guys, somethings wrong with Finch, but " "is there
+    any other way to get to msn from " "RedBrick? Preferably through IRC if
+    there " "is one. And how would I start out using it?" [::::::::::::::::::::
+    xXx ::::::::::::::::::] 
+25. Hey guys, My 3rd year project is coming up and I need an SQL database for
+    it, can you guys set one up for me and let me know how to start it? Thanks
+    credak
+26. Guys, I put my website in my ~/public_html folder, but when I go to my
+    website I get a 403 permission error... Whats going on?
+27. Helpdesk! I don't like the default prompt! How do I change it to a giant
+    penis??? gw
+28. Fags! I want part of my site password protected. So impart your wisdom on
+    my. If you gave any that is lolololololololololololol! Newbus Maximus
+29. Tardflange! Mutt doesn't seem to be receiving emails, which is upseting
+    because I can't receive my asian boys newletter. What could be wrong and how
+    could I fix it? Lil_Cain
+30. Hey, I tried to compile java program on minerva to remind me to check on my
+    chillis, but when I tried it it spat this shit back at me.
+    ```
+    Error occurred during initialization of VM
+    Could not reserve enough space for object heap
+    Could not create the Java virtual machine.
+    ```
+    What am I doing wrong? LITHIUM.
+31. I hear Redbrick has a photo gallery. Where can I find my page on it and how
+    much space do I have for storing photos? Elephant
+32. Hey, I've been using HTML now for a while and I just started using PHP, is
+    there something I need to do to get them to work on redbrick? Emma
+33. Li3k OMG I jst mssd dis toetale imprtnt hey 4m sum1! D: Cn I chk hu's bin
+    heying me? The Scarlet (and probably pregnant) Scanger
+34. Hey guys, Thanks for the tips about joining other channels earlier, but I've
+    hit a wall again. I made my own channel, but how do I make it so that the
+    channel is password protected, also are there any other modes that might be
+    useful.
+35. So hi! You've explained about file permissions to me before, but I was just
+    wondering what the numbers, 755 for example, meant. Thanks :)
+36. Hey guys, I just set up ubuntu 9.04 on deathray but can't get it to boot
+    properly. What do I do, you cuntflaps? fuck off, ~coconut. I'm awesome, btw.
+37. Hoy Goys How do I change my shell so it starts in tcsh instead of zsh?? Are
+    there any ohter shells out there as well? Thanks Lolasaurus-Rex
+38. So, like how do I send a private message to someone in chat?
+39. I'm an alumnus from DCU with an old account I'd like to get deleted just to
+    get rid of my website etc. My username is: fagface and my password is:
+    iamafagface I can't get in to do it myself because the account is expired so
+    can you give me temporary access to remove my site, or you guys can just go
+    ahead and delete the account completely?
+40. Hi How do I make a tarball/gzip backup of my whole redbrick account? Thanks,
+    Newbius
+
+41. I has a question people. What is SSH? What does it stand for and how can I
+    connect to RedBrick using it in Linux.
+42. OMG GUYS! ALL MY EMAILS SHOULD BE GOING TO MY DCU ADDRESS BUT THEY'RE NOT!
+    ARE THEY DISSAPEARING? WTF? CAN YOU HELP? From AIDS
+43. When I go to log on to redbrick, my username appears fine, but then I go to
+    type into my password and nothing appears, what am I doing wrong? Lulzmaster
+
+## GW'S SUPER AWESOME LULZY BONUS ROUND OF LOLS
+
+Shit in a bag! it's the...
+
+```
+##################################################################
+# ____                              ____                       _ #
+#| __ )  ___  _ __   ___ _ __ ___  |  _ \ ___  _   _ _ __   __| |#
+#|  _ \ / _ \| '_ \ / _ \ '__/ __| | |_) / _ \| | | | '_ \ / _` |#
+#| (_) | (_) | | | |  __/ |  \__ \ |  _ ( (_) | |_| | | | | (_| |#
+#|____/ \___/|_| |_|\___|_|  |___/ |_| \_\___/ \__,_|_| |_|\__,_|#
+##################################################################
+```
+
+1.  What redbrick talks would you like to see this year? What subjects/Speakers
+    would interest you? (34895479 if you say Pooka, 0 otherwise)
+2.  Who's the illest member of the Wu-Tang Clan?(36 points)
+3.  Which admin would you accept a Cleveland Steamer off?
+4.  Werdz
+5.  Johan
+6.  Sonic
+7.  All off the above
+8.  Cian "puppies" Brennan has left himself logged in as root. What do you do to
+    teach him the error of his ways? (1337 points)
+9.  Do you think that Helpdesk will be a fun and rewarding experience? (Yes/No)
+10. If you answered yes to the last question, write the name of your mental
+    disorder and give us an idea of how severe it is. (Eleventy points)
+11. Cian Brennan is:
+12. Fat
+13. Fat
+14. Fat
+15. Fat
+16. Des Moines, Iowa
+17. Get out of this one tonto.
+
+```
+  Sent in some master mind flayers.
+
+                                        -----    ---------
+                                        |$..|    |.......|         ---------
+                    ------------        |...|    |.......|         |{......|
+      ---------     |..........|        |...|    |.......|        #-......$|
+      |?.hhh..|     |..........|      ##....|    |........#       #|.......|
+      |.$.@h...#####|..........|      # -.---    ----|----#       #---------
+      |....h..|    #...........|    ###  ######      $    #   #   ##
+      -----.---     |.+........|    #         #    ###    #   #    #
+       #   #        --------|---  ###         ###  #      # ###    #
+         ###                #     #             ####      # #      #
+         #                  #   ###             ###       ###      #      ----
+         #                  #   #        ##############   #        #      |  |
+         #                  # ###        #-.------+-----###        #      |  |
+     ----.-----       ############/#######|............|# #        #      ----
+     |........|       #-----|-#           |.............# ### -----#
+     |..<*....|       #|....>|#           |............|    # |...|#
+     |.........########|.....|#           |.............######.....#
+     ----------        |......#           |............|      |...|
+                       -------            --------------      -----
+
+  Spoot the Rambler           St:13 Dx:9 Co:18 In:14 Wi:7 Ch:14  Neutral
+  Dlvl:1  $:469 HP:9(10) Pw:2(2) AC:10 Exp:1
+```
diff --git a/source/help/exams/helpdesk-test-2011-agm/index.md b/content/help/exams/helpdesk-test-2011-agm.md
similarity index 54%
rename from source/help/exams/helpdesk-test-2011-agm/index.md
rename to content/help/exams/helpdesk-test-2011-agm.md
index c398ca6..d76abf9 100644
--- a/source/help/exams/helpdesk-test-2011-agm/index.md
+++ b/content/help/exams/helpdesk-test-2011-agm.md
@@ -1,17 +1,20 @@
 ---
-title: 'Helpdesk test 2011 AGM'
+title: Helpdesk test 2011 AGM
 ---
 
 Instructions:  
 ·    Most questions appear in the form of a hey/email from a user  
 ·    Try to answer as if you were replying to the user  
-·    Write your answers on a separate page and number them for ease of correction  
-·    You can assume for the questions, unless otherwise specified, that the user is using the following programs:  
+·    Write your answers on a separate page and number them for ease of
+correction  
+·    You can assume for the questions, unless otherwise specified, that the user
+is using the following programs:  
 ·    IRC: irssi  
 ·    News: Slrn  
 ·    Email: mutt  
 ·    All questions carry equal marks (3 marks)  
-·    Some questions won't have an obvious answer, in this case you'll be rewarded for knowing what to ask the user next.  
+·    Some questions won't have an obvious answer, in this case you'll be
+rewarded for knowing what to ask the user next.  
 ·    RTFM/Just google it are NOT acceptable answers  
 ·    Possible bonus marks for amusing/helpful answers  
 ·    Ask isaac702 if you have any questions/problems.  
@@ -19,43 +22,51 @@ Instructions:
 
 1:  
 hai guyz, are there any games on redbrick?  
-preferably D&D inspired roguelike games?  
+preferably D&D inspired roguelike games?
 
 2:  
 Hi,  
 I am trying to upload a website I have written to Redbrick.  
-Does redbrick have an FTP Server and if so what username and password do I use?  
+Does redbrick have an FTP Server and if so what username and password do I use?
 
-Thanks.  
+Thanks.
 
 3:  
-So like, I’m trying to ssh out to my own server, warez.illegalactivities.org with the command "ssh cokefiend@warez.illegalactivies.org" but the program just hangs there and never connects.  
-Why is your server so shit and how can I get it to work?  
+So like, I’m trying to ssh out to my own server, warez.illegalactivities.org
+with the command "ssh cokefiend@warez.illegalactivies.org" but the program just
+hangs there and never connects.  
+Why is your server so shit and how can I get it to work?
 
 4:  
 Hi,  
     Could you please reset my password to 0871001111.  
-    Thanks.  
+    Thanks.
 
 5:  
 Hi,  
-I want to be cool and insult the shit out of people on IRC, but I’m worried that people will be able to find out who I am with a /whois and inform my mother that I’ve been naughty.  
+I want to be cool and insult the shit out of people on IRC, but I’m worried that
+people will be able to find out who I am with a /whois and inform my mother that
+I’ve been naughty.  
     How can I change what shows up in this information?  
 Regards,  
-isaac702, master-troll.  
+isaac702, master-troll.
 
 6:  
 Hey,  
-I heard Redbrick got a new server and I am wondering what were the names of the other servers redbrick has had over the years.  
-Thanks.  
+I heard Redbrick got a new server and I am wondering what were the names of the
+other servers redbrick has had over the years.  
+Thanks.
 
 7:  
 Helpdesk,  
-Thanks for helping me upload the files for my website however I am having another problem. I am getting a 403 Error when accessing them from my webbrowser what is the problem.  
+Thanks for helping me upload the files for my website however I am having
+another problem. I am getting a 403 Error when accessing them from my webbrowser
+what is the problem.
 
 8:  
-    I need extra storage on RB for my massive collection of pornography course notes.  
-    Is this allowed/possible, and if so, how do i go about getting it?  
+    I need extra storage on RB for my massive collection of pornography course
+notes.  
+    Is this allowed/possible, and if so, how do i go about getting it?
 
 9:  
     8===========================================D  
@@ -63,156 +74,208 @@ Thanks for helping me upload the files for my website however I am having anothe
        I left my terminal open in the labs and someone managed  
        to change my hey border to an ascii penis, how do I  
         change it back?  
-    8===========================================D  
+    8===========================================D
 
 10:  
-So #lobby is great and all, but recently I’ve been in the mood for conversations that aren’t carried out through 6-line high ASCII art and retarded colours.  
+So #lobby is great and all, but recently I’ve been in the mood for conversations
+that aren’t carried out through 6-line high ASCII art and retarded colours.  
 Is there a way for me to block all messages from beim certain users?  
 Also is there a way to disable colour on incoming messages?  
-Thanks, this should make it far easier to have more meaningful conversations, such as those about pints and chillis.  
+Thanks, this should make it far easier to have more meaningful conversations,
+such as those about pints and chillis.
 
 11:  
-For my course I am learning Java and I am trying to do my assignment on Redbrick. However when I try to compile the program I get the following error.  
+For my course I am learning Java and I am trying to do my assignment on
+Redbrick. However when I try to compile the program I get the following error.  
 newb@azazel (~) -> javac ImportantProgram.java  
 Error occurred during initialization of VM  
 Could not reserve enough space for object heap  
 Could not create the Java virtual machine.  
 Is there a way to fix this?  
-Also is there a way I can see the differences between 2 different versions of my source code?  
+Also is there a way I can see the differences between 2 different versions of my
+source code?
 
 12:  
-So I’ve been using nano to edit text files, and it gets the job done, but people keep questioning my sexual preferences.  
+So I’ve been using nano to edit text files, and it gets the job done, but people
+keep questioning my sexual preferences.  
 Is there a different text editor on Redbrick, and how do I learn to use it?  
-Also by what percentage will my sexual activity increase once I begin using it?  
+Also by what percentage will my sexual activity increase once I begin using it?
 
 13:  
 Hi,  
-Recently I have been unable to get at Redbrick from Laplan however I have heard there is a secret way to get in.  
-How can I access redbrick on Laplan?  
+Recently I have been unable to get at Redbrick from Laplan however I have heard
+there is a secret way to get in.  
+How can I access redbrick on Laplan?
 
 14:  
 Hi,  
-I want to see which users are currently logged on to redbrick however I don’t trust shadow’s scripts. How can I do this? Is there a way to see which ones are logged in from DCU?  
+I want to see which users are currently logged on to redbrick however I don’t
+trust shadow’s scripts. How can I do this? Is there a way to see which ones are
+logged in from DCU?
 
 15:  
 Hey,  
-I want to tell carri all the dirty things I’d do to her, but when I say them in #lobby people get annoyed and tell me to take it to PM.  
+I want to tell carri all the dirty things I’d do to her, but when I say them in
+#lobby people get annoyed and tell me to take it to PM.  
     How do I do this?  
 I anxiously await your response.  
 16:  
 Hi,  
-What is chmod and could you briefly explain what do each of the numbers I specify mean.  
+What is chmod and could you briefly explain what do each of the numbers I
+specify mean.  
 eg. chmod 744 index.html  
-Thanks.  
+Thanks.
 
 17:  
 Hi,  
-    I’m trying to install 1337-program-1.2.3 with the instructions on its website.  
-    When I run "sudo make install" and type my password it tells me I’m not allowed to do this.  
-    Is there a way to use this program on Redbrick?  
+    I’m trying to install 1337-program-1.2.3 with the instructions on its
+website.  
+    When I run "sudo make install" and type my password it tells me I’m not
+allowed to do this.  
+    Is there a way to use this program on Redbrick?
 
 18:  
 Hi,  
-    I want to get a list of all Redbrick member usernames (for perfectly legitimate purposes).  
-    How can I do this?  
+    I want to get a list of all Redbrick member usernames (for perfectly
+legitimate purposes).  
+    How can I do this?
 
 19:  
 Hi,  
-I am trying to compress all my files into a tar.gz file so I can download a backup of them.  
+I am trying to compress all my files into a tar.gz file so I can download a
+backup of them.  
 It is important the permissions stay the same.  
-How can I do this.  
+How can I do this.
 
 20:  
- So like, I’m really liking this screen thing :P  
- but for some reason it shows me as being logged in 6 times lol  
- (it’s not my own fault, I followed the instructions beimear gave to the letter)  
- How do I fix your broken server and it’s inability to handle my 1337 screen skillz?  
+ So like, I’m really liking this screen thing :P  
+ but for some reason it shows me as being logged in 6 times lol  
+ (it’s not my own fault, I followed the instructions beimear gave to
+the letter)  
+ How do I fix your broken server and it’s inability to handle my
+1337 screen skillz?
 
 21:  
-I’m using mutt because I think it makes me look cool and more desirable to the opposite sex.  
-Unfortunately my inbox is being filled with people trying to increase my manhood (they probably just don’t know I’m using mutt).  
-Is there some spam filter I can set up on Redbrick, and where would I find more info about it?  
+I’m using mutt because I think it makes me look cool and more desirable to the
+opposite sex.  
+Unfortunately my inbox is being filled with people trying to increase my manhood
+(they probably just don’t know I’m using mutt).  
+Is there some spam filter I can set up on Redbrick, and where would I find more
+info about it?
 
 22:  
 Message from nweb@azazel on pts/3 at 15:16 ...  
       oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-      O Oh hi,                                                                               O  
-      O I want to setup my desktop mail client to send and recieve email             O  
-      O using my Redbrick email account.                                                 O  
-      O What is Redbrick's POP3 and SMTP mail server?                                O  
+      O Oh hi,          O  
+      O I want to setup my desktop mail client to send and recieve email O  
+      O using my Redbrick email account.      O  
+      O What is Redbrick's POP3 and SMTP mail server?      O  
       oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-EOF  
+EOF
 
 23:  
-So I was editing a file on RB and I pressed Ctrl-S to save it, for some reason everything stopped responding, and I was right in the middle of hot cyber-sex action on IRC!!1!  
-How do I fix this, I need to get back to that conversation ASAP.  
+So I was editing a file on RB and I pressed Ctrl-S to save it, for some reason
+everything stopped responding, and I was right in the middle of hot cyber-sex
+action on IRC!!1!  
+How do I fix this, I need to get back to that conversation ASAP.
 
 24:  
-Hey, I signed up and got my password, but it’s really stupid, it has all these numbers and the letters aren’t in any logical order, so hard to remember.  
+Hey, I signed up and got my password, but it’s really stupid, it has all these
+numbers and the letters aren’t in any logical order, so hard to remember.  
 How do I change it to qWeRtY?  
-Also when is the admin test? I intend to run, RB needs my 1337 security skillz!  
+Also when is the admin test? I intend to run, RB needs my 1337 security
+skillz!  
 Thanks,  
-fun.  
+fun.
 
 25:  
 Hi,  
-I heard about about this news (slrn) thing on redbrick. It was working yesterday however now when I try to access it it says it is locked. What is wrong? Why am I being excluded?  
+I heard about about this news (slrn) thing on redbrick. It was working yesterday
+however now when I try to access it it says it is locked. What is wrong? Why am
+I being excluded?
 
 26:  
 Hi,  
-I’m backing up all my bestiality and fetish porn to my RB account, but someone has pointed out to me that the folder (~/SaturdayNight) is world-readable, and everyone is now making fun of me and thinking up nasty nicknames.  
-How do I ensure that no-one else can see my private files on RB?  
+I’m backing up all my bestiality and fetish porn to my RB account, but someone
+has pointed out to me that the folder (~/SaturdayNight) is world-readable, and
+everyone is now making fun of me and thinking up nasty nicknames.  
+How do I ensure that no-one else can see my private files on RB?
 
 27:  
-I’ve started a channel for discussion of eastern philosophy and the evolutionary advantages of vegetarianism.  
-I’m expecting it to become the most popular channel on RB, if not the internet as a whole, so it needs more than me to police it.  
-How do I assign more OPs to the channel, and what are the modes I can use to control it?  
+I’ve started a channel for discussion of eastern philosophy and the evolutionary
+advantages of vegetarianism.  
+I’m expecting it to become the most popular channel on RB, if not the internet
+as a whole, so it needs more than me to police it.  
+How do I assign more OPs to the channel, and what are the modes I can use to
+control it?
 
 28:  
-Hi, I intend to start using databases in my programs however I first want to learn how it works. Can I have a Mysql account?  
+Hi, I intend to start using databases in my programs however I first want to
+learn how it works. Can I have a Mysql account?  
 Also once I have it how do I access it.  
-Are there any resources to help me  
+Are there any resources to help me
 
 29:  
- So I was in #japanophiles and everyone was talking about how                everything is, but it all just showed up as silly boxes to me.  
-I’m worried that these guys won’t think I’m cool and deep enough for them, and I don’t want to have to keep telling them to use English instead of badly-broken Japanese when talking with other native English speakers.  
-How do I make sure I can see these characters?  
+ So I was in #japanophiles and everyone was talking about how               
+everything is, but it all just showed up as silly boxes to me.  
+I’m worried that these guys won’t think I’m cool and deep enough for them, and I
+don’t want to have to keep telling them to use English instead of badly-broken
+Japanese when talking with other native English speakers.  
+How do I make sure I can see these characters?
 
 30:  
 Helpdesk,  
-Urgent problem. I was trying out the different shells that are on redbrick and I changed mine to /usr/local/shells/disusered. Now when I log in I can’t do anything. Help.  
-Also could you give me a brief list of pro’s & con’s of some of the shells on redbrick so something like this doesn’t happen again. Which ones should I avoid?  
+Urgent problem. I was trying out the different shells that are on redbrick and I
+changed mine to /usr/local/shells/disusered. Now when I log in I can’t do
+anything. Help.  
+Also could you give me a brief list of pro’s & con’s of some of the shells on
+redbrick so something like this doesn’t happen again. Which ones should I avoid?
 
 31:  
-I really like that I’m able to stay logged into IRC 24/7 and have people message me all the time.  
-Is it possible to do the same for stuff like MSN and Facebook chat with RB?  
+I really like that I’m able to stay logged into IRC 24/7 and have people message
+me all the time.  
+Is it possible to do the same for stuff like MSN and Facebook chat with RB?
 
 32:  
 Hi,  
-I am having issues logging into Redbrick. I have recently had a number of failed login attempts and now it won’t let me enter my password at all. What is the problem?  
-My username is newb and my password is pI|RuD7E.  
+I am having issues logging into Redbrick. I have recently had a number of failed
+login attempts and now it won’t let me enter my password at all. What is the
+problem?  
+My username is newb and my password is pI|RuD7E.
 
 33:  
-People keep sending me heys about the perceived size of my penis (they’re wrong by the way, I can prove it later tonight if you want).  
-This is all fine, but it keeps crashing right into the middle of my irssi window, so it makes it really hard to chat about how much I hate the brits in #intersocs.  
-Is there a way to disable heys, or at least stop them from going into my chat?  
+People keep sending me heys about the perceived size of my penis (they’re wrong
+by the way, I can prove it later tonight if you want).  
+This is all fine, but it keeps crashing right into the middle of my irssi
+window, so it makes it really hard to chat about how much I hate the brits in
+#intersocs.  
+Is there a way to disable heys, or at least stop them from going into my chat?
 
 OMG BONUS ROUND  
-1: Hypothetically, assume that you find out that a good friend of yours (and Redbrick member) has a very attractive younger sister (who seems well up for it).  
-Explain, in 500 words or less, what actions you would take in this completely hypothetical situation, and why.  
-
-2: You kind yourself with blessed scroll of genocide; L, R, c and m are already genocided.  
+1: Hypothetically, assume that you find out that a good friend of yours (and
+Redbrick member) has a very attractive younger sister (who seems well up for
+it).  
+Explain, in 500 words or less, what actions you would take in this completely
+hypothetical situation, and why.
+
+2: You kind yourself with blessed scroll of genocide; L, R, c and m are already
+genocided.  
 What is the obvious class to genocide with this scroll?  
-In what situation would it be ridiculously stupid to genocide this class?  
+In what situation would it be ridiculously stupid to genocide this class?
 
-3: It is Friday, you have had a bowl of cereal and decided on which seat to occupy.  
-What do you do next?  
+3: It is Friday, you have had a bowl of cereal and decided on which seat to
+occupy.  
+What do you do next?
 
 4: "As a matter of principle, I don't own a real tie" ~ Richard Stallman.  
-Discuss the impact Richard Stallman has had on your life, giving at least 3 examples of positive changes to your lifestyle that have directly arisen from his actions or words.  
+Discuss the impact Richard Stallman has had on your life, giving at least 3
+examples of positive changes to your lifestyle that have directly arisen from
+his actions or words.
 
-5: What redbrick talks/tutorials would you like to see/run in your term as helpdesk?  
+5: What redbrick talks/tutorials would you like to see/run in your term as
+helpdesk?
 
-6: What does Redbrick’s Helpdesk do?  
+6: What does Redbrick’s Helpdesk do?
 
-7: A certain root holder has left a root terminal logged in on one of the lab computers. What do you do?
+7: A certain root holder has left a root terminal logged in on one of the lab
+computers. What do you do?
diff --git a/source/help/exams/helpdesk-test-2011-egm/index.md b/content/help/exams/helpdesk-test-2011-egm.md
similarity index 54%
rename from source/help/exams/helpdesk-test-2011-egm/index.md
rename to content/help/exams/helpdesk-test-2011-egm.md
index 0d97341..f7bee3e 100644
--- a/source/help/exams/helpdesk-test-2011-egm/index.md
+++ b/content/help/exams/helpdesk-test-2011-egm.md
@@ -1,31 +1,34 @@
 ---
-title: 'Helpdesk Test 2011 EGM'
+title: Helpdesk Test 2011 EGM
 ---
 
 Instructions:  
 · Most questions appear in the form of a hey/email from a user  
 · Try to answer as if you were replying to the user  
 · Write your answers on a separate page and number them for ease of correction  
-· You can assume for the questions, unless otherwise specified, that the user is using the following programs:  
+· You can assume for the questions, unless otherwise specified, that the user is
+using the following programs:  
 · IRC: irssi  
 · News: Slrn  
 · Email: mutt  
 · All questions carry equal marks (3 marks)  
-· Some questions won't have an obvious answer, in this case you'll be rewarded for knowing what to ask the user next.  
+· Some questions won't have an obvious answer, in this case you'll be rewarded
+for knowing what to ask the user next.  
 · RTFM/Just google it are NOT acceptable answers  
 · Possible bonus marks for amusing/helpful answers  
 · Ask isaac702 or beimear if you have any questions/problems.  
-· Best of Luck:)  
+· Best of Luck:)
 
-________________  
+---
 
 1\. Hi guys,  
-I have recently joined redbrick and I am looking to use my new webspace to host my brilliantly colourful website.  
+I have recently joined redbrick and I am looking to use my new webspace to host
+my brilliantly colourful website.  
 I have tried to upload it using FTP however I can’t get my client to connect.  
 hostname: login.redbrick.dcu.ie  
 username: newb  
 password: +dm6kU3W  
-What am I doing wrong?  
+What am I doing wrong?
 
 1\. Message from newb@azazel on pts/45 at 22:54 ...  
 oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
@@ -39,170 +42,236 @@ O No bootable device." O
 O I am following the guides on the wiki to the letter. What is the O  
 O problem? O  
 oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-EOF  
+EOF
 
 1\. Hi,  
-Thanks for the help with the uploading files earlier. I am now having another issue.  
-When I visit my website I am getting the following error 403 - Permission Denied.  
-What is the problem and how do I fix it?(Marks also awarded for what you can do to check what is wrong)  
-
-1\. I love knowing all the latest gossip on redbrick and I heard you have something called "news", so I typed news at my terminal and it was just the oldies talking about their grand jobs and growing chillies. Why don’t you have better boards with a nice interface? :(  
+Thanks for the help with the uploading files earlier. I am now having another
+issue.  
+When I visit my website I am getting the following error 403 - Permission
+Denied.  
+What is the problem and how do I fix it?(Marks also awarded for what you can do
+to check what is wrong)
+
+1\. I love knowing all the latest gossip on redbrick and I heard you have
+something called "news", so I typed news at my terminal and it was just the
+oldies talking about their grand jobs and growing chillies. Why don’t you have
+better boards with a nice interface? :(
 
 1\. Message from newb@azazel on pts/45 at 22:54 ...  
 oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
 O Hi helpdesk team. O  
-O I recently got a new laptop and I am using to connect to redbrick while in DCU, O  
+O I recently got a new laptop and I am using to connect to redbrick while in
+DCU, O  
 O this was working fine until a couple of days ago. Now I only get a message O  
 O saying there is no route to host. O  
-O Is there something I need to know about connecting to redbrick on this network? O  
+O Is there something I need to know about connecting to redbrick on this
+network? O  
 O Are there any alternatives to using a desktop client to connect? O  
 oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo  
-EOF  
-________________  
+EOF
+
+---
 
-1\. So I really like the chat on redbrick. #lobby is really interesting and the conversation is really riveting.  
+1\. So I really like the chat on redbrick. #lobby is really interesting and the
+conversation is really riveting.  
 I think it is time for a change though. Is there any other places I can chat?  
-How would I go about creating my own?  
+How would I go about creating my own?
 
-1\. So I noticed that everyone seemed to be on IRC all the time and I was told screen was how it was done.  
-I have followed the instructions I was given however I can’t help but feel something has gone wrong.  
-People in #lobby are telling me I fail at screen however I can’t see how that is possible.  
-Could you explain to them that I am not doing it wrong.  
+1\. So I noticed that everyone seemed to be on IRC all the time
+and I was told screen was how it was done.  
+I have followed the instructions I was given however I can’t
+help but feel something has gone wrong.  
+People in #lobby are telling me I fail at screen however I can’t
+see how that is possible.  
+Could you explain to them that I am not doing it wrong.
 
 1\. H1 4££.  
-1 4m £33t 4t µ$1ng th3 r3Ðbr1(k $3rv1(3$.  
+1 4m £33t 4t µ$1ng th3 r3Ðbr1(k $3rv1(3\$.
 
 F0r $0m3 r34$0n 1 4m µn4b£3 t0 £0g 1n 4n¥m0r3 th0µgh.  
-Mµ$t b3 4 pr0b£3m 0n ¥0µr 3nÐ 4$ 1 4m n0t Ð01ng 4n¥th1ng wr0ng.  
+Mµ$t b3 4 pr0b£3m 0n ¥0µr 3nÐ 4$ 1 4m n0t Ð01ng 4n¥th1ng wr0ng.
 
-1 m4¥ h4v3 t¥p3Ð m¥ p4$w0rÐ 1n wr0ng 4 (0µp£3 0f t1m3$ bµt th1$ w4$n't m¥ f4µ£t. N0th1ng 4pp34r$ 0n $(r33n wh3n 1 t¥p3.  
+1 m4¥ h4v3 t¥p3Ð m¥ p4$w0rÐ 1n wr0ng 4 (0µp£3 0f t1m3$ bµt th1$ w4$n't m¥ f4µ£t.
+N0th1ng 4pp34r$ 0n $(r33n wh3n 1 t¥p3.
 
-Wh4t 1$ wr0ng w1th ¥0µr $¥$t3m?  
+Wh4t 1$ wr0ng w1th ¥0µr $¥\$t3m?
 
-1\. po  
+1\. po
 
-1\. So I have a problem all the email send to my redbrick address goes to my DCU Email.  
+1\. So I have a problem all the email send to my redbrick address goes to my DCU
+Email.  
 How do I disable this?  
-What are my options for viewing email on redbrick?  
+What are my options for viewing email on redbrick?
 
 1\. Thanks for helping me view my mail on redbrick.  
-I have a problem though. I have noticed that I am getting alot of spam to my email address. In the past Gmail’s Spam controls took care of this for me. What does redbrick have to provide me with the same protection?  
+I have a problem though. I have noticed that I am getting alot of spam to my
+email address. In the past Gmail’s Spam controls took care of this for me. What
+does redbrick have to provide me with the same protection?
 
-1\. I have written a script that I want to run automatically. On windows I would set up a scheduled task however I am unsure how to do this on Linux.  
+1\. I have written a script that I want to run automatically. On windows I would
+set up a scheduled task however I am unsure how to do this on Linux.  
 How do I go about doing this?  
-What is the format for the configuration file and how do I edit it?  
+What is the format for the configuration file and how do I edit it?
 
-________________  
+---
 
 1\. Hi I have downloaded a copy of phpBB which I intend to run on my webspace.  
-According to the wiki php files should be 600, directories should be 711 and any other type of file should be 644\. I have tried modifying the permissions however there are just to many files to deal with.  
-Is there a way I can change the permissions on all the appropriate files at once and what do these numbers mean anyway?  
+According to the wiki php files should be 600, directories should be 711 and any
+other type of file should be 644\. I have tried modifying the permissions
+however there are just to many files to deal with.  
+Is there a way I can change the permissions on all the appropriate files at once
+and what do these numbers mean anyway?
 
-Is there anything else I should know about hosting forums on redbrick?  
+Is there anything else I should know about hosting forums on redbrick?
 
 1\. So I am starting to learn mysql as part of a programming assignment.  
 Can haz a Mysql account?  
-How can I take a backup of the database I have on my laptop and restore it to the redbrick account?  
+How can I take a backup of the database I have on my laptop and restore it to
+the redbrick account?
 
-1\. Hi I am in first year of computer applications and I am trying to compile my assignment on redbrick.  
-When ever I try to compile my program though all I get is the following error.  
+1\. Hi I am in first year of computer applications and I am trying to compile my
+assignment on redbrick.  
+When ever I try to compile my program though all I get is the following error.
 
 Error occurred during initialization of VM  
 Could not reserve enough space for object heap  
-Could not create the Java virtual machine.  
+Could not create the Java virtual machine.
 
-What is wrong?  
+What is wrong?
 
-1\. i luv dis redbrick ch@ n all, bt i miss my peepz frm msn nd all. ne way i cn tlk to dem on rdbrck? thx xoxo  
+1\. i luv dis redbrick ch@ n all, bt i miss my peepz frm msn nd all. ne way i cn
+tlk to dem on rdbrck? thx xoxo
 
-1\. There is a section of my redbrick webspace that I want to put a password on.  
-How do I go about doing this?  
+1\. There is a section of my redbrick webspace that I want to put a password
+on.  
+How do I go about doing this?
 
-1\. Hey guise, gw keeps heying me ascii penii while I’m using chat. I’m also using screen so it keeps interrupting all the happenings in #lobby. However, I find his work quite artistic. Is there anyway I could block them from chat and receive them in another window? HALP!  
+1\. Hey guise, gw keeps heying me ascii penii while I’m using chat. I’m also
+using screen so it keeps interrupting all the happenings in #lobby. However, I
+find his work quite artistic. Is there anyway I could block them from chat and
+receive them in another window? HALP!
 
 1\. Dear Helpdesk,  
-I downloaded a file from maK’s websyte to my redbrick called alwaysSafeForWork.tar.gz . He said there’s lots of cool stuff in there that I can browse through in work. However it seems to be a compressed file. I’m new to linux and any help is appreciated,  
-Grand Worker Stu. :)  
+I downloaded a file from maK’s websyte to my redbrick called
+alwaysSafeForWork.tar.gz . He said there’s lots of cool stuff in there that I
+can browse through in work. However it seems to be a compressed file. I’m new to
+linux and any help is appreciated,  
+Grand Worker Stu. :)
 
-1\. I am trying to edit some files on my redbrick account and I am tired of downloading and uploading them each time I make a change. Is there a way of modifying files directly on redbrick?  
-How do I learn how to use it?  
+1\. I am trying to edit some files on my redbrick account and I am tired of
+downloading and uploading them each time I make a change. Is there a way of
+modifying files directly on redbrick?  
+How do I learn how to use it?
 
-________________  
+---
 
-1\. I am new to Linux can you give me a few examples of the commands that I will need to get by.  
-Are there any tutorials that will help me.  
+1\. I am new to Linux can you give me a few examples of the commands that I will
+need to get by.  
+Are there any tutorials that will help me.
 
 1\. Hi Helpdesk,  
-So I was looking at the permissions and ownership of the files in my home directory and I saw public_html had the following,  
-lrwxrwxrwx 1 newb redbrick 19 Oct 7 2009 public_html -> /webtree/n/newb  
+So I was looking at the permissions and ownership of the files in my home
+directory and I saw public_html had the following,  
+lrwxrwxrwx 1 newb redbrick 19 Oct 7 2009 public_html -> /webtree/n/newb
 
-This appears to say that everyone has read write access to my webtree. Should I be worried?  
-What is going on here?  
+This appears to say that everyone has read write access to my webtree. Should I
+be worried?  
+What is going on here?
 
-Newb.  
+Newb.
 
-1\. Hey, I just joined #lobby and some weirdo called moju keeps telling me he’s "fingering" me. How is he doing this and how can I change my information? He already knows my real name!  
+1\. Hey, I just joined #lobby and some weirdo called moju keeps telling me he’s
+"fingering" me. How is he doing this and how can I change my information? He
+already knows my real name!
 
-1\. Hey Helpdesk, I’m having some trouble becoming a leet spammer. At a given opportunity I have to type "/exec -o cat ~newb/spam/baconcorn.txt" . I find this overly time consuming. Is there any way I could shorten the command to "/spam" or something?  
+1\. Hey Helpdesk, I’m having some trouble becoming a leet spammer. At a given
+opportunity I have to type "/exec -o cat ~newb/spam/baconcorn.txt" . I find this
+overly time consuming. Is there any way I could shorten the command to "/spam"
+or something?
 
 1\. I have an urgent problem.  
 I was storing an assignment for one of my modules on redbrick.  
 When I was trying to download it I accidentally copied another file over it  
-Is there any way I can get it back?  
+Is there any way I can get it back?
 
-1\. A friend of mine is able to log into redbrick without typing in his password.  
+1\. A friend of mine is able to log into redbrick without typing in his
+password.  
 What black magic is it that allows him to do this?  
-How can I do the same?  
+How can I do the same?
 
-1\. I have started my own channel on IRC however all these people keep joining and saying mean things to me.  
-The admins simply told me they couldn’t do anything but to consider looking at the channel modes or adding some operators.  
+1\. I have started my own channel on IRC however all these people keep joining
+and saying mean things to me.  
+The admins simply told me they couldn’t do anything but to consider looking at
+the channel modes or adding some operators.  
 How do I add operators to the channel?  
-What modes should I know? For example what does n do? It seems to be on all channels.  
+What modes should I know? For example what does n do? It seems to be on all
+channels.
 
-1\. You have been elected helpdesk. You and your helpdesk friends want to run a talk.  
-Explain how you would go about doing this. Be as detailed as possible.  
+1\. You have been elected helpdesk. You and your helpdesk friends want to run a
+talk.  
+Explain how you would go about doing this. Be as detailed as possible.
 
-(And yes I am looking for specific things here).  
+(And yes I am looking for specific things here).
 
-________________  
+---
 
-1\. So I understand Redbrick has been around for quite a while now. When was it started?  
-Could you name some of the servers it has had over the years?  
+1\. So I understand Redbrick has been around for quite a while now. When was it
+started?  
+Could you name some of the servers it has had over the years?
 
 1\. I am having a major problem.  
 My terminal just stopped working and it isn’t responding anymore.  
-My Internet connection is fine. What is wrong?  
+My Internet connection is fine. What is wrong?
+
+1\. I am tired of the look of my terminal. I want to make it look a tad more
+interesting.  
+How can I change it an ascii penis? It should also be COLOURFUL.
+
+1\. I was using chat in lobby the other day and told everyone I was really
+excited about installing linux. Anyway, some bumbum fellow interjected for a
+moment and told me I should install GNU/linux instead. He told me Richard
+Matthew Stallman could help me out, but I don’t know his username so could you
+guise help me instead? What’s the difference between linux and GNU/linx, and
+will the latter make my computer run faster?  
+newb in OS distress ;\_;
+
+33.
+
+Good day to you. I am an active committee member of DCU gamessoc. I take great
+joy in hosting all the console gaming sessions. I was wondering if there are any
+games on redbrick that may be of interest to me. Any information would be
+appreciated.  
+r1ch4rd.  
+(extra points if you make him join redbrick)
 
-1\. I am tired of the look of my terminal. I want to make it look a tad more interesting.  
-How can I change it an ascii penis? It should also be COLOURFUL.  
+Bonus Round.
 
-1\. I was using chat in lobby the other day and told everyone I was really excited about installing linux. Anyway, some bumbum fellow interjected for a moment and told me I should install GNU/linux instead. He told me Richard Matthew Stallman could help me out, but I don’t know his username so could you guise help me instead? What’s the difference between linux and GNU/linx, and will the latter make my computer run faster?  
-newb in OS distress ;_;  
+1.
 
-33.  
-Good day to you. I am an active committee member of DCU gamessoc. I take great joy in hosting all the console gaming sessions. I was wondering if there are any games on redbrick that may be of interest to me. Any information would be appreciated.  
-r1ch4rd.  
-(extra points if you make him join redbrick)  
+It is raining and I don’t want to go outside but people are telling me to come
+to the common room.  
+How do I get there without leaving the building?
+
+2.
 
-Bonus Round.  
-1)  
-It is raining and I don’t want to go outside but people are telling me to come to the common room.  
-How do I get there without leaving the building?  
+Pirates, Zombies or Unicorns?
 
-2)  
-Pirates, Zombies or Unicorns?  
+3.
 
-3)  
 How much pizza will you have guarantee at events?  
-What toppings will they have?  
+What toppings will they have?
+
+4.
+
+You are sitting alone in N109\. You hear a sound and feel like someone is
+watching you.  
+What do you do? Who/What is it?
+
+5.
 
-4)  
-You are sitting alone in N109\. You hear a sound and feel like someone is watching you.  
-What do you do? Who/What is it?  
+You find a root shell left logged in on Redbrick. What do you do?
 
-5)  
-You find a root shell left logged in on Redbrick. What do you do?  
+6.
 
-6)  
 Draw a representation of #lobby with an emphasis on what it means to you.  
-
+
diff --git a/content/help/exams/helpdesk-test-2013-agm.md b/content/help/exams/helpdesk-test-2013-agm.md
new file mode 100644
index 0000000..b1bd23e
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2013-agm.md
@@ -0,0 +1,161 @@
+---
+title: Helpdesk Exam AGM 2013
+---
+
+**1.** Hello helpdesk, I have just joined your fabulous society, How do I login
+to use the chat and other services? Yours sincerely, Cuntlord420
+
+**2.** I have created a webpage on my pc, how to I transfer it to my rb account?
+Is there anything special I need to do?
+
+**3.** What is zsh? What other alternatives are there and how do I use them? How
+can I see a list of all options?
+
+**4.** some fgts in #intersocs were posting all colours and shit and told me
+they were using gay.pl, I went to that website but it was just a load of gay
+porn. Someone told me it’s a script, what is that and how do I use it?
+
+**5.** Helpdesk, how do I use this screen thing. Sincerely, nub\_\_\_
+
+**6.** How do I get one of those Virtual Machines?
+
+**7.** I keep getting asl messages from isaac. How do I stop seeing these?
+
+**8.** Hi, I’m trying to get my site up and running, but when I visit it all I
+see is "Error 403 - Permission Denied." Why is this?
+
+**9.** I heard there’s a way to skip typing your password in to redbrick. How
+can I set this up and how does it work?
+
+**10.** Hi, I need a database for my l33t third year project. Gimmeh
+
+**11.** Hey I got my account today but I got a shit password that was just
+random letters and numbers. How can I have a normal one like password123 or
+qwerty?
+
+**12.** Hi Helpdesk, I’ve been sent a file called rbnudez2k13.tar.gz How do I
+open this strange and mysterious file?
+
+**13.** Hey guys, I hear people are doing this "logging" thing to save their
+chat history, how do I do this? From, Lumb R. Jack.
+
+**14.** Why doesn’t /disco make my text all coloured like I was told? How do I
+get my chat back?
+
+**15.** Are there any good channels on redbrick? How do I find and join them?
+How do I make my own channel.
+
+**16.** I have made my cool new channel #moonsandfruit, how can I make sure I
+always have ops when I come back to it? How do I make it private?
+
+**17.** Hello Redbrick, I was looking forward to playing games like tetris and
+nethack at DCU’s Gaming Society, but unfortunately they only play shit games
+like Playstation All-Stars and Minecraft. Can Redbrick satisfy my gaming and/or
+sexual needs?
+
+**18.** My cool java program work on the lab pcs but on redbrick I get this
+message:
+
+newb@azazel (~) -> javac ImportantProgram.java Error occurred during
+initialization of VM Could not reserve enough space for object heap Could not
+create the Java virtual machine.
+
+How do I fix this?
+
+**19.** I was cleaning cheeto dust out of my keyboard and when I looked back at
+my terminal it said "zsh: suspended irssi" and now nothing works. How???
+
+**20.** Azazel is pretty cool and all but what other servers does Redbrick have
+and what are they used for?
+
+**21.** Hello, I got one of them vm things but I don’t know how to log in to it,
+please explain how. Also, what is google?
+
+**22.** Hi, How do I create a tarball/gzip of my webspace for backup purposes?
+
+**23.** Hi, There’s some girl on irc who totally wants my dick, how can I find
+out her real name so I can stalk add her on the facebook?
+
+**24.** Hello, How can I change my irc name and finger info to H@wtGam3rCh1ck to
+exploit gullible CA students?
+
+**25.** Hello helpdesk, I currently have a website online at
+redbrick.dcu.ie/~dicks , but I find it quite time consuming to upload a new file
+whenever I need to make a small change. Is there a way to modify files online?
+How can I use it? Your sincerely, Penis
+
+**26.** Hey, I was trying to get my website working on redbrick and I had to run
+"chmod 777" on my files. It works now, but what do those numbers actually mean?
+Do I have to do this with every website I make?
+
+**27.** Hello, how do I make those giant big huge letters in chat? I want to
+know so I can be super cool like beimear.
+
+**28.** Hey, I am trying to cat the file "2guysfucking.txt" but it is too big
+for my screen and scrolls past too quickly. How can I make it go slower so I can
+look at it all? From, ahugefag
+
+- Sent from my iPhone
+
+**29.** How do I send and check emails from redbrick?
+
+**30.** Hi, I have 2 java files on my webspace, one of them is broken, is there
+any way of comparing the two files?
+
+**31.** Hey guys, Is there any way to password protect sections of my redbrick
+site? I promise everything on it belongs to me.
+
+**32.** Hi, I missed Clubs & Socs day, how do I join your society?
+
+**33.** As an elected helpdesk member you will be required to help write the
+next helpdesk exam (unless your name is duff). Please complete the test with one
+unique helpdesk question + answer:
+
+## ~~_~BONUS ROUND~_~~
+
+**1.** If i type /exec -o cat yummyaids.txt into chat, what would you expect to
+see? (draw)
+
+**2.** Create the redbrick user tier list:
+
+```
+----------------------------------------------------------------
+| Tier 1:   |                                                  |
+----------------------------------------------------------------
+| Tier 2.0: |                                                  |
+----------------------------------------------------------------
+| Tier lol: |                                                  |
+----------------------------------------------------------------
+```
+
+**3.** Complete this sudoku
+
+```
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   | 1 |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   | 1 |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+|   |   |   |   |   |   |   |   |   |
+-------------------------------------
+```
+
+**4.** moju is fgt
+
+```
+- yes
+
+- yes
+```
diff --git a/content/help/exams/helpdesk-test-2014-agm.md b/content/help/exams/helpdesk-test-2014-agm.md
new file mode 100644
index 0000000..dd810b6
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2014-agm.md
@@ -0,0 +1,115 @@
+---
+title: Helpdesk Exam AGM 2014
+---
+
+```
+         )            (
+         /(   (\___/)  )\  _____________
+        ( #)  \ (- -) ( # |        '\\\\\\
+         ||___c\   >'__|  |        ' ____|_
+         ||**** )`_/ **'  |   +    '||::::::
+   .__   |'* ___| |___*'  |        '||_____|
+    \_|  |'*(    ~   ,)'  \'_______|_____|
+      )) |' /(.  '  .)\   ___/____|___\___
+     (( _""";!___*_____\_|    _    '  <<<:|
+       /     /|          |_________'___o_o|
+      /_____/ /
+      |:____|/  "So you want to be helpdesk?".
+```
+
+30 questions. Assume questions are emails from the user. Please answer as if you
+were replying to the user. "Google it" or "Check the wiki" are not acceptable
+answers. Bonus marks may be awarded for amusing answers, but probably not. You
+have one hour. GO!
+
+1.  How do I log into Redbrick? (2 marks)
+2.  How do I go onto IRC? (2 marks)
+3.  I heard there’s some kind of wiki for this Redbrick thing where I can find
+    lots of in jokes and stuff so I can be popular. Where do I go to see it? (2
+    marks)
+4.  What’s screen and how do I do it? (3 marks)
+5.  How do I put files on my webspace? (4 marks)
+6.  I’ve got the files on my webspace, but when I try to load them in my browser
+    it comes up as 403 forbidden error, how do I fix it? (3 marks)
+7.  I want to change my password. How do I do that? (2 mark)
+8.  People have been talking about VMs a lot in IRC. How do I get me one of
+    those? (2 marks)
+9.  I’d like to get a MySQL Database for my Third Year Project. Can you give me
+    one? (2 marks)
+10. When I try to compile a java program on redbrick I just get this, what am I
+    doing wrong?
+
+```
+        Error occurred during initialization of VMCould
+        not reserve enough space for object heap
+        Could not create the Java virtual machine. (5 marks)
+```
+
+11. I want to make a section of my webspace only allow people who are Redbrick
+    members to view it. How do I go about doing that? (4 marks)
+12. What are some linux commands that will help me to use Redbrick’s services.
+    (3 marks)
+13. How do I stop emails from forwarding to my DCU email account and what can I
+    use to view my emails in the terminal? (3 marks)
+14. I understand chmod 755 filename but what do these number mean? (4 marks)
+15. I’m the new treasurer of the film soc. Can you tell me how to set up a
+    mailing list so that I can send a mail to all my members at once? (2 Marks)
+16. How do I use this vim thing? I launched it, and I can't type, or get out of
+    it. (5 marks)
+17. What’s zsh and what’s bash? Which one is better and why? (5 marks)
+18. I’m getting bored of #lobby because people keep trolling me, how can I find
+    out what other channels there are and how do I join them? (3 marks)
+19. I found a girl in #lobby! I really want to send her a message outside of
+    chat, but I don’t want her to be able to avoid it either, can you help? (3
+    marks)
+20. What are the names of 2 of the Redbrick Servers and what are they used for?
+    Where can I go to find out about more of the servers? (5 marks)
+21. How do I change my name on irc? (2 marks)
+22. I accidentally used cat on a file and now my terminal has all these weird
+    characters in it. What do I do to fix it? (2 marks)
+23. What are some text editors that are available on Redbrick’s machines? (2
+    marks)
+24. Can I view my Redbrick email on a web browser? What’s the address for it? (2
+    marks)
+25. I know how to set file permissions, but how do I see what permissions files
+    in a folder have? (3 marks)
+26. How do I change what shell I’m using on Redbrick? I tried typing the name of
+    the shell but it resets when I log out. (3 marks)
+27. I hate having to type in screen -r when I log in to reattach my screen. How
+    do I make it so that I can just type, say, "r" and it’d do it for me? (3
+    marks)
+28. People keep sending me heys and it messes up my terminal, how can I turn off
+    heys? (2 marks)
+29. What program can you recommend for uploading files to Redbrick from Windows?
+    Also, is there a Linux equivalent in a command line? (4 marks)
+30. ```
+    Hi all
+    I am a final year business student.
+    I am currently working on My FYP and have run into difficulty in a particular section.
+    The project is to develop a conceptual framework for the development of an e-Supply Chain Management (e-SCM) System for small-to-medium enterprises (SMEs).
+    The goal is not to develop the product, rather to envision:
+    -What the product should look like.
+    -What features and functionalities it should have.
+    -What tools could be used to develop the modules of the software system.
+    -What are the commercialisation pathways for such a tool
+    ```
+
+I am having issues with a particular section where I must devise a software
+development plan. I have no background in software development or programming so
+i am struggling to understand the requirements. I was wondering if it might be
+possible to meet with a member of your team to talk about the information and
+requirements for such a task. thank you for your time.
+
+```
+(3 Marks)
+
+## SUPER LOL BONUS ROUND
+1. What is the best pizza topping?
+2. What is the worst pizza topping?
+3. Why is anyone who answers "pineapple" to question one the worst person in the world?
+4. Fructus has just gotten the gift of a kazoo what do you now do?
+5. Do you think that Helpdesk will be a fun and rewarding experience? (Yes/No)
+6. If you answered yes to the last question, write the name of your mental disorder and give us an idea of how severe it is.
+7. What font is the best font?
+8. If you answered anything that isn’t Comic Sans, why did you not answer Comic Sans?
+```
diff --git a/source/help/exams/helpdesk-test-2014-egm/index.md b/content/help/exams/helpdesk-test-2014-egm.md
similarity index 63%
rename from source/help/exams/helpdesk-test-2014-egm/index.md
rename to content/help/exams/helpdesk-test-2014-egm.md
index bf29a7c..72d5f25 100644
--- a/source/help/exams/helpdesk-test-2014-egm/index.md
+++ b/content/help/exams/helpdesk-test-2014-egm.md
@@ -1,7 +1,9 @@
 ---
-title: 'Helpdesk Exam EGM 2014'
+title: Helpdesk Exam EGM 2014
 ---
+
 ## Main Exam
+
 ```
                        __________________________
               __..--/".'                        '.
@@ -36,94 +38,121 @@ title: 'Helpdesk Exam EGM 2014'
                  """""             "So you want to helpdesk?".
 ```
 
-28 questions. Assume questions are emails from the user. Please answer as if you were replying to the user. "Google it" or "Check the wiki" are not acceptable answers. Bonus marks may be awarded for amusing answers, but probably not. You have one hour. GO!  
+28 questions. Assume questions are emails from the user. Please answer as if you
+were replying to the user. "Google it" or "Check the wiki" are not acceptable
+answers. Bonus marks may be awarded for amusing answers, but probably not. You
+have one hour. GO!
 
-**1.** I'm a first year and don't know how to compute. How do I log into Redbrick? (2 marks)  
+**1.** I'm a first year and don't know how to compute. How do I log into
+Redbrick? (2 marks)
 
-**2.** What is IRC and how do i use it? (2 marks)  
+**2.** What is IRC and how do i use it? (2 marks)
 
-**3.** I was told there is a wiki with all the knowledge of redbrick. Where do I go to see it? (2 marks)  
+**3.** I was told there is a wiki with all the knowledge of redbrick. Where do I
+go to see it? (2 marks)
 
-**4.** I want to use irc on my phone how do i do that? (2 marks)  
+**4.** I want to use irc on my phone how do i do that? (2 marks)
 
-**5.** I got an account at the start of the year but never used it. Now i dont remeber the password and login, how do I get them? (2 mark)  
+**5.** I got an account at the start of the year but never used it. Now i dont
+remeber the password and login, how do I get them? (2 mark)
 
-**6.** What's screen and how do I do it? (2 marks)  
+**6.** What's screen and how do I do it? (2 marks)
 
-**7.** Ive been told i can get a vm so i don't have to break my computer where do i get one of those? (2 marks)  
+**7.** Ive been told i can get a vm so i don't have to break my computer where
+do i get one of those? (2 marks)
 
-**8.** how can i edit text on Redbrick? (2 marks)  
+**8.** how can i edit text on Redbrick? (2 marks)
 
-**9.** I want to get a wordpress site on redbrick how do i do this? (2 marks)  
+**9.** I want to get a wordpress site on redbrick how do i do this? (2 marks)
 
-**10.** I'm the new treasurer of the clay target club. I would like to set up a website and mailing list for the club. (2 Marks)  
+**10.** I'm the new treasurer of the clay target club. I would like to set up a
+website and mailing list for the club. (2 Marks)
 
 **11.** Can i get a new nick on irc? (2 marks)  
 **12.** How do i make my irc all colourful? (2 marks)  
-**13.** I heard there's a way to skip typing your password in to redbrick. How can I set this up and how does it work? (3 marks)  
+**13.** I heard there's a way to skip typing your password in to redbrick. How
+can I set this up and how does it work? (3 marks)
+
+**14.** I understand chmod 755 filename but what do these number mean? (3 marks)
 
-**14.** I understand chmod 755 filename but what do these number mean? (3 marks)  
+**15.** I'm getting bored of #lobby because people keep trolling me, how can I
+find out what other channels there are and how do I join them? (3 marks)
 
-**15.** I'm getting bored of #lobby because people keep trolling me, how can I find out what other channels there are and how do I join them? (3 marks)  
+**16.** I found someone i like in #lobby! How do i find out who they are and
+message her? (3 marks)
 
-**16.** I found someone i like in #lobby! How do i find out who they are and message her? (3 marks)  
+**17.** What are the names of 2 of the Redbrick Servers and what are they used
+for?(4 marks)
 
-**17.** What are the names of 2 of the Redbrick Servers and what are they used for?(4 marks)  
+**18.** All of my redbrick email goes to my dcu account , can I stop this? and
+if i do how do i see them? (4 marks)
 
-**18.** All of my redbrick email goes to my dcu account , can I stop this? and if i do how do i see them? (4 marks)  
+**19.** I made an amazing website on my computer and want to share it with the
+world, how do i upload it to redbrick?( 3 marks)
 
-**19.** I made an amazing website on my computer and want to share it with the world, how do i upload it to redbrick?( 3 marks)  
+**20.** I've got the files on my webspace, but when I try to load them in my
+browser it comes up as 403 forbidden error, how do I fix it? (3 marks)
 
-**20.** I've got the files on my webspace, but when I try to load them in my browser it comes up as 403 forbidden error, how do I fix it? (3 marks)  
+**21.** I know how to set file permissions, but how do I see what permissions
+files in a folder have? (3 marks)
 
-**21.** I know how to set file permissions, but how do I see what permissions files in a folder have? (3 marks)  
+**22.** How do I use other shells on Redbrick? I tried typing the name of the
+shell but it resets when I log out? and what other shells are there? (5 marks)
 
-**22.** How do I use other shells on Redbrick? I tried typing the name of the shell but it resets when I log out? and what other shells are there? (5 marks)  
+**23.** Whenever i login i have to type screen -r is there anyway to make this
+easier? (3 marks)
 
-**23.** Whenever i login i have to type screen -r is there anyway to make this easier? (3 marks)  
+**24.** I want to uploading files to Redbrick from Windows what do i use to do
+this? Also, i dual boot Linux how would you suggest doing it on linux? (4 marks)
 
-**24.** I want to uploading files to Redbrick from Windows what do i use to do this? Also, i dual boot Linux how would you suggest doing it on linux? (4 marks)  
+**25.** I like nano but people slag me for not using vim. How do I use this vim
+thing? I launched it, and I can't type, or get out of it. (5 marks)
 
-**25.** I like nano but people slag me for not using vim. How do I use this vim thing? I launched it, and I can't type, or get out of it. (5 marks)  
+**26.** When I try to compile a java program on redbrick I just get this
 
-**26.** When I try to compile a java program on redbrick I just get this  
 ```
-Error occurred during initialization of VM  
-Could not reserve enough space for object heap  
-Could not create the Java virtual machine.  
+Error occurred during initialization of VM
+Could not reserve enough space for object heap
+Could not create the Java virtual machine.
 ```
-what am I doing wrong? (5 marks)  
+
+what am I doing wrong? (5 marks)
 
 **27.**
+
 ```
-Hi all  
-I am a final year business student.  
-I am currently working on My FYP and have run into difficulty in a particular section.  
-The project is to develop a conceptual framework for the development of an e-Supply Chain Management (e-SCM) System for small-to-medium enterprises (SMEs).  
-The goal is not to develop the product, rather to envision:  
--What the product should look like.  
--What features and functionalities it should have.  
--What tools could be used to develop the modules of the software system.  
--What are the commercialisation pathways for such a tool  
-
-I am having issues with a particular section where I must devise a software development plan. I have no background in software development or programming so i am struggling to understand the requirements.  
-I was wondering if it might be possible to meet with a member of your team to talk about the information and requirements for such a task. thank you for your time. (3 Marks)  
+Hi all
+I am a final year business student.
+I am currently working on My FYP and have run into difficulty in a particular section.
+The project is to develop a conceptual framework for the development of an e-Supply Chain Management (e-SCM) System for small-to-medium enterprises (SMEs).
+The goal is not to develop the product, rather to envision:
+-What the product should look like.
+-What features and functionalities it should have.
+-What tools could be used to develop the modules of the software system.
+-What are the commercialisation pathways for such a tool
+
+I am having issues with a particular section where I must devise a software development plan. I have no background in software development or programming so i am struggling to understand the requirements.
+I was wondering if it might be possible to meet with a member of your team to talk about the information and requirements for such a task. thank you for your time. (3 Marks)
 ```
-**28.** Hi i was hoping to sign up for redbrick i know i missed clubs and socs but was hoping i still could. (2 marks)  
+
+**28.** Hi i was hoping to sign up for redbrick i know i missed clubs and socs
+but was hoping i still could. (2 marks)
 
 **SUPER LOL BONUS ROUND**  
-1.Why is something wrong with Space?  
+1.Why is something wrong with Space?
 
-2.If Koffee is using ldap search what is he probably doing?  
+2.If Koffee is using ldap search what is he probably doing?
 
-3.Pineapple?  
+3.Pineapple?
 
-4.You need a favour from the sysadmin, what do you use to bribe them?  
+4.You need a favour from the sysadmin, what do you use to bribe them?
 
-5.What psychological problem or mental disorder do you have that makes you run for helpdesk, so i can warn the committee?  
+5.What psychological problem or mental disorder do you have that makes you run
+for helpdesk, so i can warn the committee?
 
-6.What is the most effective way to do this job .  
+6.What is the most effective way to do this job .
 
-7.Why does Redbrick continue to elect kylar despite him resigning again?  
+7.Why does Redbrick continue to elect kylar despite him resigning again?
 
-8.If i type /exec -o cat yummyaids.txt into chat, what would you expect to see? (draw)
+8.If i type /exec -o cat yummyaids.txt into chat, what would you expect to see?
+(draw)
diff --git a/source/help/exams/helpdesk-test-2015-agm/index.md b/content/help/exams/helpdesk-test-2015-agm.md
similarity index 62%
rename from source/help/exams/helpdesk-test-2015-agm/index.md
rename to content/help/exams/helpdesk-test-2015-agm.md
index c8056d4..0b7d1e7 100644
--- a/source/help/exams/helpdesk-test-2015-agm/index.md
+++ b/content/help/exams/helpdesk-test-2015-agm.md
@@ -8,57 +8,69 @@ Email section- Answer questions in the form of an email response
 
 Exam out of 75 get 30 to pass
 
-1. How do you login to Redbrick? (2 marks)
+1.  How do you login to Redbrick? (2 marks)
 
-2. Hi i was hoping to sign up for redbrick i know i missed clubs and socs but was hoping i still
+2.  Hi i was hoping to sign up for redbrick i know i missed clubs and socs but
+    was hoping i still
 
 could. (2 marks)
 
-3. What are these shells i hear of and which do we use on Redbrick(2 marks)
+3.  What are these shells i hear of and which do we use on Redbrick(2 marks)
 
-4. I ran vim by typing ‘vim stalkees.txt’ but it isn’t letting me type their names and other
+4.  I ran vim by typing ‘vim stalkees.txt’ but it isn’t letting me type their
+    names and other
 
-personal information. How do I get it to let me type and how do I save my work when I’m
+personal information. How do I get it to let me type and how do I save my work
+when I’m
 
 done? (4 marks)
 
-5. Someone keeps sending heys to me, how do I turn it off? (1 mark)
+5.  Someone keeps sending heys to me, how do I turn it off? (1 mark)
 
-6. Despite loading my amazing html and css in to redbrick folder i cant access my site. can
+6.  Despite loading my amazing html and css in to redbrick folder i cant access
+    my site. can
 
 you help?(2 marks)
 
-7. people keep talking about amazing games of cards against humanity and werewolf what
+7.  people keep talking about amazing games of cards against humanity and
+    werewolf what
 
 command do i run to play? (3 marks)
 
-8. I’ve heard you can get people’s student numbers and stuff using redbrick. How do I do that
+8.  I’ve heard you can get people’s student numbers and stuff using redbrick.
+    How do I do that
 
 without anyone knowing I’m stalking them? (3 marks)
 
-9. How do I screen? (5 marks)
+9.  How do I screen? (5 marks)
 
-10. I really want to spam zergless and koffee. What are some of the best ways I can do that? (3
+10. I really want to spam zergless and koffee. What are some of the best ways I
+    can do that? (3
 
 marks)
 
-11. Someone told me to type /exec ­o yes. What does that do and why is this an example of
+11. Someone told me to type /exec ­o yes. What does that do and why is this an
+    example of
 
 why I should never listen to people on irc? (2 marks)
 
 12. This irssi thing is shit. What’s a better irc client? (2 mark)
 
-13. ive started using vim because im 1337 but i need line numbering to find errors in my code.
+13. ive started using vim because im 1337 but i need line numbering to find
+    errors in my code.
 
 can i turn it on?(2 marks)
 
-14. The config file for Screen makes absolutely no sense. What’s a good alternative? (1 mark)
+14. The config file for Screen makes absolutely no sense. What’s a good
+    alternative? (1 mark)
 
-15. I hate having to reattach to screen or tmux every time I log in. It’s so many unnecessary
+15. I hate having to reattach to screen or tmux every time I log in. It’s so
+    many unnecessary
 
 keystrokes! What do I do to make it automatically re­attach? (4 marks)
 
-16. Redbrick is lying and said I don’t know my password and I *really* wanna play CAH with all my friends.
+16. Redbrick is lying and said I don’t know my password and I _really_ wanna
+    play CAH with all my friends.
 
 plz gizz password.
 
@@ -68,9 +80,10 @@ baaaiiieeee (2 marks)
 
 17. Well hello helpdesk,
 
-Fancy seeing you here *wink wink*
+Fancy seeing you here _wink wink_
 
-While I have you, I need you as most helpful halpdak to help me how to use toilet.pl
+While I have you, I need you as most helpful halpdak to help me how to use
+toilet.pl
 
 Love, newb (2 marks)
 
@@ -78,11 +91,14 @@ Love, newb (2 marks)
 
 I am a final year business student.
 
-I am currently working on My FYP and have run into difficulty in a particular section.
+I am currently working on My FYP and have run into difficulty in a particular
+section.
 
-The project is to develop a conceptual framework for the development of an e­Supply Chain
+The project is to develop a conceptual framework for the development of an
+e­Supply Chain
 
-Management (e­SCM) System for small­to­medium enterprises (SMEs).The goal is not to
+Management (e­SCM) System for small­to­medium enterprises (SMEs).The goal is not
+to
 
 develop the product, rather to envision:
 
@@ -94,11 +110,14 @@ What tools could be used to develop the modules of the software system.
 
 What are the commercialisation pathways for such a tool.
 
-development plan. I have no background in software development or programming so i am
+development plan. I have no background in software development or programming so
+i am
 
-struggling to understand the requirements. I was wondering if it might be possible to meet
+struggling to understand the requirements. I was wondering if it might be
+possible to meet
 
-with a member of your team to talk about the information and requirements for such a task.
+with a member of your team to talk about the information and requirements for
+such a task.
 
 thank you for your time. (3 Marks)
 
@@ -112,29 +131,36 @@ Could not create the Java virtual machine.
 
 what am I doing wrong? (5 marks)
 
-20. So I have a problem all the email send to my redbrick address goes to my DCU Email. How
+20. So I have a problem all the email send to my redbrick address goes to my DCU
+    Email. How
 
 do I disable this? What are my options for viewing email on redbrick? (4 marks)
 
-21. I need a database for my final year project, it’s due in two weeks and I need it now. How do
+21. I need a database for my final year project, it’s due in two weeks and I
+    need it now. How do
 
 I get one? (1 mark)
 
-22. I heard there are boards that old people hang around and talk in. How do I look at them? (2
+22. I heard there are boards that old people hang around and talk in. How do I
+    look at them? (2
 
 marks)
 
-23. Hello im setting up a new society in dcu and ive been told that you will give me a website
+23. Hello im setting up a new society in dcu and ive been told that you will
+    give me a website
 
-and mailing list so i can stay in contact with my members. where do i set this up and how do
+and mailing list so i can stay in contact with my members. where do i set this
+up and how do
 
 i use it?(5 marks)
 
-24. Hi im a third 3 year in case and am doing a booking system for the su. Would it be possible
+24. Hi im a third 3 year in case and am doing a booking system for the su. Would
+    it be possible
 
 to get some help in the form of a mysql database to test my system on?(2 marks)
 
-25. "I understand chmod 751 blahfile but what do these number represent?(3 marks)
+25. "I understand chmod 751 blahfile but what do these number represent?(3
+    marks)
 
 26. Where is all the knowledge of redbrick stored?(2 marks)
 
@@ -146,25 +172,28 @@ to get some help in the form of a mysql database to test my system on?(2 marks)
 
 I am having issues with a particular section where I must devise a software
 
-## Super lol bonus round (7000 marks*)
+## Super lol bonus round (7000 marks\*)
 
-1. What is your name?
+1.  What is your name?
 
-2. What is your quest?
+2.  What is your quest?
 
-3. What is the airspeed velocity of an unladen swallow?
+3.  What is the airspeed velocity of an unladen swallow?
 
-4. Correct the following ­ Romanes eunt domus.
+4.  Correct the following ­ Romanes eunt domus.
 
-5. kylar has once again resigned for the seven millionth time, wat do?
+5.  kylar has once again resigned for the seven millionth time, wat do?
 
-6. What is spaces job?
+6.  What is spaces job?
 
-7. Have you ever got a redbrick announce(on time)?
+7.  Have you ever got a redbrick announce(on time)?
+
+8.  ```
+    cout << ‘Are you willing to bribe me for a pass?’ ;
+    cin >> ans;
+    if(ans == yes){cout << ‘what are you willing to give?’;}
+    ```
 
-8. ```
-cout << ‘Are you willing to bribe me for a pass?’ ;
-cin >> ans;
-if(ans == yes){cout << ‘what are you willing to give?’;}
 ```
 *number of marks to be awarded for bonus round may be greatly exaggerated.
+```
diff --git a/content/help/exams/helpdesk-test-2016-agm.md b/content/help/exams/helpdesk-test-2016-agm.md
new file mode 100644
index 0000000..c79a7a0
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2016-agm.md
@@ -0,0 +1,133 @@
+---
+title: Helpdeskg Exam AGM 2016
+---
+
+# `su; pacman -SU Helpdesk_Exam_AGM_2016;`
+
+Email section- Answer questions in the form of an email response
+
+75 marks total; 30 marks to pass.
+
+1.  How do you login to Redbrick? (2 marks)[a]
+2.  Hi i was hoping to sign up for redbrick i know i missed clubs and socs but
+    was hoping i still could. (2 marks) [b]
+3.  What are these shells i hear of and which do we use on Redbrick(2 marks)[c]
+4.  I ran vim by typing `vim stalkees.txt` but it isn't letting me type their
+    names and other personal information. How do I get it to let me type and how
+    do I save my work when I'm done? (4 marks)[d]
+5.  Someone keeps sending heys to me, how do I turn it off? (1 mark)[e]
+6.  Despite loading my amazing html and css in to redbrick folder i cant access
+    my site. can you help?(2 marks)[f]
+7.  people keep talking about amazing games of cards against humanity and
+    werewolf what command do i run to play? (3 marks)[g]
+8.  I've heard you can get people's student numbers and stuff using redbrick.
+    How do I do that without anyone knowing I'm stalking them? (3 marks)[h]
+9.  So I have a problem all the email send to my redbrick address goes to my DCU
+    Email. How do I disable this? What are my options for viewing email on
+    redbrick? (4 marks)[l]
+10. How do I screen? (5 marks)[m]
+11. I really want to spam zergless and koffee. What are some of the best ways I
+    can do that? (3 marks)[n]
+12. Someone told me to type /exec -o yes. What does that do and why is this an
+    example of why I should never listen to people on irc? (2 marks)[o]
+13. This irssi thing is shit. What's a better irc client? (2 mark)[p]
+14. ive started using vim because im 1337 but i need line numbering to find
+    errors in my code. can i turn it on?(2 marks) [q]
+15. The config file for Screen makes absolutely no sense. What's a good
+    alternative? (1 mark)[r]
+16. I hate having to reattach to screen or tmux every time I log in. It's so
+    many unnecessary keystrokes! What do I do to make it automatically
+    re-attach? (4 marks)[s]
+17. Well hello helpdesk, Fancy seeing you here _wink wink_ While I have you, I
+    need you as most helpful halpdak to help me how to use toilet.pl Love, newb
+    (2 marks)[t]
+18. When I try to compile a java program on redbrick I just get this: Error
+    occurred during initialization of VM Could not reserve enough space for
+    object heap Could not create the Java virtual machine. ...what am I doing
+    wrong? (5 marks)[u]
+19. Redbrick is lying and said I don't know my password and I _really_ wanna
+    play UNO with all my friends. plz gizz password. k tnx baaaiiieeee (2
+    marks)[v]
+20. I need a database for my final year project, it's due in two weeks and I
+    need it now. How do I get one? (1 mark)[w]
+21. I heard there are boards that old people hang around and talk in. How do I
+    look at them? (2 marks)[x]
+22. Hello im setting up a new society in dcu and ive been told that you will
+    give me a website and mailing list so i can stay in contact with my members.
+    where do i set this up and how do i use it?(5 marks) [y]
+23. Hi im a third 3 year in case and am doing a booking system for the su. Would
+    it be possible to get some help in the form of a mysql database to test my
+    system on?(2 marks)[z]
+24. "I understand chmod 751 blahfile but what do these number represent? (3
+    marks)[aa]
+25. Where is all the knowledge of redbrick stored? (2 marks)[ab]
+26. Can i get a new nick on irc? (2 marks) [ac]
+27. How do i make my irc all colourful? (2 marks)[ad]
+28. Hey I hope your keeping well. I am running a charity fight night in Hangar
+    in town on the 9th of March and would love to get a live stream on the night
+    and I was told your society would be the best to go to about this. Anyway I
+    would really like if I could meet up with somebody to have a chat about
+    this, id really appreciate it :) (1mark) [aj]
+29. I want to get a wordpress site on redbrick how do i do this? (2 marks) [ak]
+30. Hi,
+
+As part of an assignment my team and I are required to come up with a new
+product/service. We have decided on an app to assist people with dietary
+requirements.
+
+I was wondering is there anyone in your society that could provide us with
+advice on the technical feasibility of this app?[al] (2 marks)
+
+Super lol bonus round 2: Electric Boogaloo (7000 marks)
+
+1.  go but?
+2.  What is spaces job?
+3.  Who is Dade Murphy and why should you care?
+4.
+
+```
+    food = (pineapple + pizza == bad )
+    food == true or false?
+```
+
+5.
+
+```
+cout << `Are you willing to bribe me for a pass?` ;
+        cin >> ans;
+if(ans == yes){cout << `what are you willing to give?`;}
+```
+
+**number of marks to be awarded for bonus round may be greatly exaggerated.**
+
+- [a]ssh or putty
+- [b]Ask for details, forward to admins
+- [c]Quick definition, link to more info, we use zsh
+- [d]Insert/Append/Replace/whatever :wq or ZZ to save & exit
+- [e]mesg n
+- [f]Make sure in ~/public_html, check permissions
+- [g]/j #cardsagainsthumanity /j #wolf
+- [h]#bots & !stalk/rbstalk, ldap search asked people not to know
+- [l]~/.forwards -Mutt -Mail
+- [m]Define what it's for, how to start & navigate, and how to auto attach
+- [n]figlet or cowsay in heys or pm
+- [o]Pipes output of `yes` to current buffer, people on IRC are bad people
+- [p]Weechat. 1 mark for saying emacs?
+- [q]:set number
+- [r]Tmux
+- [s]echo `screen -dr/tmux attach -d` >> .zlogin
+- [t]/exec -o toilet -f mono12 spam
+- [u]Usage caps, off to pyg with you
+- [v]Admins
+- [w]Admins
+- [x]its dead
+- [y]Admins for initial setup, quick explanation & wiki links for webspace &
+  lists, email us if you need help
+- [z]yep forward to admin
+- [aa]Unix permission numbers quick definition, user/group/global
+- [ab]wiki.rb
+- [ac]/nick, /m nickserv register \$nick
+- [ad]nickcolor.pl(irssi) or weechat
+- [aj]yes we can get them in contact with heanet
+- [ak]Wiki/edu link, email if you have trouble
+- [al]we dont do college asignments
diff --git a/content/help/exams/helpdesk-test-2016-egm.md b/content/help/exams/helpdesk-test-2016-egm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2016-egm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/content/help/exams/helpdesk-test-2017-agm.md b/content/help/exams/helpdesk-test-2017-agm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2017-agm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/content/help/exams/helpdesk-test-2017-egm.md b/content/help/exams/helpdesk-test-2017-egm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2017-egm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/content/help/exams/helpdesk-test-2018-agm.md b/content/help/exams/helpdesk-test-2018-agm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2018-agm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/content/help/exams/helpdesk-test-2018-egm.md b/content/help/exams/helpdesk-test-2018-egm.md
new file mode 100644
index 0000000..ebd0aa3
--- /dev/null
+++ b/content/help/exams/helpdesk-test-2018-egm.md
@@ -0,0 +1,3 @@
+---
+{}
+---
diff --git a/source/help/exams/webmaster-test-2000-agm/index.md b/content/help/exams/webmaster-test-2000-agm.md
similarity index 64%
rename from source/help/exams/webmaster-test-2000-agm/index.md
rename to content/help/exams/webmaster-test-2000-agm.md
index c3cc3e5..5a8cd4e 100644
--- a/source/help/exams/webmaster-test-2000-agm/index.md
+++ b/content/help/exams/webmaster-test-2000-agm.md
@@ -1,42 +1,55 @@
 ---
-title: 'Webmaster test 2000 AGM'
+title: Webmaster test 2000 AGM
 ---
 
-"It's a good test. *nod of approval*." - Singer, 3/4/2000
+"It's a good test. _nod of approval_." - Singer, 3/4/2000
 
-There are 6 sections to this test, totalling 150 Marks. This is an HOUR long test, and you must attempt ALL Sections.
+There are 6 sections to this test, totalling 150 Marks. This is an HOUR long
+test, and you must attempt ALL Sections.
 
 All answers are to be brief, relative to the marks allocated for each one.
 
-Your task is to write a Web database which uses PostgresSQL for the backend with a CGI perl interface flashed up with PHP and VRML. Haha, only joking. Here's the real test:
+Your task is to write a Web database which uses PostgresSQL for the backend with
+a CGI perl interface flashed up with PHP and VRML. Haha, only joking. Here's the
+real test:
 
 ## Section A - Web Serving (25 Marks):
 
-1.  Name two web servers other than the Apache web server, and explain why RedBrick uses Apache. (6 Marks)
+1.  Name two web servers other than the Apache web server, and explain why
+    RedBrick uses Apache. (6 Marks)
 2.  List 2 ways that you could start the apache server.(4 Marks)
 3.  State the latest, stable release of apache. (2 Marks)
 4.  Name apache's main configuration file and two of it's log files. (4 Marks)
-5.  Name a program that you could use to give you statistics for the apache server.(3 Marks)
+5.  Name a program that you could use to give you statistics for the apache
+    server.(3 Marks)
 6.  Name two apache modules. (4 Marks)
 7.  Name the port that a webserver typically runs on.(2 Marks)
 
 ## Section B - Web Authoring (25 Marks):
 
-1.  GIF, JPEG, BMP, & PNG are all graphics file formats. Which one would you use on the RedBrick page? Why would you use it as opposed to the others? (8 Marks)
-2.  Which is better - a lot of small images on a webpage, or a few large ones? Why? (5 Marks)
-3.  The current RedBrick webpages integrate graphics and text seemlessly. What HTML structure lets them do this? (4 Marks)
+1.  GIF, JPEG, BMP, & PNG are all graphics file formats. Which one would you use
+    on the RedBrick page? Why would you use it as opposed to the others? (8
+    Marks)
+2.  Which is better - a lot of small images on a webpage, or a few large ones?
+    Why? (5 Marks)
+3.  The current RedBrick webpages integrate graphics and text seemlessly. What
+    HTML structure lets them do this? (4 Marks)
 4.  Should HTML code be indented? Explain your answer briefly. (4 Marks)
 5.  What are SSI's? What's the primary advantage of using them? (4 Marks)
 
 ## Section C - Web Programming (30 Marks):
 
-Where you are asked to write a program in this section, assume you'll be writing/running it on Enigma, and use your programming/ scripting language of your choice.
+Where you are asked to write a program in this section, assume you'll be
+writing/running it on Enigma, and use your programming/ scripting language of
+your choice.
 
 1.  What does CGI stand for? What is a "CGI script"? (5 Marks)
-2.  Assuming your web server has CGI support, what are the criteria for a CGI script to run on Enigma/Unix-like OS ? (5 Marks)
+2.  Assuming your web server has CGI support, what are the criteria for a CGI
+    script to run on Enigma/Unix-like OS ? (5 Marks)
 3.  Write a program that prints all environment variables. (4 Marks)
 4.  Write a small man page gateway. (12 Marks)
-5.  On Enigma, under Apache's suexec model, which user does a CGI script run as?  
+5.  On Enigma, under Apache's suexec model, which user does a CGI script run
+    as?  
     a) The user who's executing the script  
     b) The user who owns the script  
     c) The webserver (ie, the User ID that that runs under)  
@@ -56,12 +69,12 @@ All of the following are worth 2 Marks.
 7.  ASP
 8.  TCP
 9.  IP
-10.  SQL
-11.  DNS
-12.  URL
-13.  API
-14.  FAQ
-15.  HTTP
+10. SQL
+11. DNS
+12. URL
+13. API
+14. FAQ
+15. HTTP
 
 ## Section E - Administration (20 Marks):
 
@@ -70,16 +83,25 @@ All of the following are worth 2 Marks.
     b) 2 _requirements_ for root access.  
     c) What you would do to physically get root access.  
     (6 Marks, ie. 2 Marks each)
-2.  You just downloaded the latest mod_perl package from the net, because bubble threatened to kick your ass if you didn't. The file looks like this: mod_perl-1.0.1.tar.gz What command(s) do you issue to "unpack" it? (4 Marks)
+2.  You just downloaded the latest mod_perl package from the net, because bubble
+    threatened to kick your ass if you didn't. The file looks like this:
+    mod_perl-1.0.1.tar.gz What command(s) do you issue to "unpack" it? (4 Marks)
 3.  What is the path to the web tree on Enigma? (3 Marks)
-4.  Name 2 document resources you can consult when dealing with a user who has dodgy content on their webpage. (4 Marks)
+4.  Name 2 document resources you can consult when dealing with a user who has
+    dodgy content on their webpage. (4 Marks)
 5.  Give 3 examples of "dodgy" or prohibited content. (3 Marks)
 
 ## Section F - Your Choice.. (20 Marks)
 
 Do either 1) OR 2) from this section.
 
-1.  Explain, as briefly as possible, what exactly happens when you request a page from a website, mentioning the Internet Protocol used and what part the webserver plays in it. [ie, the process involved from when you type in "www.redbrick.dcu.ie" (or whatever) to when the website appears on your screen]. (20 Marks)
-2.  Explain what a "chrooted" webserver is. What are the advantages in having such a server? Mention the security features of such a setup, and why aren't all webservers chrooted? (20 Marks)
+1.  Explain, as briefly as possible, what exactly happens when you request a
+    page from a website, mentioning the Internet Protocol used and what part the
+    webserver plays in it. [ie, the process involved from when you type in
+    "www.redbrick.dcu.ie" (or whatever) to when the website appears on your
+    screen]. (20 Marks)
+2.  Explain what a "chrooted" webserver is. What are the advantages in having
+    such a server? Mention the security features of such a setup, and why aren't
+    all webservers chrooted? (20 Marks)
 
 Printed by Eileen(tm)
diff --git a/source/help/exams/webmaster-test-2001-agm/index.md b/content/help/exams/webmaster-test-2001-agm.md
similarity index 64%
rename from source/help/exams/webmaster-test-2001-agm/index.md
rename to content/help/exams/webmaster-test-2001-agm.md
index 3c270ff..20eb784 100644
--- a/source/help/exams/webmaster-test-2001-agm/index.md
+++ b/content/help/exams/webmaster-test-2001-agm.md
@@ -1,20 +1,28 @@
 ---
-title: 'Webmaster test 2001 AGM'
+title: Webmaster test 2001 AGM
 ---
 
 Instructions: Attempt all sections. You have 1 hour to complete the test.
 
-Keep your answers short and to the point, length is relevent to the marks allocated for that question. Any unneccarily pedantic answers result in 0 marks for that section. You've been warned. There are no trick questions.
+Keep your answers short and to the point, length is relevent to the marks
+allocated for that question. Any unneccarily pedantic answers result in 0 marks
+for that section. You've been warned. There are no trick questions.
 
 ## Section A ­ How big a web whore are you?
 
 [ a.k.a. Web Design ] Answer all questions.
 
-1.  List 3 good points, and 3 bad points about both IE (4 or later) and Netscape (4 or later). (3 marks)
-2.  What are META tags? Why would you use them? Why are they called META tags? (2 marks)
-3.  List the main differences between .jpg and .gif files, and include an example of when you would use them. (3 marks)
-4.  Explain what relative and absolute URLs are. Give reasons for using either. (3 marks)
-5.  Name the things you should do to ensure that you aren't completely alienating people with text based browsers, or people with hearing or sight impairments. (4 marks)
+1.  List 3 good points, and 3 bad points about both IE (4 or later) and Netscape
+    (4 or later). (3 marks)
+2.  What are META tags? Why would you use them? Why are they called META tags?
+    (2 marks)
+3.  List the main differences between .jpg and .gif files, and include an
+    example of when you would use them. (3 marks)
+4.  Explain what relative and absolute URLs are. Give reasons for using either.
+    (3 marks)
+5.  Name the things you should do to ensure that you aren't completely
+    alienating people with text based browsers, or people with hearing or sight
+    impairments. (4 marks)
 
 ## Section B ­ How sad are you?
 
@@ -29,22 +37,24 @@ Keep your answers short and to the point, length is relevent to the marks alloca
 7.  PHP
 8.  PERL
 9.  MIME
-10.  DNS
-11.  HTTPS
-12.  CSS
-13.  CGI
-14.  WAP
-15.  SQL
+10. DNS
+11. HTTPS
+12. CSS
+13. CGI
+14. WAP
+15. SQL
 
 ## Section C - GET /questions.html HTTP/1.0\n\n
 
 [ a.k.a. Web Serving ] Answer all questions.
 
-1.  What is the default port that a normal (non ssl, non proxied) webserver listens on? (1 mark)
+1.  What is the default port that a normal (non ssl, non proxied) webserver
+    listens on? (1 mark)
 2.  What port does HTTPS normally run on? (1 mark)
 3.  Name 3 products provided by the apache project. (2 marks)
 4.  What are MIME types? Why do we need them? (2 marks)
-5.  There is a major security issue with the currently available php module. What is it, and how does redbrick get around it? (3 marks)
+5.  There is a major security issue with the currently available php module.
+    What is it, and how does redbrick get around it? (3 marks)
 6.  Name 1 major difference between HTTP version 1.0 and version 1.1\. (2 marks)
 7.  Why would you use mod_perl? (2 marks)
 8.  What does OPTIONS IncludesNOEXEC do? (2 marks)
@@ -54,9 +64,15 @@ Keep your answers short and to the point, length is relevent to the marks alloca
 [ a.k.a. Web Programming ] Answer all questions.
 
 1.  Describe briefly what a CGI script is. (2 marks)
-2.  List 5 things that would stop a CGI script from working (when you access it from the web). (3 marks)
-3.  Name three of the conditions that suexec checks before running a cgi program. (3 marks)
-4.  Write a small program in either c, perl or php which will display the results from SELECT * FROM Moo, considering Moo is designed as follows. Column Name: ID FirstName Surname Age Type: int(10) primary key auto_increment varchar(50) varchar(50) int(3) Display the results in HTML, using a table. (10 marks)
+2.  List 5 things that would stop a CGI script from working (when you access it
+    from the web). (3 marks)
+3.  Name three of the conditions that suexec checks before running a cgi
+    program. (3 marks)
+4.  Write a small program in either c, perl or php which will display the
+    results from SELECT \* FROM Moo, considering Moo is designed as follows.
+    Column Name: ID FirstName Surname Age Type: int(10) primary key
+    auto_increment varchar(50) varchar(50) int(3) Display the results in HTML,
+    using a table. (10 marks)
 5.  What are RFCs? Why are they so important? (2 marks)
 
 ## Section E ­ # rm ­Rf /
@@ -66,18 +82,27 @@ Keep your answers short and to the point, length is relevent to the marks alloca
 1.  List the command(s) to extract a file called moo.tar.gz. (1 marks)
 2.  What is a daemon? (2 marks)
 3.  What is meant by the `privileged port range' on a unix system? (2 marks)
-4.  What is inetd? Why would you use it instead of the rc.d / rc.local methods? What method do we currently use for apache on redbrick? (3 marks)
+4.  What is inetd? Why would you use it instead of the rc.d / rc.local methods?
+    What method do we currently use for apache on redbrick? (3 marks)
 5.  Briefly describe the importance of DNS. (2 marks)
-6.  What is a setuid program, and give and explain an example (preferably apache related) of it's use. (3 marks)
-7.  Considering I was to give you the root password for enigma right now. What barrier stops you from logging in, and list two ways of getting round it. (2 marks)
+6.  What is a setuid program, and give and explain an example (preferably apache
+    related) of it's use. (3 marks)
+7.  Considering I was to give you the root password for enigma right now. What
+    barrier stops you from logging in, and list two ways of getting round it. (2
+    marks)
 
 ## Section F -
 
 [ a.k.a. Your Choice ] Answer a or b
 
-A) Give instructions on how someone who had a fresh install of a unix, say, linux, would install apache with basic php (as a module, or as a cgi) enabled. You can't use the ports or apt-get systems, (ie, you must use source). (20 marks)
+A) Give instructions on how someone who had a fresh install of a unix, say,
+linux, would install apache with basic php (as a module, or as a cgi) enabled.
+You can't use the ports or apt-get systems, (ie, you must use source). (20
+marks)
 
-B) What are the advantages in having a "chrooted" server? Mention the security features of such a setup, and why aren't all webservers chrooted? (20 marks) [ let's hope you looked at last years paper :P~ ]
+B) What are the advantages in having a "chrooted" server? Mention the security
+features of such a setup, and why aren't all webservers chrooted? (20 marks) [
+let's hope you looked at last years paper :P~ ]
 
 ## Section G - Brownie Points!
 
diff --git a/source/help/exams/webmaster-test-2002-agm/index.md b/content/help/exams/webmaster-test-2002-agm.md
similarity index 52%
rename from source/help/exams/webmaster-test-2002-agm/index.md
rename to content/help/exams/webmaster-test-2002-agm.md
index 15b8728..dffaa5e 100644
--- a/source/help/exams/webmaster-test-2002-agm/index.md
+++ b/content/help/exams/webmaster-test-2002-agm.md
@@ -1,80 +1,117 @@
 ---
-title: 'Webmaster test 2002 AGM'
+title: Webmaster test 2002 AGM
 ---
 
-1 hour long. Attempt all sections; there are no trick questions. For optional questions, you may answer more than one option, the marks from the highest scored options will be awarded.  
+1 hour long. Attempt all sections; there are no trick questions. For optional
+questions, you may answer more than one option, the marks from the highest
+scored options will be awarded.
 
-You may refer to the reference sheet on regular expressions(these were lost to the winds of time)
+You may refer to the reference sheet on regular expressions(these were lost to
+the winds of time)
 
-Section A - General Web "Stuff" (spot the question that's been on the last 3 tests)
+Section A - General Web "Stuff" (spot the question that's been on the last 3
+tests)
 
-1.  Name the **3** browsers that one should consider "market leaders" that a site should definitely work in. **(3 marks)**
-2.  Using HTML, how should you produce the "&" character in a browser. **(2 marks)**
-3.  List the main differences between .jpg and .gif files, include an example of when you would use them. **(3 marks)**
-4.  What is the "web safe palette"? Is it worth bothering with these days? **(3 marks)**
-5.  Name some ways in which you could have your site indexed better by search engines such as google. **(4 marks)**
+1.  Name the **3** browsers that one should consider "market leaders" that a
+    site should definitely work in. **(3 marks)**
+2.  Using HTML, how should you produce the "&" character in a browser. **(2
+    marks)**
+3.  List the main differences between .jpg and .gif files, include an example of
+    when you would use them. **(3 marks)**
+4.  What is the "web safe palette"? Is it worth bothering with these days? **(3
+    marks)**
+5.  Name some ways in which you could have your site indexed better by search
+    engines such as google. **(4 marks)**
 
-Section B - Regular Expressions  
+Section B - Regular Expressions
 
-No smart (.*) answers! All regular expressions should match only the expected input specified.
+No smart (.\*) answers! All regular expressions should match only the expected
+input specified.
 
-1.  Write a regular expression that will match:  
+1.  Write a regular expression that will match:
 
-    `/xxx/yy /xxxx/y /xxxxxxx/yyy` .. etc (you get the idea)  
+    `/xxx/yy /xxxx/y /xxxxxxx/yyy` .. etc (you get the idea)
 
     **(3 marks)**
-2.  Write a regular expression that will match all /~[username]/ requests for files with the ".jsp" extension. You can consider the jsp the end of the string. **(5 marks)**
-3.  Given the expression "\.*" give 2 strings you would expect to match. **(2 marks)**
-4.  We.ve decided to reverse proxy an IIS machine through apache, write a regular expression that would catch all URL's with "cmd.exe" in them anywhere. **(5 marks)**
+
+2.  Write a regular expression that will match all /~[username]/ requests for
+    files with the ".jsp" extension. You can consider the jsp the end of the
+    string. **(5 marks)**
+3.  Given the expression "\.\*" give 2 strings you would expect to match. **(2
+    marks)**
+4.  We.ve decided to reverse proxy an IIS machine through apache, write a
+    regular expression that would catch all URL's with "cmd.exe" in them
+    anywhere. **(5 marks)**
 
 Section C - Web serving
 
-1.  Give the official (as per RFC 2616) response-type name **OR** write a brief sentence on what any **3** of the following HTTP response codes indicate. **(3 marks)**  
+1.  Give the official (as per RFC 2616) response-type name **OR** write a brief
+    sentence on what any **3** of the following HTTP response codes indicate.
+    **(3 marks)**
 
-    200, 404, 403, 400, 302, 500  
+    200, 404, 403, 400, 302, 500
 
 2.  Name 3 non-apache web-servers. **(3 marks)**
 3.  What does APACI stand for ? **(1 mark)**
-4.  List some differences in using php as cgi (e.g. #!/usr/local/bin/php) and mod_php. RedBrick uses both, but users cannot use the module, why? **(3 marks)**
+4.  List some differences in using php as cgi (e.g. #!/usr/local/bin/php) and
+    mod_php. RedBrick uses both, but users cannot use the module, why? **(3
+    marks)**
 5.  What is suexec? **(2 marks)**
 6.  What is TomCat? **(1 mark)**
-7.  What are http cookies? How are they useful? Give an example of their use. **(2 marks)**
+7.  What are http cookies? How are they useful? Give an example of their use.
+    **(2 marks)**
 
 Section D - CGI is fun
 
-1.  Give 3 environment variables a CGI can make use of. Describe what each one indicates.**(3 marks)**
-2.  What are the two main different methods of giving a CGI input from a html form? Give advantages and disadvantages of each. **(5 marks)**
-3.  Write a CGI, in the language of your choice (indicate), to output the /etc/motd file. **(2 marks)**
-4.  The following shell script, named "query_test.cgi", does not work and generates a "premature end of script headers" error document. Assuming the permissions and locations are correct, give two reasons. **(2 marks)**
+1.  Give 3 environment variables a CGI can make use of. Describe what each one
+    indicates.**(3 marks)**
+2.  What are the two main different methods of giving a CGI input from a html
+    form? Give advantages and disadvantages of each. **(5 marks)**
+3.  Write a CGI, in the language of your choice (indicate), to output the
+    /etc/motd file. **(2 marks)**
+4.  The following shell script, named "query_test.cgi", does not work and
+    generates a "premature end of script headers" error document. Assuming the
+    permissions and locations are correct, give two reasons. **(2 marks)**
 
     
#!/bin/sh
-
+    
     echo "Content-type=text/html"
-
+    
     eval echo "
"
-    eval echo "query string is:" $QUERY_STRING 
+    eval echo "query string is:" $QUERY_STRING
     eval echo "
"
-    		

 
-5.  For the same shell script (after the two errors are fixed), describe how it is insecure, indicate an exploit. **(3 marks)**
+        	

+
+5.  For the same shell script (after the two errors are fixed), describe how it
+    is insecure, indicate an exploit. **(3 marks)**
 
 Section E - "Sorry, wrong password"
 
-1.  Some muppet asks you install weirdsh because they want to write scripts in it. You download a file called weirdsh.tar.gz, how do you extract it ? **(2 marks)**
-2.  Without knowing anything specific about the weirdsh project, what two commands would you expect to have to run to build it from source? **(2 marks)**
+1.  Some muppet asks you install weirdsh because they want to write scripts in
+    it. You download a file called weirdsh.tar.gz, how do you extract it ? **(2
+    marks)**
+2.  Without knowing anything specific about the weirdsh project, what two
+    commands would you expect to have to run to build it from source? **(2
+    marks)**
 3.  And the third command to install it? **(1 mark)**
 4.  What is the difference between `"su"` and `"su -"`? **(2 marks)**
 5.  How would you disuser a user? **(2 marks)**
 6.  How would you disable a users website permanently? **(2 marks)**
-7.  What command would you run to find out how many sockets are active to port 80? **(2 marks)**
+7.  What command would you run to find out how many sockets are active to port
+    80? **(2 marks)**
 
 Section F - "The hard one"
 
 
Answer either A or B

 
-1.  What is reverse proxying? Give some benefits and drawbacks and an example of its use. Bonus marks if you can describe briefly its use on RedBrick. **(20 marks)**  
+1.  What is reverse proxying? Give some benefits and drawbacks and an example of
+    its use. Bonus marks if you can describe briefly its use on RedBrick. **(20
+    marks)**
 
-2.  Apache has an alternative to being compiled as large static binary called DSO support (using mod_so). What is this? Give some of its advantages. Bonus marks if you can describe briefly its use on RedBrick. **(20 marks)**
+2.  Apache has an alternative to being compiled as large static binary called
+    DSO support (using mod_so). What is this? Give some of its advantages. Bonus
+    marks if you can describe briefly its use on RedBrick. **(20 marks)**
 
 Section G - Brownie Points!
 
@@ -84,4 +121,5 @@ Section G - Brownie Points!
     Did you cry when it was cancelled?  
     Why not? !!!
 4.  Name a good source of (hint) weekly news on Apache.
-5.  Name 3 former RedBrick webmasters (a.k.a. people you can bother with questions ;p~)
+5.  Name 3 former RedBrick webmasters (a.k.a. people you can bother with
+    questions ;p~)
diff --git a/source/help/exams/webmaster-test-2003-agm/index.md b/content/help/exams/webmaster-test-2003-agm.md
similarity index 59%
rename from source/help/exams/webmaster-test-2003-agm/index.md
rename to content/help/exams/webmaster-test-2003-agm.md
index 08d8a3c..1a84fc8 100644
--- a/source/help/exams/webmaster-test-2003-agm/index.md
+++ b/content/help/exams/webmaster-test-2003-agm.md
@@ -1,85 +1,107 @@
 ---
-title: 'Webmaster test 2003 AGM'
+title: Webmaster test 2003 AGM
 ---
 
-1 hour long. Attempt all sections. Keep your answers concise - there is no point in writing an essay for a question that's worth 3 marks.
+1 hour long. Attempt all sections. Keep your answers concise - there is no point
+in writing an essay for a question that's worth 3 marks.
 
 ## Section A - General Web Knowledge
 
 1.  Name **4** modern browsers that enjoy popular use. **(4 marks)**
 2.  Explain **2** advantages of XHTML over HTML. **(2 marks)**
-3.  List the main differences between .jpg and .gif files, include an example of when you would use them. **(3 marks)**
-4.  Briefly, what does anti-aliasing do with an image to improve its appearance on a website? **(3 marks)**
+3.  List the main differences between .jpg and .gif files, include an example of
+    when you would use them. **(3 marks)**
+4.  Briefly, what does anti-aliasing do with an image to improve its appearance
+    on a website? **(3 marks)**
 5.  What are SSIs? Give **2** advantages of using them. **(3 marks)**
 
 ## Section B - Regular Expressions and Sadness Test
 
 1.  Expand these: **(1 mark each)**
-    *   LDAP
-    *   CSS
-    *   PERL
-    *   PHP
-    *   XML
-    *   MIME
-    *   SQL
-    *   MPEG
-    *   HEA
-    *   BOFH
-2.  Write a regular expression that will match any subdomain of DCU, i.e. under the .dcu.ie domain. **(5 marks)**
+    - LDAP
+    - CSS
+    - PERL
+    - PHP
+    - XML
+    - MIME
+    - SQL
+    - MPEG
+    - HEA
+    - BOFH
+2.  Write a regular expression that will match any subdomain of DCU, i.e. under
+    the .dcu.ie domain. **(5 marks)**
 
 ## Section C - Web Serving/Apache
 
-1.  Name the script used by apache to start, stop, restart and gracefully restart Apache, used as a frontend to httpd. **(1 mark)**
+1.  Name the script used by apache to start, stop, restart and gracefully
+    restart Apache, used as a frontend to httpd. **(1 mark)**
 2.  Name **3** non-Apache webservers. **(3 marks)**
-3.  Give the HTTP response code corresponding to any **3** of these official response-type names (as per RFC 2616). **(3 marks)**
-    *   Not Found
-    *   HTTP OK
-    *   Forbidden
-    *   Internal Server Error (for instance premature end of script headers)
-    *   Unauthorized
-4.  RedBrick's webserver is now built without mod_php. Why was this done? **(2 marks)**
-5.  Users can still run PHP on the system. Give **2** additional things you need to run PHP as a binary. **(2 marks)**
+3.  Give the HTTP response code corresponding to any **3** of these official
+    response-type names (as per RFC 2616). **(3 marks)**
+    - Not Found
+    - HTTP OK
+    - Forbidden
+    - Internal Server Error (for instance premature end of script headers)
+    - Unauthorized
+4.  RedBrick's webserver is now built without mod_php. Why was this done? **(2
+    marks)**
+5.  Users can still run PHP on the system. Give **2** additional things you need
+    to run PHP as a binary. **(2 marks)**
 6.  How many different versions of HTTP are there? Name them.**(3 marks)**
 7.  What is Tomcat? **(1 mark)**
 
 ## Section D - CGI Is GR8
 
 1.  What does CGI stand for? **(1 mark)**
-2.  Write a program in a (mentioned) language of your choice that prints the current date and time. **(2 marks)**
+2.  Write a program in a (mentioned) language of your choice that prints the
+    current date and time. **(2 marks)**
 3.  What is suexec and what does it do? **(2 marks)**
-4.  Write a program in a (mentioned) language of your choice that prints the IP address of the machine visiting the page (NOTE: Must work on Redbrick :)) **(3 marks)**
-5.  The following PHP script does not work on RedBrick. Assuming the permissions and locations are correct, give two reasons why not. **(2 marks)**
+4.  Write a program in a (mentioned) language of your choice that prints the IP
+    address of the machine visiting the page (NOTE: Must work on Redbrick :))
+    **(3 marks)**
+5.  The following PHP script does not work on RedBrick. Assuming the permissions
+    and locations are correct, give two reasons why not. **(2 marks)**
 
     
        
     	

 
-6.  What are the two main different methods of giving a CGI input from a html form? Give advantages and disadvantages of each. **(5 marks)**
+6.  What are the two main different methods of giving a CGI input from a html
+    form? Give advantages and disadvantages of each. **(5 marks)**
 
 ## Section E - I thought root was part of a plant...
 
 1.  Show how you would extract a file called cantopenme.tar.bz2 **(2 marks)**
 2.  What is meant by the 'privileged port range' on a UNIX system? **(2 marks)**
-3.  This madman heys you saying he can't send mails because he can't save the file. Name **2** things that might have caused this. **(2 marks)**
+3.  This madman heys you saying he can't send mails because he can't save the
+    file. Name **2** things that might have caused this. **(2 marks)**
 4.  What is the difference between `su` and `su -`? **(2 marks)**
-5.  If you were given the root password for prodigy now, what mechanism prevents you from successfully running su? **(2 marks)**
-6.  You receive a cease and desist order from an Irish record label informing you that a user is publicly distributing copyrighted mp3s from his account. In reasonable detail and in order, explain the steps you would take should such an incident occur. **(5 marks)**
+5.  If you were given the root password for prodigy now, what mechanism prevents
+    you from successfully running su? **(2 marks)**
+6.  You receive a cease and desist order from an Irish record label informing
+    you that a user is publicly distributing copyrighted mp3s from his account.
+    In reasonable detail and in order, explain the steps you would take should
+    such an incident occur. **(5 marks)**
 
 ## Section F - The Essay
 
 Answer either A OR B.
 
-1.  Apache has an alternative to being compiled as large static binary called DSO support (using mod_so). What is this? Give some of its advantages. Bonus marks if you can describe briefly its use on RedBrick. **(20 marks)**
-2.  Using **3** key points, explain how best you would make your default installation of Apache more secure.**(20 marks)**
+1.  Apache has an alternative to being compiled as large static binary called
+    DSO support (using mod_so). What is this? Give some of its advantages. Bonus
+    marks if you can describe briefly its use on RedBrick. **(20 marks)**
+2.  Using **3** key points, explain how best you would make your default
+    installation of Apache more secure.**(20 marks)**
 
 ## Section G - Giveaway Points!
 
 1.  Give the current version of Apache running on Redbrick **(1 mark)**
 2.  Give the current version of Tomcat running on Redbrick **(1 mark)**
 3.  What is the DocumentRoot for RedBrick's webserver? **(1 mark)**
-4.  The threat of what sort of exploit prompted the latest Apache upgrade? **(1 mark)**
+4.  The threat of what sort of exploit prompted the latest Apache upgrade? **(1
+    mark)**
 5.  What version of evil is Dave running in his head? **(1 mark)**
diff --git a/source/help/exams/webmaster-test-2004-agm-answers/index.md b/content/help/exams/webmaster-test-2004-agm-answers.md
similarity index 50%
rename from source/help/exams/webmaster-test-2004-agm-answers/index.md
rename to content/help/exams/webmaster-test-2004-agm-answers.md
index 6f9a227..9d17236 100644
--- a/source/help/exams/webmaster-test-2004-agm-answers/index.md
+++ b/content/help/exams/webmaster-test-2004-agm-answers.md
@@ -1,31 +1,50 @@
 ---
-title: 'Webmaster test 2004 AGM Answers'
+title: Webmaster test 2004 AGM Answers
 ---
 
 ## Note:
 
-There are various ways to answer most questions. If the candidate explained the key points with a suitable amount of information they got the question right.
+There are various ways to answer most questions. If the candidate explained the
+key points with a suitable amount of information they got the question right.
 
 ## A: So you wanna be head of webgroup? (25)
 
 ## (General Web Knowledge)
 
-1.  CSS stands for Cascading Style Sheets. They are used to give a coherent style to a website.  
-    The css information can be built into the page or included from an external .css file. The advantage of this layout is that the style of an entire site can be altered just by editing the sites css file.  
+1.  CSS stands for Cascading Style Sheets. They are used to give a coherent
+    style to a website.  
+    The css information can be built into the page or included from an external
+    .css file. The advantage of this layout is that the style of an entire site
+    can be altered just by editing the sites css file.
 
-    xhtml stands for eXtensible HyperText Markup Language. Is is one of the new web markup languages combining HTML4 document types and XML.  
-    It is designed to be xml conforming and operate in HTML4 agents. The advantage of this is to allow for your site to be future compatible aswell as backward compatible(5)
-2.  SSI stands for Server Side Includes. SSI's trigger further actions whose output can be embedded into the page that it was called from.  
-    Common uses are including other pages in the current page or executing inline CGI scripts.  
+    xhtml stands for eXtensible HyperText Markup Language. Is is one of the new
+    web markup languages combining HTML4 document types and XML.  
+    It is designed to be xml conforming and operate in HTML4 agents. The
+    advantage of this is to allow for your site to be future compatible aswell
+    as backward compatible(5)
+
+2.  SSI stands for Server Side Includes. SSI's trigger further actions whose
+    output can be embedded into the page that it was called from.  
+    Common uses are including other pages in the current page or executing
+    inline CGI scripts.
+
+    The RedBrick website uses SSI both to execute inline CGI's and to include
+    the templates for the outline of all pages i.e the header and leftside
+    links,the footer and right side links. (5)
 
-    The RedBrick website uses SSI both to execute inline CGI's and to include the templates for the outline of all pages i.e the header and leftside links,the footer and right side links. (5)
 3.  Internet Explorer, Opera, (Firefox,Netscape,Mozilla) (5)
-4.  Tasks of webgroup are to redesign the RedBrick website periodically. To maintain the RedBrick website and perform day to day updates in the form of front page announcements. To give help on web issues to members who ask for it.  
+4.  Tasks of webgroup are to redesign the RedBrick website periodically. To
+    maintain the RedBrick website and perform day to day updates in the form of
+    front page announcements. To give help on web issues to members who ask for
+    it.
 
     Current member are : p colmmacc skyhawk emperor trevj kpodesta (5)
-5.  ASP stands for Active Server Pages. They are Microsofts answer to dynamic web content. They make use of inline VBScript.  
 
-    They are not supported on RedBrick as they are essentially designed to work on microsoft IIS webservers. (5)
+5.  ASP stands for Active Server Pages. They are Microsofts answer to dynamic
+    web content. They make use of inline VBScript.
+
+    They are not supported on RedBrick as they are essentially designed to work
+    on microsoft IIS webservers. (5)
 
 ## B: Ahoy there Lone Ranger, where's Tonto? (30)
 
@@ -34,74 +53,127 @@ There are various ways to answer most questions. If the candidate explained the
 1.  `tar xvzf apache1_3_9.tar.gz` and cd to the directory it creates.  
     `./configure`  
     `make`  
-    `make install`  
+    `make install`
 
     Webservers default port is 80
-2.  SSL stands for Secure Socket Layer.SSL is a security protocol allowing for traffic to be encrypted and decrypted.. The default port for an SSL'd webserver is 443\.  
 
-    RedBrick makes use of it to secure the webmail service. SSL can be built into Apache2 by adding the --enable-ssl switch to the configure script.(5)
-3.  **PHP as CGI:**  
-    **Pro:** More secure than running mod_php. Allows for all scripts to be handled by suExec and thus ran as the user who owns them.  
-    **Con:** It's slower than mod_php as before a script can run it must be passed on to suExec, suExec performs it's own internal checkes and THEN calls php to run the script  
+2.  SSL stands for Secure Socket Layer.SSL is a security protocol allowing for
+    traffic to be encrypted and decrypted.. The default port for an SSL'd
+    webserver is 443\.
 
-    **PHP as module:**  
-    **Pro:** Faster than php as a CGI as the php can be run by the server using the php module.  
-    **Con:** The lack of the handoff to suExec allowes for the script to be executed as the web server user. The webserver has a higher security access than a normal user as such exploited scripts could cause more harm.(4)
-4.  Virtual Hosts are a way for a single apache server to host websites for multiple different domains. Each site can have its own access controls ,error pages, etc.  
-
-    RedBrick allows its members to host the websites belonging to their domains on the RedBrick server giving those domains all the availability of RedBricks services. The document root for vhosts on RedBrick is /webtree/vhosts (4)
-5.  The function of suExec is to intercept web scripts, perform some checks, and execute the script as the user who owns it. Doing this makes certain that an exploited script only has the permission of the user who owns it and is less of a danger to the server.  
+    RedBrick makes use of it to secure the webmail service. SSL can be built
+    into Apache2 by adding the --enable-ssl switch to the configure script.(5)
 
-    Yes suExec will complain. Part of the checks done is to make sure that both the user and group match. In this case the user in now in the associat group yet the scripts permissions are set to the member group. This will cause a mismatch and will throw an internal server error (4)
-6.  SSL certs work in combination with browsers to verify that a site claiming to be secure is. Most would be used to seeing a small lock in the corner of your browser. This will only be shown when the browser has verified that the website claiming to be secure is. The SSL cert holds the information required for this fact to be verified.  
+3.  **PHP as CGI:**  
+    **Pro:** More secure than running mod_php. Allows for all scripts to be
+    handled by suExec and thus ran as the user who owns them.  
+    **Con:** It's slower than mod_php as before a script can run it must be
+    passed on to suExec, suExec performs it's own internal checkes and THEN
+    calls php to run the script
 
-    RedBrick creates their own SSL certs but these are not fully recognised as they are not signed by an offical cert authority.(4)
-7.  The script is call apachectl. `apachectl startssl` will start the webserver with ssl support.(4)
+    **PHP as module:**  
+    **Pro:** Faster than php as a CGI as the php can be run by the server using
+    the php module.  
+    **Con:** The lack of the handoff to suExec allowes for the script to be
+    executed as the web server user. The webserver has a higher security access
+    than a normal user as such exploited scripts could cause more harm.(4)
+
+4.  Virtual Hosts are a way for a single apache server to host websites for
+    multiple different domains. Each site can have its own access controls
+    ,error pages, etc.
+
+    RedBrick allows its members to host the websites belonging to their domains
+    on the RedBrick server giving those domains all the availability of
+    RedBricks services. The document root for vhosts on RedBrick is
+    /webtree/vhosts (4)
+
+5.  The function of suExec is to intercept web scripts, perform some checks, and
+    execute the script as the user who owns it. Doing this makes certain that an
+    exploited script only has the permission of the user who owns it and is less
+    of a danger to the server.
+
+    Yes suExec will complain. Part of the checks done is to make sure that both
+    the user and group match. In this case the user in now in the associat group
+    yet the scripts permissions are set to the member group. This will cause a
+    mismatch and will throw an internal server error (4)
+
+6.  SSL certs work in combination with browsers to verify that a site claiming
+    to be secure is. Most would be used to seeing a small lock in the corner of
+    your browser. This will only be shown when the browser has verified that the
+    website claiming to be secure is. The SSL cert holds the information
+    required for this fact to be verified.
+
+    RedBrick creates their own SSL certs but these are not fully recognised as
+    they are not signed by an offical cert authority.(4)
+
+7.  The script is call apachectl. `apachectl startssl` will start the webserver
+    with ssl support.(4)
 
 ## C: What do you wish of me Satan? (25)
 
 ## (Tomcat)
 
-1.  Tomcat is a webserver that can serve java servlets, jsp and also normal html.  
-    The minimum requirement to use tomcat is a context line in tomcats server.xml file (5)
-2.  It runs on port 8080\. Users are oblivious as attempts to access urls containing *.jsp or /servlet are redirected to 127.0.0.1:8080 by apache rewrite rules (5)
-3.  The problem is that tomcat runs as the jakarta user. PostgreSQL authenticates using ident as such the servlet is attempting to access their database using the jakarta username.  
-    The same issue is the reason the servlet cant write to the file. The jakarta user needs write access.  
-    The fixes are to ask an admin to give you a postgres password which you can hardcode into your servlet. Also either set the file you need to write to to 777 (not a good idea) or use an ACL to give jakarta write permission.(5)
-4.  Java servlets are standalone java class files where as jsp is java code thats embedded into a web page.(5)
+1.  Tomcat is a webserver that can serve java servlets, jsp and also normal
+    html.  
+    The minimum requirement to use tomcat is a context line in tomcats
+    server.xml file (5)
+2.  It runs on port 8080\. Users are oblivious as attempts to access urls
+    containing \*.jsp or /servlet are redirected to 127.0.0.1:8080 by apache
+    rewrite rules (5)
+3.  The problem is that tomcat runs as the jakarta user. PostgreSQL
+    authenticates using ident as such the servlet is attempting to access their
+    database using the jakarta username.  
+    The same issue is the reason the servlet cant write to the file. The jakarta
+    user needs write access.  
+    The fixes are to ask an admin to give you a postgres password which you can
+    hardcode into your servlet. Also either set the file you need to write to to
+    777 (not a good idea) or use an ACL to give jakarta write permission.(5)
+4.  Java servlets are standalone java class files where as jsp is java code
+    thats embedded into a web page.(5)
 5.  Command is `/etc/init.d/tomcat`  
-    Bad Gateway errors usually occur when tomcat has stalled or generally behaving like the spawn of satan that it is. It can be fixed by restarting tomcat.(5)
+    Bad Gateway errors usually occur when tomcat has stalled or generally
+    behaving like the spawn of satan that it is. It can be fixed by restarting
+    tomcat.(5)
 
 ## D: Help me I'm a CA3\. (25)
 
 ## (Scripting and other requests, a lesson in anger management)
 
-1.  The reply should be: Hello, I think you may be confused, javascript is run by your web browser, you can just include the javascript in your html code and it will work providing the browser supports it. However I think you may have been asking for java servlet access as such I have enabled it for you. If this is incorrect mail me back. Regards.
-2.  CGI stands for Common Gateway Interface. They are used to add dynamic content to a website.  
+1.  The reply should be: Hello, I think you may be confused, javascript is run
+    by your web browser, you can just include the javascript in your html code
+    and it will work providing the browser supports it. However I think you may
+    have been asking for java servlet access as such I have enabled it for you.
+    If this is incorrect mail me back. Regards.
+2.  CGI stands for Common Gateway Interface. They are used to add dynamic
+    content to a website.  
     PHP stands for PHP: Hypertext Processor.  
     Web script permission should be 700.  
     3 scripting languages we support are PHP, PERL and Shell (5)
 3.  The errors that stop it running are:  
     A missing ! in line 1  
     A missing ; after `date`  
-    The error that stops it running in a browser is that its missing a content type solved by adding the line  
-    `print "Content-Type:text/html\n\n";`before the $date line.
-4.  The rules are that the user must ask for committee approval as it falls under the reprovision of services standing order and if permission is granted it is usually requested that it be restricted to dcu users only.  
-    Your reply to the user should include the above rules and thus tell them to mail committee@redbrick.dcu.ie for approval(5)
+    The error that stops it running in a browser is that its missing a content
+    type solved by adding the line  
+    `print "Content-Type:text/html\n\n";`before the \$date line.
+4.  The rules are that the user must ask for committee approval as it falls
+    under the reprovision of services standing order and if permission is
+    granted it is usually requested that it be restricted to dcu users only.  
+    Your reply to the user should include the above rules and thus tell them to
+    mail committee@redbrick.dcu.ie for approval(5)
 5.  
      #!/usr/bin/perl
-
+    
           print "Content-type: text/html\n\n";
-
+    
           open (FILE,";
           close FILE;
-
+    
           ++$count;
           print "$count";
-
+    
           open (FILE,">hits");
           print FILE "$count\n";
           close FILE;
-
+    
          

 
     (5)
@@ -114,14 +186,24 @@ There are various ways to answer most questions. If the candidate explained the
     Prodigy = Solaris  
     Carbon/Deathray = Linux.  
     The priviliged port range are ports from 0 to 1024.  
-    Webmaster requires root to be able to start the webserver which binds to port 80 (5)
-2.  NFS stands for Network File System. It is used to spread data over multiple machines. Redbrick makes use of it to mount /home and /webtree on all primary machines.  
-    LDAP stands for LightWeight Directory Access Protocol. It is used for storing member information and login authentication Redbrick uses it to authenticate logins on all primary servers. (5)
-3.  Run `top` to get a full process list. Spot the process with the high cpu usage.  
-    Verify its not a valid high process by your own common sense or asking the user running it.  
-    If it's killing the server rapidly get it's PID number and type `kill -9 PID` to kill it.  
+    Webmaster requires root to be able to start the webserver which binds to
+    port 80 (5)
+2.  NFS stands for Network File System. It is used to spread data over multiple
+    machines. Redbrick makes use of it to mount /home and /webtree on all
+    primary machines.  
+    LDAP stands for LightWeight Directory Access Protocol. It is used for
+    storing member information and login authentication Redbrick uses it to
+    authenticate logins on all primary servers. (5)
+3.  Run `top` to get a full process list. Spot the process with the high cpu
+    usage.  
+    Verify its not a valid high process by your own common sense or asking the
+    user running it.  
+    If it's killing the server rapidly get it's PID number and type
+    `kill -9 PID` to kill it.  
     Inform the user involved they may have a dodgy program. (5)
-4.  The problem is that your friend is not a member of the root group a requirement to su. Yes they should try it from a console in the RedBrick server room :)
+4.  The problem is that your friend is not a member of the root group a
+    requirement to su. Yes they should try it from a console in the RedBrick
+    server room :)
 5.  You would use the `edquota` command.  
     To edit someones /webtree quota run `edquota username` on deathray.  
     To edit someones /home quota run `edquota username` on carbon.  
@@ -133,10 +215,18 @@ There are various ways to answer most questions. If the candidate explained the
 
 **Do either 1 OR 2.**
 
-1.  First thing you should do is deny access to the files. Thats the most important step make them unavailable immediately.  
-    Then respond to IRMA immediately apologising for the distribution of illegal material and that as much as we try we can't monitor all users pages constantly.Say they are no longer available and the user has been dealt with.  
-    Then contact the user tell them you recieved the complaint and in accordance with the Heanet AUP,our own codes of conduct and CSD regulations you have denied access to the files. Tell them they are not to distribute copyrighted material again. If they complain delete the files. If they continue, disuser.(25)
-2.  You need to install the apache server first and then add the php module.  
+1.  First thing you should do is deny access to the files. Thats the most
+    important step make them unavailable immediately.  
+    Then respond to IRMA immediately apologising for the distribution of illegal
+    material and that as much as we try we can't monitor all users pages
+    constantly.Say they are no longer available and the user has been dealt
+    with.  
+    Then contact the user tell them you recieved the complaint and in accordance
+    with the Heanet AUP,our own codes of conduct and CSD regulations you have
+    denied access to the files. Tell them they are not to distribute copyrighted
+    material again. If they complain delete the files. If they continue,
+    disuser.(25)
+2.  You need to install the apache server first and then add the php module.
 
     
tar xvzf apache.tar.gz
               cd apache
@@ -154,9 +244,14 @@ There are various ways to answer most questions. If the candidate explained the
               make install
        

 
-    Mod_php is generally needed if you have a large php application which is secure and not prone to exploitation, and you wish to harness the speed of doing the php processing at server level. Very useful for web boards or webmail systems.  
+    Mod_php is generally needed if you have a large php application which is
+    secure and not prone to exploitation, and you wish to harness the speed of
+    doing the php processing at server level. Very useful for web boards or
+    webmail systems.
 
-    Redbrick uses both php as cgi and php as a module :) Used as cgi on the primary webserver which the users can use and mod_php on the webmail server which has mod_userdir disabled. (25)
+    Redbrick uses both php as cgi and php as a module :) Used as cgi on the
+    primary webserver which the users can use and mod_php on the webmail server
+    which has mod_userdir disabled. (25)
 
 ## G: It cant be that easy? (5)
 
diff --git a/content/help/exams/webmaster-test-2004-agm.md b/content/help/exams/webmaster-test-2004-agm.md
new file mode 100644
index 0000000..932879d
--- /dev/null
+++ b/content/help/exams/webmaster-test-2004-agm.md
@@ -0,0 +1,154 @@
+---
+title: Webmaster test 2004 AGM
+---
+
+## Notes:
+
+---
+
+- All questions are relevant to performing the job of RedBricks webmaster.
+- I have left out asking questions about anything you wont learn till your
+  performing the job such as adding sql or user accounts.
+- Give a decent amount of information for all questions. i.e if the question is
+  "What is html?", the answer "A web language." doesnt cut it, an explanation is
+  needed.
+- All references to apache refer to apache2 installed from source.
+- You have 1 hour 15 minutes, Good Luck.
+
+---
+
+## A: So you wanna be head of webgroup? (25)
+
+## (General Web Knowledge)
+
+1.  What does CSS stand for and what are they used for? What is xhtml? (5)
+2.  What does SSI stand for ,what are they, and how are they used in the layout
+    of the redbrick website? (5)
+3.  Name 3 primary web browsers that you should aim to have your website render
+    correctly in. (5)
+4.  Name 3 duties of RedBricks webgroup and name 4 current members of the group.
+    (5)
+5.  What does ASP stand for, what are they and are they supported on RedBrick.
+    (5)
+
+## B: Ahoy there Lone Ranger, where's Tonto? (30)
+
+## (Apache)
+
+1.  You have the file apache1_3_9.tar.gz. What are the 4 commands necessary, in
+    correct order, so as to get the webserver extracted and installed with its
+    default options? Also what is the default port for a webserver. (5)
+2.  What does SSL stand for? What is SSL? What is the default port for an SSL
+    webserver. How does RedBrick make use of it? What is an option whilst
+    compiling apache that provides ssl support? (5)
+3.  What are the pros and cons of running php as a cgi and running php as an
+    apache module.Explain your answer well. (4)
+4.  What is a vhost and where is their document root directory located on
+    RedBrick. (4)
+5.  What is the function of SuExec? If a user had been converted from member to
+    associat but the files in their webspace were not modified, would SuExec
+    complain? Explain your answer. (4)
+6.  What is an SSL certificate and who provides RedBricks SSL certificate? (4)
+7.  What is the name of the script used to start, stop, or restart apache? How
+    would you use it to start apache with ssl support. (4)
+
+## C: What do you wish of me Satan? (25)
+
+## (Tomcat)
+
+1.  What is Tomcat and what is the main feature required for a user to be able
+    to make use of RedBricks tomcat server. (Asking the webmaster is not a valid
+    answer for the second part of that question :)) (5)
+2.  What port does Tomcat run on on RedBrick and why are users generally
+    obliviuos to this fact? (5)
+3.  A user emails you to say that they are having some issues with tomcat. They
+    have a servlet that is supposed to query data in their postgresql database
+    and also store servlet access infomation into a file in the users account.
+    They have checked their code and they know it is correct, yet when they run
+    their servlet in a browser they get an sql authentication failure and a
+    permission denied failure when trying to write to the file. Why are these
+    problems occuring and how can each problem be fixed? (5)
+4.  What is the primary difference between java servlets and jsp. (5)
+5.  What command would you use to start , stop, or restart tomcat? (full path)
+    Users contact you to report a "Bad Gateway" error, how would you fix it?(5)
+
+## D: Help me I'm a CA3\. (25)
+
+## (Scripting and other requests, a lesson in anger management)
+
+1.  The following email arrives from a user:
+
+    
Hi, Would it be possible to get JavaScript
+    access for my account please? Regards.

+
+    What would your reply be? (5)
+
+2.  What does CGI stand for and what are they used for? What does PHP stand for?
+    What should the permissions of web scripts be? Name 3 scripting languages a
+    web script can be written in on RedBrick? (5)
+3.  Their are 3 problems with the script below.2 prevent it from running at all
+    and 1 prevents it from running in a browser. All permissions are correct,
+    what are the 3 problems.
+
+    
   #/usr/bin/perl
+    
+       $date=`date`
+       print "Current date and time is: $date"; (5)
+       

+
+4.  A user contacts you and requests permission to run a web forum. What are the
+    rules regarding the running of a web forum on redbrick and what would your
+    reply to the user be. (5)
+5.  Write a simple website hit counter in any scripting language of your choice.
+    The counter must display the current site hits on screen. Normal text output
+    will do nothing fancy required :) (5)
+
+## E: I have the powerrrrrrrr!!!! (25)
+
+## (Root Skillz)
+
+1.  What operating systems are installed on Enigma,Prodigy,Carbon and Deathray?
+    What is the "privileged port range" on UNIX systems and why is it relevant
+    to webmaster having root? (5)
+2.  What do NFS and LDAP stand for and what are they? What does RedBrick use
+    them for? (5)
+3.  The load is climbing out of control and your the only root holder online.
+    You have a feeling a rogue users script may be causing the problem, explain
+    how you would go about tracking it down and sorting the problem, making sure
+    to write down all commands you used. (5)
+4.  You turn renegade and give the root password of carbon to a friend. Your
+    friend types su into their terminal and enters the password but is denied
+    access. What has gone wrong? Should they try it somewhere else? (5)
+5.  Someone asks for an increase of 100mb in their web directory quota, and 50mb
+    in their home directory quota. You grant the request for the increase, how
+    would you go about implementing the change? (5)
+
+## F: Cast your mind back to leaving cert english. (25)
+
+## (The infamous essay)
+
+**Do either 1 OR 2.**
+
+1.  You have just recieved an email from IRMA regarding copyrighted songs being
+    distributed from a users website. Explain the steps you would take and the
+    order in which you would take them to deal with the issue. Make references
+    to regulations where appropriate. (25)
+2.  You have the files apache.tar.gz and php.tar.gz. Outline the steps needed
+    (in correct order),to install the apache webserver with mod_php support into
+    /home/apache. Why would mod_php be needed on a webserver? What type of php
+    install does RedBrick have? (Other to the requirement of mod_php and an
+    install to /home/apache, you can assume you are using the standard settings
+    for apache and php) (25)
+
+## G: It cant be that easy? (5)
+
+## (Easy marks)
+
+1.  Which version of Apache is running on RedBricks web services machine? (1)
+2.  Which version of Tomcat is running on RedBricks web services machine? (1)
+3.  Which version of PHP is running on RedBricks web services machine? (1)
+4.  Which version of SquirrelMail is running on RedBricks web services machine?
+    (1)
+5.  What is the full path to the base directory of the primary Apache server,
+    the webmail Apache server, and the tomcat server on RedBricks web services
+    machine? Also what is the hostname of RedBricks web services machines? (1)
diff --git a/source/help/exams/webmaster-test-2009-agm/index.md b/content/help/exams/webmaster-test-2009-agm.md
similarity index 61%
rename from source/help/exams/webmaster-test-2009-agm/index.md
rename to content/help/exams/webmaster-test-2009-agm.md
index 1f0ac57..2ba3ff1 100644
--- a/source/help/exams/webmaster-test-2009-agm/index.md
+++ b/content/help/exams/webmaster-test-2009-agm.md
@@ -1,28 +1,43 @@
 ---
-title: 'Webmaster test 2009 AGM'
+title: Webmaster test 2009 AGM
 ---
 
-You have 45 minutes to complete this test. All sections are not marked equally - 30 marks go for HTML and PHP/scripting sections, 25 marks go to the apache section, and optionally 25 marks go to the root competency section.
+You have 45 minutes to complete this test. All sections are not marked equally -
+30 marks go for HTML and PHP/scripting sections, 25 marks go to the apache
+section, and optionally 25 marks go to the root competency section.
 
-**Note on the root section:** This section does not specifically test your ability as webmaster, but tests your root competency. As such, if you fail this section, the score will not count towards the overall test score, and all other questions will be marked out of 85 - you just won't be given root access. If you pass this section, however, it will positively affect your ability to carry out webmaster duties, and as such the entire test will be marked out of 110.
+**Note on the root section:** This section does not specifically test your
+ability as webmaster, but tests your root competency. As such, if you fail this
+section, the score will not count towards the overall test score, and all other
+questions will be marked out of 85 - you just won't be given root access. If you
+pass this section, however, it will positively affect your ability to carry out
+webmaster duties, and as such the entire test will be marked out of 110.
 
 ## HTML and other basics (30 marks)
 
-1\. You have a paragraph of text, and you want to set the background color to yellow (#ffff00) and the foreground colour to blue (#0000ff). Give the HTML and CSS you'd use to do this. (3 marks)
+1\. You have a paragraph of text, and you want to set the background color to
+yellow (#ffff00) and the foreground colour to blue (#0000ff). Give the HTML and
+CSS you'd use to do this. (3 marks)
 
-2\. What CSS would you use to set the colour of all links on a page to red (#ff0000)? For the last mark, how would you set them to turn grey (#888888) when you hold the mouse over them? (3 marks)
+2\. What CSS would you use to set the colour of all links on a page to red
+(#ff0000)? For the last mark, how would you set them to turn grey (#888888) when
+you hold the mouse over them? (3 marks)
 
 3\. How would you create a bulletpoint list? (2 marks)
 
 4\. Maketh me a table, with three rows and three cells in each row. (3 marks)
 
-5\. You have a div (with id="mydiv"). How would you give it a dark grey (#888888) background, white text and a black, 1 pixel border? (5 marks)
+5\. You have a div (with id="mydiv"). How would you give it a dark grey
+(#888888) background, white text and a black, 1 pixel border? (5 marks)
 
-6\. Show how you'd go about creating a two column layout on a page without using tables. (4 marks)
+6\. Show how you'd go about creating a two column layout on a page without using
+tables. (4 marks)
 
-7\. Tell me something you can do to make your site more accessible to screen readers. (4 marks)
+7\. Tell me something you can do to make your site more accessible to screen
+readers. (4 marks)
 
-8\. Why is using BMP format for images a bad idea on the internet? Give two formats that are well-suited to the internet. (3 marks)
+8\. Why is using BMP format for images a bad idea on the internet? Give two
+formats that are well-suited to the internet. (3 marks)
 
 9\. Name three major browsers you'd test your website in. (3 marks)
 
@@ -46,13 +61,17 @@ end if
 
 3\. Explain the difference between a for and a for each loop. (3 marks)
 
-4\. Show how you'd connect to a database, send an SQL query and read the first row of results. (6 marks)
+4\. Show how you'd connect to a database, send an SQL query and read the first
+row of results. (6 marks)
 
-5\. What is SQL injection? Name one check that you should carry out on input data to avoid it. (5 marks)
+5\. What is SQL injection? Name one check that you should carry out on input
+data to avoid it. (5 marks)
 
-6\. PHP encourages the programmer to dump all of their code and HTML into one file. Why is this a stupid idea? (4 marks)
+6\. PHP encourages the programmer to dump all of their code and HTML into one
+file. Why is this a stupid idea? (4 marks)
 
-7\. Briefly (in one line), what is MVC, and why is it the greatest thing in the history of hte universe? (3 marks)
+7\. Briefly (in one line), what is MVC, and why is it the greatest thing in the
+history of hte universe? (3 marks)
 
 ## Apache and its various dangly bits (25 marks)
 
@@ -60,15 +79,21 @@ end if
 
 2\. What's a DSO module, and how is it different to a static module? (4 marks)
 
-3\. Apache runs under a specific username, but it can somehow spawn processes to run PHP scripts under other peoples' usernames. Omghaex?! How does it do this? (5 marks)
+3\. Apache runs under a specific username, but it can somehow spawn processes to
+run PHP scripts under other peoples' usernames. Omghaex?! How does it do this?
+(5 marks)
 
-4\. What is SSL? What does SSL stand for? What is the default port for SSL requests? What apache module provides SSL support? (5 marks)
+4\. What is SSL? What does SSL stand for? What is the default port for SSL
+requests? What apache module provides SSL support? (5 marks)
 
-5\. Now that I think about it, what port does the rest of apache run on? (1 mark)
+5\. Now that I think about it, what port does the rest of apache run on? (1
+mark)
 
-6\. Give one way to restart the apache web server (there are many, any of them will do) (3 marks)
+6\. Give one way to restart the apache web server (there are many, any of them
+will do) (3 marks)
 
-7\. What does Tomcat do? (a three word answer will do, you're only getting one mark for it) (1 mark)
+7\. What does Tomcat do? (a three word answer will do, you're only getting one
+mark for it) (1 mark)
 
 ## So, you want to break my webserver? (25 optional marks)
 
@@ -93,17 +118,24 @@ but I can't log in. My password is 8h3iudn. Halp!?
 
 

 
-Point out the problems with this email. What would be your next steps, apart from beating them over the head? (3 marks)
+Point out the problems with this email. What would be your next steps, apart
+from beating them over the head? (3 marks)
 
 3\. What is NFS? What does Redbrick use it for? (3 marks)
 
 4\. What is LDAP? What is it used for? (3 marks)
 
-5\. Why should the Pubcookie configuration file never be world readable? (3 marks)
+5\. Why should the Pubcookie configuration file never be world readable? (3
+marks)
 
-6\. You're connecting to Redbrick from a public WiFi network. This is fine, because SSH will encrypt the hell out of your traffic, but ohno! You get an SSH host key warning! To your knowledge, nothing has changed with Redbrick's setup, and nothing has changed with your laptop. What could be going on? Is it safe to ignore this warning? What do you do? (5 marks)
+6\. You're connecting to Redbrick from a public WiFi network. This is fine,
+because SSH will encrypt the hell out of your traffic, but ohno! You get an SSH
+host key warning! To your knowledge, nothing has changed with Redbrick's setup,
+and nothing has changed with your laptop. What could be going on? Is it safe to
+ignore this warning? What do you do? (5 marks)
 
-7\. I can't think of any more questions, and I'm hungry. What does the apropos command do? (2 marks)
+7\. I can't think of any more questions, and I'm hungry. What does the apropos
+command do? (2 marks)
 
 8\. chmod u+s moo. What does this do? How can it be dangerous? (3 marks)
 
diff --git a/content/help/exams/webmaster-test-2013-egm.md b/content/help/exams/webmaster-test-2013-egm.md
new file mode 100644
index 0000000..3cad7af
--- /dev/null
+++ b/content/help/exams/webmaster-test-2013-egm.md
@@ -0,0 +1,137 @@
+---
+title: Webmaster test 2013 EGM
+---
+
+[ WEBMASTER EXAM 2013 ]
+
+Note on the root section: This section does not specifically test your ability
+as webmaster, but tests your root competency. As such, if you fail this section,
+the score will not count towards the overall test score, and all other questions
+will be marked out of 90 - you just won't be given root access. If you pass this
+section, however, it will positively affect your ability to carry out webmaster
+duties, and as such the entire test will be marked out of 130.
+
+## HTML and other basics (30 marks)
+
+1.  Create a simple web page with a box in the center. That is 200 x 200px. The
+    box must contain an image (random.png). (6 marks)
+2.  What does the following jquery code do? (2 marks)
+
+```
+
+```
+
+3.  Create a html form that sends a username and password to AccDetails.php (via
+    POST) (3 marks)
+4.  What is webkit? (2 marks)
+5.  Briefly explain what XML & JSON are and why they are used? (4 marks)
+6.  What is cross site scripting (Xss)? What are some of the risks? (3 marks)
+7.  Write Javascript/Jquery code to replace the content of the following

+
+```
+
 
 

+```
+
+with "OMGWTFDIV." (5 marks)
+
+8.  Create a simple 3 button menu of your choosing using either buttons/lists or
+    a table (5 marks)
+
+## Server Side Scripting (30 marks)
+
+1.  In a language of your choice, write a web script that receives the values
+    from the form in question 3 (HTML SECTION) above. Store them to a file. (10
+    marks)
+2.  Write an SQL query to do the following: (2 marks each)
+    - Create a table called "warez" with the following columns -> id,
+      what,where, who
+    - Insert an item of your choosing into this table
+    - Return all rows were the 'where' column is like "http://136.206.16"
+3.  Name 4 of the possible $key_name and associated $key_value you may find
+    outputted by the following PHP script? (This prints Environment variables)
+    (4 marks)
+
+```
+foreach($_SERVER as $key_name => $key_value) {
+	echo ''.$key_name.' => ' .$key_value."
";
+}
+```
+
+4.  What are some dangers/vulnerabilities in the following piece of code?
+    Provide solutions or simply explain how these could be prevented? (4 marks)
+
+```
+mysql_connect ("mysql.database", "webadmin","password");
+mysql_select_db ("userdb");
+
+$sql = mysql_query("select * from users where id = ".$_GET['id']);
+$info = mysql_fetch_array($sql);
+
+echo "
".$_GET['id']."
";
+var_dump($info);
+```
+
+5.  Briefly explain the components of an MVC Pattern? (3 marks)
+6.  What does the following PHP do? When would it be used? (3 marks)
+
+`header('Content-type: application/json');`
+
+## Apache & servers(30 marks)
+
+1.  You have created a vhost in /etc/apache2/sites-available/ How would you
+    enable it without restarting apache?(2 marks)
+2.  How would you restart apache2? (1 marks)
+3.  What is mod_rewrite? Give an example of when you would use it?(2 marks)
+4.  What is fastcgi? Why would you use it? (2 marks)
+5.  What do the following HTTP response codes signify? (1 marks each)
+    - 200
+    - 404
+    - 403
+    - 500
+6.  Where are the apache access logs normally stored? What kind of information
+    can you find here? (3 marks)
+7.  So the NSA eh? What is SSL? What does SSL stand for? What is the default
+    port for SSL requests? What apache module provides SSL support? (5 marks)
+8.  How can you check what apache modules are enabled? (3 marks)
+9.  What is SuExec? (3 marks)
+10. Name another web server? (1 marks)
+11. What is Bind used for? Where do you configure it? (2 marks)
+12. What is mod_userdir? (2 marks)
+
+## Root Section (40 marks)
+
+1.  Why should the Pubcookie configuration file never be world readable? (2
+    marks)
+2.  Where on Debian/Ubuntu would you find the network interface config file? (2
+    marks)
+3.  What is it important to do before and after updating any config file (1
+    mark)
+4.  What is chrootkit? (1 mark)
+5.  What does NFS stand for and what does RedBrick use it for? (2 marks)
+6.  What is LDAP? What is an LDIF? (2 marks)
+7.  What is Nagios? Where can you view it? (2 marks)
+8.  When is it necessary to use port-forwarding? How do you? (2 marks)
+9.  Munin, what is it? (1 mark)
+10. What ports are the following on? (4 marks)
+
+- ssh
+- imap
+- irc
+- ldap
+
+11. What is an IP KVM? Why is it a good thing to have? (2 marks)
+12. What is pf? (1 mark)
+13. How do you list all the processes for a single user? (1 mark)
+14. What are ulimits? (1 mark)
+15. What server are redbricks vm's hosted on? (1 mark)
+16. Name three files on Redbrick that should only be readable by root? (3 marks)
+17. How do you check the current kernel you are running? What os/version runs on
+    Mor

diff --git a/source/help/exams/webmaster-test-2014-agm/index.md b/content/help/exams/webmaster-test-2014-agm.md
similarity index 55%
rename from source/help/exams/webmaster-test-2014-agm/index.md
rename to content/help/exams/webmaster-test-2014-agm.md
index 05a46db..ec60426 100644
--- a/source/help/exams/webmaster-test-2014-agm/index.md
+++ b/content/help/exams/webmaster-test-2014-agm.md
@@ -1,144 +1,186 @@
 ---
-title: '2014 AGM Webmaster Exam'
+title: 2014 AGM Webmaster Exam
 ---
 
 # [WEBMASTER EXAM 2014]
 
-Note on the root section: This section does not specifically test your ability as webmaster, but tests your root competency. As such, if you fail this section, the score will not count towards the overall test score, and all other questions will be marked out of 90 - you just won't be given root access. If you pass this section, however, it will positively affect your ability to carry out webmaster duties, and as such the entire test will be marked out of 130.
+Note on the root section: This section does not specifically test your ability
+as webmaster, but tests your root competency. As such, if you fail this section,
+the score will not count towards the overall test score, and all other questions
+will be marked out of 90 - you just won't be given root access. If you pass this
+section, however, it will positively affect your ability to carry out webmaster
+duties, and as such the entire test will be marked out of 130.
 
-**TIP:** There will be attempt marks, don't get caught up if you're not sure about the specifics of something, make sure to write down what you think is right, if even just what your interpretation of the question is.
+**TIP:** There will be attempt marks, don't get caught up if you're not sure
+about the specifics of something, make sure to write down what you think is
+right, if even just what your interpretation of the question is.
 
 HTML and Other Basics (30 marks)  
-1.Create a simple menu with 3 div buttons that change colour when you hover over them. (5 marks)  
+1.Create a simple menu with 3 div buttons that change colour when you hover over
+them. (5 marks)
 
-2.Make them more stylish with a shadow or border or padding or something else cool. (3 marks)  
+2.Make them more stylish with a shadow or border or padding or something else
+cool. (3 marks)
 
-3.Create a simple html form, with the following inputs: username, hoodie colour(grey or black), size, amount (5 marks)  
+3.Create a simple html form, with the following inputs: username, hoodie
+colour(grey or black), size, amount (5 marks)
 
-4.What is the DOM? What does it do? (2 marks)  
+4.What is the DOM? What does it do? (2 marks)
 
 5.Name 3 javascript attributes any html entity can have, other than "onload".  
-For example `` would produce a javascript popup with 1 in it once the browser loads the iframe. (3 marks)  
+For example `` would produce a javascript
+popup with 1 in it once the browser loads the iframe. (3 marks)
 
-6.What is Ajax? Why use it? (2 marks)  
+6.What is Ajax? Why use it? (2 marks)
 
-7.Create a bullet point list, listing 3 reasons why you want to be webmaster.(3 marks)  
+7.Create a bullet point list, listing 3 reasons why you want to be webmaster.(3
+marks)
 
-8.What is xhtml? what is xml? (2 marks)  
+8.What is xhtml? what is xml? (2 marks)
 
-9.What are css3 transitions? (1 mark)  
+9.What are css3 transitions? (1 mark)
 
-10.What css would you use to round the corners of a div? explain it if you can't remember the exact syntax (1 mark)  
+10.What css would you use to round the corners of a div? explain it if you can't
+remember the exact syntax (1 mark)
 
-11.What are some of the benefits of using a PNG image over a BMP? (2 marks)  
+11.What are some of the benefits of using a PNG image over a BMP? (2 marks)
 
-12.Write jquery to slowly fade out a div of your liking (1 mark)  
+12.Write jquery to slowly fade out a div of your liking (1 mark)
 
 Server side scripting (30 marks)
 
-1\. In a language of your choice, write a web script that receives the values from the form in Q3 above.  
-Store them to a file and also print the values to the screen safely. (marks 11)  
+1\. In a language of your choice, write a web script that receives the values
+from the form in Q3 above.  
+Store them to a file and also print the values to the screen safely. (marks 11)
 
-2\. Create an SQL table called "hoodies" using appropriately named tables to store the data from the above form. (Q1 this section) (3 marks) 3\. Write the sql query to insert a row into this table. (marks 2)  
+2\. Create an SQL table called "hoodies" using appropriately named tables to
+store the data from the above form. (Q1 this section) (3 marks) 3\. Write the
+sql query to insert a row into this table. (marks 2)
 
-4\. Write an sql query to return all rows where the hoody colour is grey. (marks 2)  
+4\. Write an sql query to return all rows where the hoody colour is grey.
+(marks 2)
 
-5\. Perform any of these queries in a language of your choice and print all the data returned to the screen(2 marks)  
+5\. Perform any of these queries in a language of your choice and print all the
+data returned to the screen(2 marks)
 
-6\. What does the `$_SESSION` object do in php? (1 mark)  
+6\. What does the `$_SESSION` object do in php? (1 mark)
 
-7\. How would you dump or print the object of Environment variables in php? (1 mark)  
+7\. How would you dump or print the object of Environment variables in php? (1
+mark)
 
-8\. What is the risk of using eval($_POST['some']) or system_exec($_POST['blah']) (1 mark)  
+8\. What is the risk of using
+eval($\_POST['some']) or
+system_exec($\_POST['blah']) (1 mark)
 
-9\. How do you set headers in PHP? give an example of one and where you'd use it (2 marks)  
+9\. How do you set headers in PHP? give an example of one and where you'd use it
+(2 marks)
 
-10\. What is a CMS? What are the benefits of having one? (2 marks)  
+10\. What is a CMS? What are the benefits of having one? (2 marks)
 
-11\. What is Sql injection? (1 mark)  
+11\. What is Sql injection? (1 mark)
 
-12\. `phpinfo();` , name 2 different sections of information you might find here? (2 marks)  
+12\. `phpinfo();` , name 2 different sections of information you might find
+here? (2 marks)
 
 Apache & servers (30 marks)
 
-1\. What sort of information would you find in a vhost file, located in /etc/apache2/sites-enabled/ (2 marks)  
+1\. What sort of information would you find in a vhost file, located in
+/etc/apache2/sites-enabled/ (2 marks)
 
-2\. Where are the apache logs usually stored? How do you find the errors log? (2 mark)  
+2\. Where are the apache logs usually stored? How do you find the errors log? (2
+mark)
 
-3\. How would you reload the apache config without a restart? (2 marks)  
+3\. How would you reload the apache config without a restart? (2 marks)
 
-4\. A site has been hacked, someone uploaded a web shell, what do you do? (3 marks)  
+4\. A site has been hacked, someone uploaded a web shell, what do you do? (3
+marks)
 
-5\. What information can you find in the log files normally? (2 marks)  
+5\. What information can you find in the log files normally? (2 marks)
 
-6\. What is SSL? What does SSL stand for? What is the default port for SSL requests? What apache module provides SSL support? (4 marks)  
+6\. What is SSL? What does SSL stand for? What is the default port for SSL
+requests? What apache module provides SSL support? (4 marks)
 
-7\. What is SuExec? (3 marks)  
+7\. What is SuExec? (3 marks)
 
-8\. What does "rndc reload" do? (1 mark)  
+8\. What does "rndc reload" do? (1 mark)
 
-9\. Where can you normally find the dns zone files? What is bind? (2 mark)  
+9\. Where can you normally find the dns zone files? What is bind? (2 mark)
 
-10\. What is a .htaccess file and name some related htaccess directives it can use? (3 marks)  
+10\. What is a .htaccess file and name some related htaccess directives it can
+use? (3 marks)
 
-11\. What is mod_rewrite? (2 marks)  
+11\. What is mod_rewrite? (2 marks)
 
-12\. Give a description of how you think redbricks /webtree/ works (2 marks)  
+12\. Give a description of how you think redbricks /webtree/ works (2 marks)
 
-13\. What is LAMP and have you ever installed it before? Why does redbrick love LAMP? (2 marks)  
+13\. What is LAMP and have you ever installed it before? Why does redbrick love
+LAMP? (2 marks)
 
 ![](http://www.redbrick.dcu.ie/~mak/lamp.png)
 
 Root section (40 marks)
 
-1.Where on Debian/Ubuntu would you find the network interface config file? (2 marks)  
+1.Where on Debian/Ubuntu would you find the network interface config file? (2
+marks)
 
-2.What is NFS? What are the potential limitations if a webservers docroot is hosted over NFS? (2 marks)  
+2.What is NFS? What are the potential limitations if a webservers docroot is
+hosted over NFS? (2 marks)
 
-3.What is nagios, what does it do? (2 marks)  
+3.What is nagios, what does it do? (2 marks)
 
-4.A user complains that whenever they visit their php script a 500 error is returned.  
-Upon further inspection you notice the script in question has the following file permissions -  
+4.A user complains that whenever they visit their php script a 500 error is
+returned.  
+Upon further inspection you notice the script in question has the following file
+permissions -  
 **(-rwxrw---- 1 vadimck committe 0 2014-03-25 17:25 test.php)**  
-What is wrong with these file permissions? Why does this result in a 500 error when loaded and  
-explain why such a system is important in a multiuser environment.(4 marks)  
+What is wrong with these file permissions? Why does this result in a 500 error
+when loaded and  
+explain why such a system is important in a multiuser environment.(4 marks)
 
-5.What is a VLAN? Redbrick's setup makes use of three physical networks one of which is spanned across  
-two phyical locations. How might VLANs help in this situation? (2 marks)  
+5.What is a VLAN? Redbrick's setup makes use of three physical networks one of
+which is spanned across  
+two phyical locations. How might VLANs help in this situation? (2 marks)
 
-6.What is a DRAC? (1 mark)  
+6.What is a DRAC? (1 mark)
 
-7\. What's RCS? Why is it useful? (2 marks)  
+7\. What's RCS? Why is it useful? (2 marks)
 
-8\. What do these stand for and what are they used for? (8 marks)  
+8\. What do these stand for and what are they used for? (8 marks)
 
 1.  KVM
 2.  LDAP
 3.  IPPDU
 4.  UPS
 
-9\. You have to reboot the primary login server (azazel) to apply kernel security updates.  
-What command would you type to print a warning message to all currently logged in user's terminals? (2 marks)  
+9\. You have to reboot the primary login server (azazel) to apply kernel
+security updates.  
+What command would you type to print a warning message to all currently logged
+in user's terminals? (2 marks)
 
-10.What command would you use to view ports in use and the processes using them? (1 mark)  
+10.What command would you use to view ports in use and the processes using them?
+(1 mark)
 
-11."You have just changed your shell's profile file. You want to test that all changes load and take effect successfully,  
-to do this you need to launch a new login shell. What command would you issue to do this? (1 mark)  
+11."You have just changed your shell's profile file. You want to test that all
+changes load and take effect successfully,  
+to do this you need to launch a new login shell. What command would you issue to
+do this? (1 mark)
 
-12.What is munin? what does it do? (2 marks)  
+12.What is munin? what does it do? (2 marks)
 
-13.What does fail2ban do? (1 mark)  
+13.What does fail2ban do? (1 mark)
 
-14.What information will you find in /proc/ and /etc/ (2 marks)  
+14.What information will you find in /proc/ and /etc/ (2 marks)
 
-15\. What are 2 benefits of SAS over SATA? (2 mark)  
+15\. What are 2 benefits of SAS over SATA? (2 mark)
 
 16\. What does DNS do? What port does it work on? Name a tool to query DNS?  
-What must you update when you make a change to zone file? (4 marks)  
+What must you update when you make a change to zone file? (4 marks)
 
-17\. You decide to visit "The Girls" in the server room. The airconditioning unit has failed,  
-things start to get hot and sweaty. What do you do? (2 marks)  
+17\. You decide to visit "The Girls" in the server room. The airconditioning
+unit has failed,  
+things start to get hot and sweaty. What do you do? (2 marks)
 
-18\. What does logrotate do? what is the major benefit of it? (1 mark)  
+18\. What does logrotate do? what is the major benefit of it? (1 mark)
 
-19\. You are a webmaster, you have root, what do you plan to bring to the table, what will you not do (1 mark)
+19\. You are a webmaster, you have root, what do you plan to bring to the table,
+what will you not do (1 mark)
diff --git a/source/help/helpdesk.jpg b/content/help/helpdesk.jpg
similarity index 100%
rename from source/help/helpdesk.jpg
rename to content/help/helpdesk.jpg
diff --git a/source/help/joining/index.md b/content/help/joining/_index.md
similarity index 51%
rename from source/help/joining/index.md
rename to content/help/joining/_index.md
index 48f3528..23f2308 100644
--- a/source/help/joining/index.md
+++ b/content/help/joining/_index.md
@@ -1,22 +1,24 @@
 ---
-title: Joining
-date: 2016-04-17 16:15:35
-type: help
 banner: join.jpg
+date: '2016-04-17 16:15:35'
 keywords:
   - join
   - help
+title: Joining
+type: page
 ---
 
 Joining Redbrick is easy.
 
 ## What is Redbrick?
 
-That's a good question! Redbrick is DCU's Computer Networking Society. Want to know more? Try our [about page!](/about)
+That's a good question! Redbrick is DCU's Computer Networking Society. Want to
+know more? Try our [about page!](/about)
 
 ## Who can join Redbrick?
 
-Membership is open to all past and present students and staff of Dublin City University, and St. Pat's, Drumcondra.
+Membership is open to all past and present students and staff of Dublin City
+University, and St. Pat's, Drumcondra.
 
 ## How much does it cost?
 
@@ -26,31 +28,37 @@ Membership is open to all past and present students and staff of Dublin City Uni
 
 ## What username can I have?
 
-Almost anything you want - providing the username is available and no more than eight characters in length!
+Almost anything you want - providing the username is available and no more than
+eight characters in length!
 
 ## How can I pay?
 
-Visit our stand on Clubs & Societies day in the first couple of weeks of either semester.
-Bank transfer or lodgement - see below for our bank details.
-PayPal - see below for our PayPal payment form. This is the fastest way to join or renew your membership!
-If all else fails, you can arrange to meet a Committee member on-campus.
+Visit our stand on Clubs & Societies day in the first couple of weeks of either
+semester. Bank transfer or lodgement - see below for our bank details. PayPal -
+see below for our PayPal payment form. This is the fastest way to join or renew
+your membership! If all else fails, you can arrange to meet a Committee member
+on-campus.
 
 ## Help
 
-If you have any difficulty, please Email [Treasurer](mailto:treasurer@redbrick.dcu.ie).
-If you have any other issues, please Email [Admins](mailto:admins@redbrick.dcu.ie).
+If you have any difficulty, please Email
+[Treasurer](mailto:treasurer@redbrick.dcu.ie). If you have any other issues,
+please Email [Admins](mailto:admins@redbrick.dcu.ie).
 
 ## Pay By PayPal
 
 Please send an Email to [Admins](mailto:admins@redbrick.dcu.ie) with:
-  - Your transaction ID.
-  - Your __Redbrick username__.
-  - If you are a new user, we __require__ your DCU student / staff ID number.
 
-{% paypal %}
+- Your transaction ID.
+- Your **Redbrick username**.
+- If you are a new user, we **require** your DCU student / staff ID number.
+
+{{< paypal >}}
 
 ## Pay by bank transfer / lodgement
-Please contact the [Treasurer](mailto:treasurer@redbrick.dcu.ie) to make arrangements to pay via bank transfer.
+
+Please contact the [Treasurer](mailto:treasurer@redbrick.dcu.ie) to make
+arrangements to pay via bank transfer.
 
 ```
 a/c name: DCU Redbrick Society
diff --git a/source/help/joining/join.jpg b/content/help/joining/join.jpg
similarity index 100%
rename from source/help/joining/join.jpg
rename to content/help/joining/join.jpg
diff --git a/content/help/services/_index.md b/content/help/services/_index.md
new file mode 100644
index 0000000..e86d79a
--- /dev/null
+++ b/content/help/services/_index.md
@@ -0,0 +1,140 @@
+---
+banner: services.jpg
+title: Services
+---
+
+Redbrick offers a great range of services to our members, and we are always
+looking for more to offer. If you have any ideas, feel free to mail us with your
+suggestions.
+
+Since 1996, we have been providing people with an excellent, powerful and
+flexible UNIX environment. We have used Solaris, Linux and FreeBSD, some more
+than others.
+
+First off, we give you 2GB of disk space by default - having somewhere online to
+store files and mail is essential these days, especially if you log on from a
+wide range of locations. We also provide you with your own Email account, and a
+great range of clients to read/write it with! Procmail and other mail filtering
+software is installed, so if you feel like it, you can heavily customise mail
+folders and really make the most of your mail account.
+
+If you're feeling conversational and want to spread the love, you can use hey,
+an instant message program that lets you send messages to other users. You can
+also use the UNIX talk service for some one-on-one action. Our very own IRC
+server is great for meeting new people online, having group discussions, or just
+blabbing to the general Redbrick populace about your latest grievance.
+
+Many people love to code, you can log on to Pygmalion, our development server,
+which has every compiler under the sun installed, and if you find we don't have
+the one that you need, let us know and we will try help you out. You should
+always back up your code. What better way to do this than with a distributed
+source code management system. We have git installed on Redbrick so have a look
+[here](https://wiki.redbrick.dcu.ie/mw/Git) at how to get started, and check out
+[Redbrick Git](https://git.redbrick.dcu.ie/) for free git hosting!
+
+You can read more about the various services we offer in their respective
+sections:
+
+## Wiki
+
+Login and edit wiki.redbrick.dcu.ie as you learn. The Redbrick Wiki was made by
+users for users. In turn, it is to be maintained by users, so if you find any
+information out of date, feel free to update it. The wiki is all encompassing in
+relation to all things Redbrick, it's pretty much our "How To Redbrick" guide.
+Login, edit and learn to your heart's content!
+
+## Mail
+
+Once you have your username and password you can use the webmail service we
+offer on Redbrick. Mail from your Redbrick address auto goes to your DCU email.
+This can stop by typing `forward off` in terminal on Redbrick, but we don't know
+why you'd want to do a thing like that. Read more about webmail
+[here](https://wiki.redbrick.dcu.ie/mw/Webmail).
+
+## Hosting
+
+We currently offer 2 different types of web hosting:
+
+- http://[username].redbrick.dcu.ie/ - user vhosting is our default hosting, if
+  you like, you can also have your site accessible, at
+  [something].redbrick.dcu.ie, usually your username. All you have to do is
+  Email the webmaster and ask.
+- http://www.something.com/ - full vhosting, members can also have full virtual
+  hosts on redbrick, where the hostname is that of a domain you own, all you
+  have to do is Email the Webmaster and get your DNS provider to point the
+  domain at our IP address. We also ask that users who have virtual hosts link
+  their site to our homepage.
+
+## Coding
+
+Redbrick is a great place to learn or use a vast range of programming languages,
+we have compilers, interpreters and libraries for:
+
+- Java
+- C++/C
+- Assembly
+- Perl
+- Python
+- PHP
+- Ruby
+- Shell
+- Haskell
+- Objective C
+- NodeJs
+- Go
+
+We also have various frameworks
+
+- Cherrypy
+- Django
+
+## Databases
+
+We currently offer 3 different database accounts:
+
+- MySQL- cutting edge, multi-tasking easy-to-use popular database engine.
+- PostgreSQL - enterprise-level production quality and highly stable with
+  extended and advanced SQL support.
+- SQLite - it's lite?
+
+Email Admins for a database account.
+
+## HackMD
+
+Redbrick hosts HackMD, a multiplatform collaborative markdown note editor which
+allows the creation of collaborative markdown notes in your browser.
+
+As you write, you can view the changes you make in HackMD’s split screen view.
+Needless to say, it works very uniquely, all you have to do is to write an
+article over there and if you need any corrections or additions from your peers,
+then you can send them that article’s web URL and they can edit and rewrite it
+as they see fit.
+
+Check out HackMD at [md.redbrick.dcu.ie](https://md.redbrick.dcu.ie).
+
+## Mastodon
+
+Mastodon is a federated social network which shares similarities with Twitter,
+but differs from Twitter in how it is administrated as a decentralized
+federation of servers running open source software. Basically Mastodon takes the
+best parts from Twitter, and then it does it a little better.
+
+The distributed, open-source platform offers better tools for privacy and
+fighting harassment than Twitter offers, but coupled with this is a steep
+learning curve. Mastodon’s federated nature means there’s no single website to
+use, and learning how to sift through its timeline of toots can take some time.
+
+If you miss "the old Twitter”, i.e the days of purely chronological timelines
+and no ads, Mastodon is perfect for you! You can find Mastodon hosted on
+Redbrick at [mastodon.redbrick.dcu.ie](https://mastodon.redbrick.dcu.ie).
+
+## Hastebin
+
+Ever hear of a pastebin? It's just like that, except you're in a hurry! Hastebin
+is a service we host for storing and sharing text and code snippets with your
+peers.
+
+Paste your code, markdown or whatever you feel like pasting into the provided
+space. After that, just save it, get your link and then share it!
+
+Try out Hastebin at [paste.redbrick.dcu.ie](https://paste.redbrick.dcu.ie).
diff --git a/source/help/services/services.jpg b/content/help/services/services.jpg
similarity index 100%
rename from source/help/services/services.jpg
rename to content/help/services/services.jpg
diff --git a/source/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.pdf b/content/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.pdf
similarity index 100%
rename from source/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.pdf
rename to content/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.pdf
diff --git a/source/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.png b/content/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.png
similarity index 100%
rename from source/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.png
rename to content/help/tutorials/AdvancedJavaScript/Advanced_JavaScript.png
diff --git a/content/help/tutorials/AdvancedJavaScript/_index.md b/content/help/tutorials/AdvancedJavaScript/_index.md
new file mode 100644
index 0000000..24aedb3
--- /dev/null
+++ b/content/help/tutorials/AdvancedJavaScript/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Advanced JavaScript
+---
+
+{{< back_button >}} {{< pdf src="./Advanced_JavaScript.pdf" >}}
diff --git a/source/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.pdf b/content/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.pdf
similarity index 100%
rename from source/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.pdf
rename to content/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.pdf
diff --git a/source/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.png b/content/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.png
similarity index 100%
rename from source/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.png
rename to content/help/tutorials/HowToMakeAWebserver/HowToMakeAWebserver.png
diff --git a/content/help/tutorials/HowToMakeAWebserver/_index.md b/content/help/tutorials/HowToMakeAWebserver/_index.md
new file mode 100644
index 0000000..340365d
--- /dev/null
+++ b/content/help/tutorials/HowToMakeAWebserver/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2017-02-15 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: How to build your own webserver
+---
+
+{{< back_button >}} {{< pdf src="./HowToMakeAWebserver.pdf" >}}
diff --git a/source/help/tutorials/IntroToBash/IntroToBash.pdf b/content/help/tutorials/IntroToBash/IntroToBash.pdf
similarity index 100%
rename from source/help/tutorials/IntroToBash/IntroToBash.pdf
rename to content/help/tutorials/IntroToBash/IntroToBash.pdf
diff --git a/source/help/tutorials/IntroToBash/IntroToBash.png b/content/help/tutorials/IntroToBash/IntroToBash.png
similarity index 100%
rename from source/help/tutorials/IntroToBash/IntroToBash.png
rename to content/help/tutorials/IntroToBash/IntroToBash.png
diff --git a/content/help/tutorials/IntroToBash/_index.md b/content/help/tutorials/IntroToBash/_index.md
new file mode 100644
index 0000000..9befc43
--- /dev/null
+++ b/content/help/tutorials/IntroToBash/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Bash
+---
+
+{{< back_button >}} {{< pdf src="./IntroToBash.pdf" >}}
diff --git a/source/help/tutorials/IntroToGit/IntroToGit.pdf b/content/help/tutorials/IntroToGit/IntroToGit.pdf
similarity index 100%
rename from source/help/tutorials/IntroToGit/IntroToGit.pdf
rename to content/help/tutorials/IntroToGit/IntroToGit.pdf
diff --git a/source/help/tutorials/IntroToGit/IntroToGit.png b/content/help/tutorials/IntroToGit/IntroToGit.png
similarity index 100%
rename from source/help/tutorials/IntroToGit/IntroToGit.png
rename to content/help/tutorials/IntroToGit/IntroToGit.png
diff --git a/content/help/tutorials/IntroToGit/_index.md b/content/help/tutorials/IntroToGit/_index.md
new file mode 100644
index 0000000..5c476de
--- /dev/null
+++ b/content/help/tutorials/IntroToGit/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Git
+---
+
+{{< back_button >}} {{< pdf src="./IntroToGit.pdf" >}}
diff --git a/source/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.pdf b/content/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.pdf
similarity index 100%
rename from source/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.pdf
rename to content/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.pdf
diff --git a/source/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.png b/content/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.png
similarity index 100%
rename from source/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.png
rename to content/help/tutorials/IntroToHTMLCSS/IntroToHTMLCSS.png
diff --git a/content/help/tutorials/IntroToHTMLCSS/_index.md b/content/help/tutorials/IntroToHTMLCSS/_index.md
new file mode 100644
index 0000000..bbbac3f
--- /dev/null
+++ b/content/help/tutorials/IntroToHTMLCSS/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To HTML & CSS
+---
+
+{{< back_button >}} {{< pdf src="./IntroToHTMLCSS.pdf" >}}
diff --git a/source/help/tutorials/IntroToLinux/IntroToLinux.pdf b/content/help/tutorials/IntroToLinux/IntroToLinux.pdf
similarity index 100%
rename from source/help/tutorials/IntroToLinux/IntroToLinux.pdf
rename to content/help/tutorials/IntroToLinux/IntroToLinux.pdf
diff --git a/source/help/tutorials/IntroToLinux/IntroToLinux.png b/content/help/tutorials/IntroToLinux/IntroToLinux.png
similarity index 100%
rename from source/help/tutorials/IntroToLinux/IntroToLinux.png
rename to content/help/tutorials/IntroToLinux/IntroToLinux.png
diff --git a/content/help/tutorials/IntroToLinux/_index.md b/content/help/tutorials/IntroToLinux/_index.md
new file mode 100644
index 0000000..a54152b
--- /dev/null
+++ b/content/help/tutorials/IntroToLinux/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Linux
+---
+
+{{< back_button >}} {{< pdf src="./IntroToLinux.pdf" >}}
diff --git a/source/help/tutorials/IntroToRedbrick/IntroToRedbrick.pdf b/content/help/tutorials/IntroToRedbrick/IntroToRedbrick.pdf
similarity index 100%
rename from source/help/tutorials/IntroToRedbrick/IntroToRedbrick.pdf
rename to content/help/tutorials/IntroToRedbrick/IntroToRedbrick.pdf
diff --git a/source/help/tutorials/IntroToRedbrick/IntroToRedbrick.png b/content/help/tutorials/IntroToRedbrick/IntroToRedbrick.png
similarity index 100%
rename from source/help/tutorials/IntroToRedbrick/IntroToRedbrick.png
rename to content/help/tutorials/IntroToRedbrick/IntroToRedbrick.png
diff --git a/content/help/tutorials/IntroToRedbrick/_index.md b/content/help/tutorials/IntroToRedbrick/_index.md
new file mode 100644
index 0000000..e9a7f49
--- /dev/null
+++ b/content/help/tutorials/IntroToRedbrick/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2017-09-30 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Redbrick
+---
+
+{{< back_button >}} {{< pdf src="./IntroToRedbrick.pdf" >}}
diff --git a/source/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.pdf b/content/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.pdf
similarity index 100%
rename from source/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.pdf
rename to content/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.pdf
diff --git a/source/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.png b/content/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.png
similarity index 100%
rename from source/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.png
rename to content/help/tutorials/IntroToRedbrick2018/IntroToRedbrick2018.png
diff --git a/content/help/tutorials/IntroToRedbrick2018/_index.md b/content/help/tutorials/IntroToRedbrick2018/_index.md
new file mode 100644
index 0000000..464f52f
--- /dev/null
+++ b/content/help/tutorials/IntroToRedbrick2018/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2018-10-04 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Redbrick 2018
+---
+
+{{< back_button >}} {{< pdf src="./IntroToRedbrick2018.pdf" >}}
diff --git a/source/help/tutorials/Intro_to_Bash/Intro_to_Bash.pdf b/content/help/tutorials/Intro_to_Bash/Intro_to_Bash.pdf
similarity index 100%
rename from source/help/tutorials/Intro_to_Bash/Intro_to_Bash.pdf
rename to content/help/tutorials/Intro_to_Bash/Intro_to_Bash.pdf
diff --git a/source/help/tutorials/Intro_to_Bash/Intro_to_Bash.png b/content/help/tutorials/Intro_to_Bash/Intro_to_Bash.png
similarity index 100%
rename from source/help/tutorials/Intro_to_Bash/Intro_to_Bash.png
rename to content/help/tutorials/Intro_to_Bash/Intro_to_Bash.png
diff --git a/content/help/tutorials/Intro_to_Bash/_index.md b/content/help/tutorials/Intro_to_Bash/_index.md
new file mode 100644
index 0000000..06a4982
--- /dev/null
+++ b/content/help/tutorials/Intro_to_Bash/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Bash
+---
+
+{{< back_button >}} {{< pdf src="./Intro_To_Bash.pdf" >}}
diff --git a/source/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.pdf b/content/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.pdf
similarity index 100%
rename from source/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.pdf
rename to content/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.pdf
diff --git a/source/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.png b/content/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.png
similarity index 100%
rename from source/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.png
rename to content/help/tutorials/Intro_to_HTMLCSS/Intro_to_HTMLCSS.png
diff --git a/content/help/tutorials/Intro_to_HTMLCSS/_index.md b/content/help/tutorials/Intro_to_HTMLCSS/_index.md
new file mode 100644
index 0000000..5a3ca40
--- /dev/null
+++ b/content/help/tutorials/Intro_to_HTMLCSS/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To HTML & CSS
+---
+
+{{< back_button >}} {{< pdf src="./Intro_to_HTMLCSS.pdf" >}}
diff --git a/source/help/tutorials/Intro_to_Linux/Intro_to_Linux.pdf b/content/help/tutorials/Intro_to_Linux/Intro_to_Linux.pdf
similarity index 100%
rename from source/help/tutorials/Intro_to_Linux/Intro_to_Linux.pdf
rename to content/help/tutorials/Intro_to_Linux/Intro_to_Linux.pdf
diff --git a/source/help/tutorials/Intro_to_Linux/Intro_to_Linux.png b/content/help/tutorials/Intro_to_Linux/Intro_to_Linux.png
similarity index 100%
rename from source/help/tutorials/Intro_to_Linux/Intro_to_Linux.png
rename to content/help/tutorials/Intro_to_Linux/Intro_to_Linux.png
diff --git a/content/help/tutorials/Intro_to_Linux/_index.md b/content/help/tutorials/Intro_to_Linux/_index.md
new file mode 100644
index 0000000..044f941
--- /dev/null
+++ b/content/help/tutorials/Intro_to_Linux/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro To Linux
+---
+
+{{< back_button >}} {{< pdf src="./Intro_To_Linux.pdf" >}}
diff --git a/source/help/tutorials/IntrotoJS/IntrotoJS.pdf b/content/help/tutorials/IntrotoJS/IntrotoJS.pdf
similarity index 100%
rename from source/help/tutorials/IntrotoJS/IntrotoJS.pdf
rename to content/help/tutorials/IntrotoJS/IntrotoJS.pdf
diff --git a/source/help/tutorials/IntrotoJS/IntrotoJS.png b/content/help/tutorials/IntrotoJS/IntrotoJS.png
similarity index 100%
rename from source/help/tutorials/IntrotoJS/IntrotoJS.png
rename to content/help/tutorials/IntrotoJS/IntrotoJS.png
diff --git a/content/help/tutorials/IntrotoJS/_index.md b/content/help/tutorials/IntrotoJS/_index.md
new file mode 100644
index 0000000..fed349d
--- /dev/null
+++ b/content/help/tutorials/IntrotoJS/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Intro to JS
+---
+
+{{< back_button >}} {{< pdf src="./IntrotoJS.pdf" >}}
diff --git a/source/help/tutorials/Jargon_buster/Jargon_buster.pdf b/content/help/tutorials/Jargon_buster/Jargon_buster.pdf
similarity index 100%
rename from source/help/tutorials/Jargon_buster/Jargon_buster.pdf
rename to content/help/tutorials/Jargon_buster/Jargon_buster.pdf
diff --git a/source/help/tutorials/Jargon_buster/Jargon_buster.png b/content/help/tutorials/Jargon_buster/Jargon_buster.png
similarity index 100%
rename from source/help/tutorials/Jargon_buster/Jargon_buster.png
rename to content/help/tutorials/Jargon_buster/Jargon_buster.png
diff --git a/content/help/tutorials/Jargon_buster/_index.md b/content/help/tutorials/Jargon_buster/_index.md
new file mode 100644
index 0000000..0fee468
--- /dev/null
+++ b/content/help/tutorials/Jargon_buster/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Jargon buster
+---
+
+{{< back_button >}} {{< pdf src="./Jargon_buster.pdf" >}}
diff --git a/source/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.jpg b/content/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.jpg
similarity index 100%
rename from source/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.jpg
rename to content/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.jpg
diff --git a/source/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.pdf b/content/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.pdf
similarity index 100%
rename from source/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.pdf
rename to content/help/tutorials/PhishingAndScams/How_not_to_conduct_yourself_on_social_media.pdf
diff --git a/content/help/tutorials/PhishingAndScams/_index.md b/content/help/tutorials/PhishingAndScams/_index.md
new file mode 100644
index 0000000..d17c233
--- /dev/null
+++ b/content/help/tutorials/PhishingAndScams/_index.md
@@ -0,0 +1,13 @@
+---
+date: '2017-02-08 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+  - scams
+  - phishing
+title: How not to conduct yourself online
+---
+
+{{< back_button >}}
+{{< pdf src="./How_not_to_conduct_yourself_on_social_media.pdf" >}}
diff --git a/source/help/tutorials/RetroPie/RetroPie.pdf b/content/help/tutorials/RetroPie/RetroPie.pdf
similarity index 100%
rename from source/help/tutorials/RetroPie/RetroPie.pdf
rename to content/help/tutorials/RetroPie/RetroPie.pdf
diff --git a/source/help/tutorials/RetroPie/RetroPie.png b/content/help/tutorials/RetroPie/RetroPie.png
similarity index 100%
rename from source/help/tutorials/RetroPie/RetroPie.png
rename to content/help/tutorials/RetroPie/RetroPie.png
diff --git a/content/help/tutorials/RetroPie/_index.md b/content/help/tutorials/RetroPie/_index.md
new file mode 100644
index 0000000..7009d7d
--- /dev/null
+++ b/content/help/tutorials/RetroPie/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: RetroPie
+---
+
+{{< back_button >}} {{< pdf src="./RetroPie.pdf" >}}
diff --git a/source/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.pdf b/content/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.pdf
similarity index 100%
rename from source/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.pdf
rename to content/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.pdf
diff --git a/source/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.png b/content/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.png
similarity index 100%
rename from source/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.png
rename to content/help/tutorials/SettingUpDevEnv/HowToSetUpYourDevSpace.png
diff --git a/content/help/tutorials/SettingUpDevEnv/_index.md b/content/help/tutorials/SettingUpDevEnv/_index.md
new file mode 100644
index 0000000..2ee0ee5
--- /dev/null
+++ b/content/help/tutorials/SettingUpDevEnv/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2017-10-04 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Setting up a Dev Environment
+---
+
+{{< back_button >}} {{< pdf src="./HowToSetUpYourDevSpace.pdf" >}}
diff --git a/source/help/tutorials/Wordpress/Wordpress.pdf b/content/help/tutorials/Wordpress/Wordpress.pdf
similarity index 100%
rename from source/help/tutorials/Wordpress/Wordpress.pdf
rename to content/help/tutorials/Wordpress/Wordpress.pdf
diff --git a/source/help/tutorials/Wordpress/Wordpress.png b/content/help/tutorials/Wordpress/Wordpress.png
similarity index 100%
rename from source/help/tutorials/Wordpress/Wordpress.png
rename to content/help/tutorials/Wordpress/Wordpress.png
diff --git a/content/help/tutorials/Wordpress/_index.md b/content/help/tutorials/Wordpress/_index.md
new file mode 100644
index 0000000..3ca8a45
--- /dev/null
+++ b/content/help/tutorials/Wordpress/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Wordpress
+---
+
+{{< back_button >}} {{< pdf src="./Wordpress.pdf" >}}
diff --git a/source/help/tutorials/index.md b/content/help/tutorials/_index.md
similarity index 90%
rename from source/help/tutorials/index.md
rename to content/help/tutorials/_index.md
index ff7d4da..312d27c 100644
--- a/source/help/tutorials/index.md
+++ b/content/help/tutorials/_index.md
@@ -1,18 +1,21 @@
 ---
-title: Tutorials
-date: 2017-09-26 16:15:35
-type: helpList
 banner: tutor.jpg
+date: '2017-09-26 16:15:35'
 keywords:
-- help
-- tutorials
-- helpdesk
+  - help
+  - tutorials
+  - helpdesk
+title: Tutorials
 ---
 
+{{< talks >}}
+
 ## 2018
+
 [![Intro To Redbrick 2018](./IntroToRedbrick2018/IntroToRedbrick2018.png)](./IntroToRedbrick2018)
 
 ## 2017
+
 [![How To Set Up Your Dev Space](./SettingUpDevEnv/HowToSetUpYourDevSpace.png)](./SettingUpDevEnv)
 [![Intro To Redbrick](./IntroToRedbrick/IntroToRedbrick.png)](./IntroToRedbrick)
 [![Static Web Design](./static-web/static.png)](./static-web)
@@ -21,6 +24,7 @@ keywords:
 [![Phishing and Scams](./PhishingAndScams/How_not_to_conduct_yourself_on_social_media.jpg)](./PhishingAndScams)
 
 ## 2016
+
 [![Using Redbrick](./usingrb2016/usingrb.png)](./usingrb2016)
 [![](./AdvancedJavaScript/Advanced_JavaScript.png)](./AdvancedJavaScript)
 [![](./IntroToGit/IntroToGit.png)](./IntroToGit)
@@ -34,9 +38,11 @@ keywords:
 [![](./buildpc/buildpc.png)](./buildpc)
 
 ## 2015
+
 [![](./usingrb2015/usingrb.png)](./usingrb2015)
 [![](./buildpc/buildpc.png)](./buildpc)
 [![](./wordpress-2015/wordpress.png)](./wordpress-2015)
-[![](./js-2015/js.png)](./js-2015)
-[![](./vm/VM.png)](./vm)
+[![](./js-2015/js.png)](./js-2015) [![](./vm/VM.png)](./vm)
 [![](./securevm/SecuringVM.png)](./securevm)
+
+{{< /talks >}}
diff --git a/content/help/tutorials/buildpc/_index.md b/content/help/tutorials/buildpc/_index.md
new file mode 100644
index 0000000..395dd0c
--- /dev/null
+++ b/content/help/tutorials/buildpc/_index.md
@@ -0,0 +1,11 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Build Your Own PC
+---
+
+{{< back_button >}}
+{{< pdf googledoc="https://drive.google.com/file/d/0BxXeQgjtPmaCczB2S2FQcklaV0U/preview" >}}
diff --git a/source/help/tutorials/buildpc/buildpc.png b/content/help/tutorials/buildpc/buildpc.png
similarity index 100%
rename from source/help/tutorials/buildpc/buildpc.png
rename to content/help/tutorials/buildpc/buildpc.png
diff --git a/content/help/tutorials/docker/_index.md b/content/help/tutorials/docker/_index.md
new file mode 100644
index 0000000..978e5f1
--- /dev/null
+++ b/content/help/tutorials/docker/_index.md
@@ -0,0 +1,71 @@
+---
+date: '2017-02-21 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Docker, The 'Cloud' in a box
+---
+
+{{< back_button >}}
+{{< reveal src="https://redbrick.github.io/admin-training/docker/" >}}
+
+# Setting up docker-compose for services
+
+## Prerequisites
+
+CentOS 7 || Ubuntu 16.04 || Arch || coreOS
+
+## Set up Docker
+
+CoreOS all ready comes with docker so it can skip to the next step  
+If your on arch just run `pacman -S docker docker-compose`  
+For centos and ubuntu follow the instructions below  
+Add docker repos and install it !!!!VERY IMPORTANT NEVER PIPE TO SHELL !!!!!
+
+```bash
+curl -fsSL https://get.docker.com/ >> getdocker.sh
+less getdocker.sh
+bash getdocker.sh
+```
+
+Add docker compose
+
+```bash
+sudo curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+docker-compose --version
+```
+
+You should get `docker-compose version: 1.10.0` or higher
+
+## Set Up services
+
+1.  First create a folder to keep all the files. I suggest
+    `/ect/docker-compose/services/` run
+    `sudo mkdir /ect/docker-compose/services/`
+2.  Add services
+
+```bash
+cd /etc/docker-compose/services
+mkdir nginx
+cd nginx
+docker network create --driver bridge nginx-proxy
+wget https://raw.githubusercontent.com/jwilder/nginx-proxy/master/nginx.tmpl
+wget https://raw.githubusercontent.com/redbrick/admin-training/master/docker/docker-compose.yml
+docker-compose up -d
+```
+
+If you browse to port HTTPS on 443 on your domain and it'll be your docker nginx
+instance running. To explain what we did we created a network for all the
+containers to communicate over then using docker compose the containers where
+created with the specifications we set in the docker-compose.yml  
+We can manage these containers like any other containers with `docker stop` and
+`docker restart` or use docker-compose, such as the command
+`docker-compose logs`
+
+We created a landing page which servers html from `/var/www/main` on the host
+machine  
+A Plex server is now running bound to port 32400 on the host machine serving
+media from `/var/tv` and `/var/movies`  
+A next cloud server that acts as your private dropbox
diff --git a/source/help/tutorials/docker/docker-compose.yml b/content/help/tutorials/docker/docker-compose.yml
similarity index 94%
rename from source/help/tutorials/docker/docker-compose.yml
rename to content/help/tutorials/docker/docker-compose.yml
index d5a0722..51448e4 100644
--- a/source/help/tutorials/docker/docker-compose.yml
+++ b/content/help/tutorials/docker/docker-compose.yml
@@ -22,7 +22,9 @@ services:
       - './nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro'
     volumes_from:
       - nginx
-    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    entrypoint:
+      /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s
+      /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
 
   letsencrypt-nginx-proxy-companion:
     image: jrcs/letsencrypt-nginx-proxy-companion
diff --git a/source/help/tutorials/docker/docker.png b/content/help/tutorials/docker/docker.png
similarity index 100%
rename from source/help/tutorials/docker/docker.png
rename to content/help/tutorials/docker/docker.png
diff --git a/content/help/tutorials/js-2015/_index.md b/content/help/tutorials/js-2015/_index.md
new file mode 100644
index 0000000..6acce51
--- /dev/null
+++ b/content/help/tutorials/js-2015/_index.md
@@ -0,0 +1,11 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Javascript
+---
+
+{{< back_button >}}
+{{< pdf googledoc="https://drive.google.com/file/d/0BxXeQgjtPmaCNHBvbUVuQ1Azb0k/preview" >}}
diff --git a/source/help/tutorials/js-2015/js.png b/content/help/tutorials/js-2015/js.png
similarity index 100%
rename from source/help/tutorials/js-2015/js.png
rename to content/help/tutorials/js-2015/js.png
diff --git a/source/help/tutorials/securevm/SecuringVM.png b/content/help/tutorials/securevm/SecuringVM.png
similarity index 100%
rename from source/help/tutorials/securevm/SecuringVM.png
rename to content/help/tutorials/securevm/SecuringVM.png
diff --git a/content/help/tutorials/securevm/_index.md b/content/help/tutorials/securevm/_index.md
new file mode 100644
index 0000000..558c41c
--- /dev/null
+++ b/content/help/tutorials/securevm/_index.md
@@ -0,0 +1,11 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Securing Virtual Machines
+---
+
+{{< back_button >}}
+{{< pdf googledoc="https://drive.google.com/file/d/0BxXeQgjtPmaCQWtCeHg4LXNWanc/preview" >}}
diff --git a/source/help/tutorials/static-web/index.md b/content/help/tutorials/static-web/_index.md
similarity index 54%
rename from source/help/tutorials/static-web/index.md
rename to content/help/tutorials/static-web/_index.md
index 8a3ecc5..32373f9 100644
--- a/source/help/tutorials/static-web/index.md
+++ b/content/help/tutorials/static-web/_index.md
@@ -1,104 +1,140 @@
 ---
-title: Static Web Design
-date: 2017-03-01 16:15:35
-type: tutorial
+date: '2017-03-01 16:15:35'
 keywords:
   - help
   - tutorials
   - web
+title: Static Web Design
 ---
 
-{% reveal https://redbrick.github.io/admin-training/static-webdesign/ 800 600 %}
+{{< back_button >}}
+{{< reveal src="https://redbrick.github.io/admin-training/static-webdesign/" >}}
 
 # Static Site
 
 ## Why
-There are many [Problem with cms](http://blog.theinternets.be/the-problem-with-modern-content-management-systems/) some due to security others dues to infrastructure dependency, database or running a server
-Allows us to separate layout from content.  
-Produces HTML which is easy to host and share.  
+
+There are many
+[Problem with cms](http://blog.theinternets.be/the-problem-with-modern-content-management-systems/)
+some due to security others dues to infrastructure dependency, database or
+running a server Allows us to separate layout from content.  
+Produces HTML which is easy to host and share.
 
 ## Dynamic vs static
+
 ### Static Site
-A static site is one that does not change once the content is set.  
+
+A static site is one that does not change once the content is set.
+
 - plain old html site
 - redbrick
 
 ### Dynamic Site
-A dynamic is one that is generated every time you load it.  
+
+A dynamic is one that is generated every time you load it.
+
 - WordPress
 - Facebook
 - twitter
 
 # Hugo
+
 Written in go, so runs on anything  
 Uses markdown and yaml to store setting and contents
 
 ## Using Hugo
-Hugo is already installed on pygmalion, so everyone just needs to SSH there to use it
+
+Hugo is already installed on pygmalion, so everyone just needs to SSH there to
+use it
+
 ```
 ssh username@pygmalion.redbrick.dcu.ie
 ```
 
 ## Creating your first site
+
 To generate your first site you can type the command:
 
 ```
 $ hugo new site ~/my-website
 ```
+
 Jump into your new site and have a look around at the files
+
 ```
 $ cd ~/my-website
 $ ls -F
 ```
+
 Open up the `config.yaml` file to change the configuration of your website
 
 ```
 $ nano config.yaml
 ```
+
 Edit the content/index.md with what ever you want to say
+
 ```
 $ nano content/index.md
 ```
 
 ## Making it your own
+
 ### Changing images
-To get started you will want to add your own pictures for your avatar, banner and about photos. To change these you will need to add these to your `/static/img/` folder.
+
+To get started you will want to add your own pictures for your avatar, banner
+and about photos. To change these you will need to add these to your
+`/static/img/` folder.
+
 - avatar.jpg
 - banner.jpg
 - about.jpg
 
 ### Customising pages
-* Change the baseURL `baseURL: "http://www.redbrick.dcu.ie/~username/"` to inclue your username
-* Change `title: A Redbrick users site` to the title of your main page
-* You can also add your social media links in here after `link: '#'`
+
+- Change the baseURL `baseURL: "http://www.redbrick.dcu.ie/~username/"` to
+  inclue your username
+- Change `title: A Redbrick users site` to the title of your main page
+- You can also add your social media links in here after `link: '#'`
 
 ### Adding new pages
+
 ```
 $ hugo new about.md
 ```
-* This will generate a new page with some metadata all ready in it
-Take a look at this new file with
+
+- This will generate a new page with some metadata all ready in it Take a look
+  at this new file with
+
 ```
 $ nano content/about.md
 ```
 
 ## Building the Site
+
 To build your site we type the command
+
 ```
 $ hugo
 ```
+
 This will output all the code into the `public` folder.  
-*Note:* Hugo can be weird if you don't delete your public before you generate every time  
-*Warning*: rm -rf is sometimes dangerous. Don't run in sudo unless you know what you are doing
+_Note:_ Hugo can be weird if you don't delete your public before you generate
+every time  
+_Warning_: rm -rf is sometimes dangerous. Don't run in sudo unless you know what
+you are doing
 
 ```
 $ rm -rf public
 ```
+
 This will _perminantly_ delete the public folder  
-You can also achieve the same thing by running  
+You can also achieve the same thing by running
+
 ```
 $ hugo --cleanDestinationDir
 ```
+
 ## Looking at the site locally
 
 If you wanna look at your site before you go and deploy it (recommended)
@@ -110,24 +146,29 @@ $ hugo server
 This will generate a site on localhost:1313
 
 ## Why is my static site really slow to load?
+
 ### Images
+
 Don't use high-res  
 scale them down and compress them
+
 - thumbnails 200px
 - banners 800px
 
-(These are rough estimates every page is different)
-Compression removes details but makes them smaller
+(These are rough estimates every page is different) Compression removes details
+but makes them smaller
 
 ### Minification
-Minification removes white spaces reducing the size of the file allowing you to load your site faster.
-You can minify html, css, or js.  
+
+Minification removes white spaces reducing the size of the file allowing you to
+load your site faster. You can minify html, css, or js.  
 Tools for minification:
- - Gulp
- - Grunt
- - Webpack
+
+- Gulp
+- Grunt
+- Webpack
 
 ## Blog
-hugo can be used for a blog.
-You'll need a theme that supports blog posts.
-Just run `hugo new post/my-post-name.md`
+
+hugo can be used for a blog. You'll need a theme that supports blog posts. Just
+run `hugo new post/my-post-name.md`
diff --git a/source/help/tutorials/static-web/static.png b/content/help/tutorials/static-web/static.png
similarity index 100%
rename from source/help/tutorials/static-web/static.png
rename to content/help/tutorials/static-web/static.png
diff --git a/source/help/tutorials/tutor.jpg b/content/help/tutorials/tutor.jpg
similarity index 100%
rename from source/help/tutorials/tutor.jpg
rename to content/help/tutorials/tutor.jpg
diff --git a/content/help/tutorials/usingrb2015/_index.md b/content/help/tutorials/usingrb2015/_index.md
new file mode 100644
index 0000000..c1ba352
--- /dev/null
+++ b/content/help/tutorials/usingrb2015/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Using Redbrick 2015
+---
+
+{{< back_button >}} {{< pdf src="./usingrb2015.pdf" >}}
diff --git a/source/help/tutorials/usingrb2015/usingrb.png b/content/help/tutorials/usingrb2015/usingrb.png
similarity index 100%
rename from source/help/tutorials/usingrb2015/usingrb.png
rename to content/help/tutorials/usingrb2015/usingrb.png
diff --git a/source/help/tutorials/usingrb2015/usingrb2015.pdf b/content/help/tutorials/usingrb2015/usingrb2015.pdf
similarity index 100%
rename from source/help/tutorials/usingrb2015/usingrb2015.pdf
rename to content/help/tutorials/usingrb2015/usingrb2015.pdf
diff --git a/content/help/tutorials/usingrb2016/_index.md b/content/help/tutorials/usingrb2016/_index.md
new file mode 100644
index 0000000..9f816c1
--- /dev/null
+++ b/content/help/tutorials/usingrb2016/_index.md
@@ -0,0 +1,10 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Using Redbrick 2016
+---
+
+{{< back_button >}} {{< pdf src="./usingrb.pdf" >}}
diff --git a/source/help/tutorials/usingrb2016/usingrb.pdf b/content/help/tutorials/usingrb2016/usingrb.pdf
similarity index 100%
rename from source/help/tutorials/usingrb2016/usingrb.pdf
rename to content/help/tutorials/usingrb2016/usingrb.pdf
diff --git a/source/help/tutorials/usingrb2016/usingrb.png b/content/help/tutorials/usingrb2016/usingrb.png
similarity index 100%
rename from source/help/tutorials/usingrb2016/usingrb.png
rename to content/help/tutorials/usingrb2016/usingrb.png
diff --git a/source/help/tutorials/vm/VM.png b/content/help/tutorials/vm/VM.png
similarity index 100%
rename from source/help/tutorials/vm/VM.png
rename to content/help/tutorials/vm/VM.png
diff --git a/content/help/tutorials/vm/_index.md b/content/help/tutorials/vm/_index.md
new file mode 100644
index 0000000..2a44461
--- /dev/null
+++ b/content/help/tutorials/vm/_index.md
@@ -0,0 +1,11 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Virtual Machines
+---
+
+{{< back_button >}}
+{{< pdf googledoc="https://drive.google.com/file/d/0BxXeQgjtPmaCaGRQc3ZZT0pDdzA/preview" >}}
diff --git a/content/help/tutorials/wordpress-2015/_index.md b/content/help/tutorials/wordpress-2015/_index.md
new file mode 100644
index 0000000..fa9da87
--- /dev/null
+++ b/content/help/tutorials/wordpress-2015/_index.md
@@ -0,0 +1,11 @@
+---
+date: '2016-04-17 16:15:35'
+keywords:
+  - help
+  - tutorials
+  - helpdesk
+title: Wordpress
+---
+
+{{< back_button >}}
+{{< pdf googledoc="https://drive.google.com/file/d/0BxXeQgjtPmaCX2o5Z3lzbmlZUkU/preview" >}}
diff --git a/source/help/tutorials/wordpress-2015/wordpress.png b/content/help/tutorials/wordpress-2015/wordpress.png
similarity index 100%
rename from source/help/tutorials/wordpress-2015/wordpress.png
rename to content/help/tutorials/wordpress-2015/wordpress.png
diff --git a/source/_posts/2014-01.md b/content/post/2014-01/index.md
similarity index 77%
rename from source/_posts/2014-01.md
rename to content/post/2014-01/index.md
index ecf847f..5a20be1 100644
--- a/source/_posts/2014-01.md
+++ b/content/post/2014-01/index.md
@@ -1,22 +1,23 @@
 ---
-title: 'Pygmalion - Update Tuesday 16th September'
-date: '2014-09-14'
 author: koffee
 banner: update.png
+date: '2014-09-14'
 tags:
   - upgrades
+title: Pygmalion - Update Tuesday 16th September
 ---
 
 Hi everyone,
 
 We'll be doing an update on Pygmalion on Tuesday 16th September 7pm.
 
-Please be aware that the server will be available from 6:45 p.m.
-We estimate this update will only take 30 mins.
+Please be aware that the server will be available from 6:45 p.m. We estimate
+this update will only take 30 mins.
 
 We hope to have restored Pygmalion's service completely by 7:30 p.m.
 
 Regards,
 
 Richard Walsh (koffee)
+
 Redbrick Admin
diff --git a/source/_posts/2014-01/update.png b/content/post/2014-01/update.png
similarity index 100%
rename from source/_posts/2014-01/update.png
rename to content/post/2014-01/update.png
diff --git a/source/_posts/2014-02/defconBanner.jpg b/content/post/2014-02/defconBanner.jpg
similarity index 100%
rename from source/_posts/2014-02/defconBanner.jpg
rename to content/post/2014-02/defconBanner.jpg
diff --git a/content/post/2014-02/index.md b/content/post/2014-02/index.md
new file mode 100644
index 0000000..41714b8
--- /dev/null
+++ b/content/post/2014-02/index.md
@@ -0,0 +1,126 @@
+---
+author: koffee
+banner: defconBanner.jpg
+date: '2014-09-22'
+tags:
+  - defcon
+  - clubs and socs
+  - interpints
+  - talks
+title: Week 1 - Welcome Back | Events | Clubs & Socs | Updates
+---
+
+Good Morning from 136.206.15.0/24
+
+Welcome back to our members who are heading into their first day of term! To
+those of you who have just completed 4th year and will (hopefully) be joining us
+this year as associate members, we hope you have a less than rubbish Monday. To
+our dedicated associates we welcome you back to join us for what will hopefully
+be a great year.
+
+Now that pleasantries are out of the way; down to business.
+
+- Events
+- Clubs & Socs Days
+- Updates
+
+ 
+
+## Events
+
+### When: Weekly
+
+### Where: Various locations around DCU
+
+The Committee have been planning long and hard over the summer to try and line
+up some interesting events. We've also come up with a prospective weekly
+schedule.
+
+- Monday: Screening of DefCon/ CCC talks in the Mezz.
+- Tuesday: Associate Talks
+- Wednesday: Rotating Helpdesk/Admin talks.
+- Thursday: Weekly Events: Talks, Parties & Other interesting things.
+- Friday: Chill out in nuBar and the occasional trip into Town for InterPints.
+
+Next Thursday sees our Fresher's Session in nuBar.
+
+We've got a few big events to kick off the year: Google:
+
+1.  [University Open House in Google's Barrow St Offices](https://www.google.ie/maps/place/Barrow+St,+Dublin,+Co.+Dublin/@53.3398795,-6.2364612,21z/data=%214m2%213m1%211s0x48670eeb7282cd47:0x44099d1673a54bb6).
+    When: October 3rd 2pm-6:30pm. We've been invited to attend the first Google
+    Tech Ireland Open House: Google Engineers will tell us what it's like to
+    work for Google, we'll hear about student focused programmes as well as CV
+    and interviewing tips. `--->` SIGN UP
+    [HERE](https://docs.google.com/a/google.com/forms/d/1NBWChHk4bsnGclhLqC1VqGXdyh4ofVeJWOc2BTUhCF0/viewform)
+    TO ATTEND `<---` (must be done by 26/9/2014)
+2.  Google Hangout - Engineering at Google. When: Tuesday October 7th 5pm - 6pm
+    We'll be getting people together and getting in some Firehouse Pizza and
+    refreshments and listening to some Google Engineers from Dublin and abroad
+    talk about their careers in Google thus far.
+3.  Google come to DCU! When: Wednesday October 8th 1pm - 3:30pm We've arranged
+    for 3 talks specially for Redbrick, two of which are from current Redbrick
+    members. 1pm: "Perspectives on Studying Computer Science" - John Looney
+    (valen) 2pm " Systems at Scale: Tales from Google SRE" with Andrew Widdowson
+    from MountainView 3pm: Q&A session with Conor Flynn (conor_f) a STEP intern
+    from the PSSD program.
+
+## Intercom:
+
+Intercom are a growing force in CRM; with Engineers and designers coming from
+some of the biggest companies in the world to work with them, they're bound to
+be doing something right. Some of the Redbrick committee have gone to see their
+"Inside Intercom" talks, and now we're bringing them to us. We have two
+Associate members confirmed thus far; moju and singer, they'll coming in to talk
+about how Intercom runs and their times at the company thus far.
+
+To get a feel for the kind of company it is check out their blog here:
+http://insideintercom.io/
+
+## Associates:
+
+So far we've had a huge response from our associate members, who are keen to
+share their knowledge and interests with the rest of the society. Confirmed so
+far are talks from:
+
+- Cian Synnott (pooka) - Find some of his tech writing here: emauton.org
+- Diarmaid McManus (elephant)
+- Ciaran McNally (mak)
+- Richard Dalton (d_fens)
+- Matthew Barrington (moju)
+- David Scanlan (singer)
+
+With many more who haven't been adequately 'persuaded' yet.
+
+This is just a taster of what we've got lined up for the year, along with the
+annual Christmas party, Quiz, Tech Week and Super Secret Trip, we hope you'll
+enjoy the year.
+
+## Clubs&Socs Days
+
+### When: Sept 29th-Oct 1st
+
+It's that time of the year when we herald in a new gen of members.(Gen20 by my
+count) As usual there'll be Redbrick committee members floating around the
+Venue, Giving out goodies and chatting about the year to come to all and sundry.
+Anyone can come by and renew their membership over those 3 days.
+
+## Updates
+
+### When: Sept-Nov
+
+Over the next few months the admins, helped by esteemed rootholders, will be
+undertaking updates of the whole Redbrick Network. We will of course endeavour
+to give everyone plenty of notice of member impacting updates. Minimising
+downtime is one of our biggest priorities, so we'll endeavour to make any
+necessary downtime as quick and painless and restore services as soon as
+possible.
+
+That's all until next week.
+
+We hope to see as many of you as possible at events throughout the year,
+
+On behalf of Redbrick Committee,
+
+Richard Walsh Chair - Redbrick
+
+e: chair at redbrick.dcu.ie
diff --git a/source/_posts/2014-03/googleBanner.jpg b/content/post/2014-03/googleBanner.jpg
similarity index 100%
rename from source/_posts/2014-03/googleBanner.jpg
rename to content/post/2014-03/googleBanner.jpg
diff --git a/content/post/2014-03/index.md b/content/post/2014-03/index.md
new file mode 100644
index 0000000..a78b8a6
--- /dev/null
+++ b/content/post/2014-03/index.md
@@ -0,0 +1,104 @@
+---
+author: socks
+banner: googleBanner.jpg
+date: '2014-09-30'
+tags:
+  - freshers
+  - clubs and socs
+  - google
+title: "Week 2 - Clubs and Socs day | Freshers party |\tGoogle talks"
+---
+
+Hello Everybody!
+
+I hope everyone enjoyed the first week back! I know getting used to those early
+mornings is tough, but a whole host of awesome Redbrick events to look forward
+to might make it a little bit easier eh?
+
+In this weeks announce:
+
+- Clubs and Socs days
+- Freshers party
+- Google talks
+
+ 
+
+## Clubs and Socs days
+
+So we've an exciting week this week with Clubs and Socs! Please pop on over to
+us to renew your membership! We'd love to see you back for another year! :)
+
+- Date: Monday till Wednesday (that's the 29th to the 1st)
+- Time: 9-4 on each of the three days
+- Location: We're stand number 15 in the Venue!
+
+## Freshers Ball
+
+For anyone that has been to our famous freshers ball before you'll know that
+this is an event not to be missed! With the committee on hand to chat to, and
+all our new members to welcome into the Redbrick family, this promises to be a
+great night! Please come along and bring your friends too! As the old saying
+goes, the more the merrier!! :)
+
+- Date: Thursday the 2nd
+- Time: 5:30pm onwards
+- Location: The Nubar (located in the Hub!)
+
+## Google talks
+
+For those of you that signed up already don't forget about the awesome Google
+talks that are set to happen!
+
+University Open House in Google's Barrow St Offices.
+
+We've been invited to attend the first Google Tech Ireland Open House: Google
+Engineers will tell us what it's like to work for Google, we'll hear about
+student focused programmes as well as CV and interviewing tips.
+
+If you didn't get a chance to sign up last week don't worry Google have more
+events in store for us!
+
+- When: October 3rd
+- Time: 2pm-6:30pm
+
+## Google Hangout - Engineering at Google.
+
+We'll be getting people together and getting in some Firehouse Pizza and
+refreshments and listening to some Google Engineers from Dublin and abroad talk
+about their careers in Google thus far.
+
+- When: Tuesday October 7th
+- Time: 5pm - 6pm
+
+## Google come to DCU!
+
+- When: Wednesday October 8th 1pm - 3:30pm
+
+We've arranged for 3 talks specially for Redbrick, two of which are from current
+Redbrick members.
+
+### Talk 1:
+
+- 1pm: "Perspectives on Studying Computer Science" - John Looney (valen)
+- Location: to be confirmed
+
+### Talk 2:
+
+- 2pm " Systems at Scale: Tales from Google SRE" with AndrewWiddowson from
+  MountainView
+- Location: to be confirmed
+
+### Talk 3:
+
+- 3pm: Q&A session with Conor Flynn a STEP intern from the PSSD program.
+- Location: to be confirmed
+
+Well that's all for this email!
+
+We're looking forward to seeing everyone at all our events!
+
+Have a great week everyone!
+
+Gillian Morrison  
+Computer Applications  
+Redbrick Secretary 14/15
diff --git a/source/_posts/2014-05.md b/content/post/2014-05/index.md
similarity index 51%
rename from source/_posts/2014-05.md
rename to content/post/2014-05/index.md
index 87d1e66..802b5aa 100644
--- a/source/_posts/2014-05.md
+++ b/content/post/2014-05/index.md
@@ -1,20 +1,21 @@
 ---
-title: 'Webmaster Exam'
-date: '2014-10-10'
 author: kylar
 banner: webMaster.png
+date: '2014-10-10'
 tags:
   - webmaster
+title: Webmaster Exam
 ---
+
 Hey all,
 
-As there's been a lot of interest from you talented folks in the position
-of webmaster, I've decided to resign and will be running for one of the open
-admin positions at the EGM on the 22nd. The more talented and enthusiastic
-folks we have on committee the better!
+As there's been a lot of interest from you talented folks in the position of
+webmaster, I've decided to resign and will be running for one of the open admin
+positions at the EGM on the 22nd. The more talented and enthusiastic folks we
+have on committee the better!
 
-As such, I'll be holding the webmaster exam sometime next week! Please
-email me by 5pm on Monday to register your interest in taking the exam.
+As such, I'll be holding the webmaster exam sometime next week! Please email me
+by 5pm on Monday to register your interest in taking the exam.
 
 The exam will probably be Tuesday/Thursday next week.
 
diff --git a/source/_posts/2014-05/webMaster.png b/content/post/2014-05/webMaster.png
similarity index 100%
rename from source/_posts/2014-05/webMaster.png
rename to content/post/2014-05/webMaster.png
diff --git a/source/_posts/2014-06/helpdesk.jpg b/content/post/2014-06/helpdesk.jpg
similarity index 100%
rename from source/_posts/2014-06/helpdesk.jpg
rename to content/post/2014-06/helpdesk.jpg
diff --git a/content/post/2014-06/index.md b/content/post/2014-06/index.md
new file mode 100644
index 0000000..dda363c
--- /dev/null
+++ b/content/post/2014-06/index.md
@@ -0,0 +1,89 @@
+---
+author: socks
+banner: helpdesk.jpg
+date: '2014-10-13'
+tags:
+  - screen
+  - associates
+  - intercom
+  - helpdesk
+  - talks
+title:
+  'Week 4 | screen at rb: 5th Estate | Associate Talks | Helpdesk Talk |
+  Intercom at Redbrick'
+---
+
+Good afternoon Everyone,
+
+First of all, we'd like to apologise for the late announce! It shouldn't happen
+again! The evenings are getting shorter as we head into week 4. This week we're
+filling this shortening evenings with some great events. It's all about quality,
+not quantity.
+
+Without further ado the agenda for the week is as follows:
+
+- Screen at Redbrick
+- Associate Talks
+- Helpdesk Talks
+- Intercom at Redbrick
+
+ 
+
+## Screen at Redbrick
+
+We've had to postpone this as we have admin exams at 6pm. So we're going to
+reschedule for next week and change up the movie to the cheesy 1995 classic
+"Hackers" Sorry for the inconvenience, we'll make sure you guys get all of next
+week's details sooner. We're still ironing out a few bugs on this end.
+
+## Associate Talks: elephant
+
+- Topic: "Spammers Hate Him! One weird trick for staying secure online"
+- When: Tuesday 14th October at 18:00
+- Where: C115
+
+Social media accounts are valuable to scammers and spammers, who want to make a
+quick buck off your reputation. Here?s a few tips to help make your accounts
+harder to abuse so hold on to your tinfoil hats kids Diarmaid MacManus will be
+talking to us about how to stay secure online, some of the tips and tricks he's
+learned from his time in application security with various multinationals. If
+you don't leave this talk paranoid we'll be surprised!
+
+## Helpdesk Talks
+
+- Topic: How to get up and running with Redbrick.
+- Where: LG25
+- When: Wednesday 15th October 15:00
+
+Cian Butler will be guiding you through your first steps using Redbrick
+services. He'll be walking through how to use your webspace, logging into IRC
+and how to run programmes on our development servers. With the rest of the
+committee on hand to help out we should have you up and running in no time.
+
+##Intercom at Redbrick This week we see another company come to pay us a visit;
+this week it's Intercom. Intercom has only recently had its 3rd birthday, yet
+it's making huge a serious impact on how companies deal with their customers.
+Intercom have had developers, engineers and business join them from companies as
+big as Amazon and Google. Come along on Thursday and see how Intercom do what
+they do, and what it's like to work for them. We've got: Brian White and Brian
+Long (make sure to call him Robin) coming to talk about running Intercom.
+Matthew Barrington will be fanboying to the extreme about his time with
+Intercom. This should be a great evening, for anyone that may have been at the
+inside intercom meetings throughout the year you know how interesting and
+enthusiastic the Intercomrades are; for those who haven't you should definitely
+come along and witness it first hand.
+
+Don't forget to keep an eye on our various social media soapboxes:
+
+- Twitter @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+
+Thats all for now folks! Till next week!
+
+Regards
+
+Gillian Morrison(socks)
+
+Computer Applications
+
+Redbrick Secretary 14/15
diff --git a/source/_posts/2014-08/downTime.jpg b/content/post/2014-08/downTime.jpg
similarity index 100%
rename from source/_posts/2014-08/downTime.jpg
rename to content/post/2014-08/downTime.jpg
diff --git a/content/post/2014-08/index.md b/content/post/2014-08/index.md
new file mode 100644
index 0000000..a7806ab
--- /dev/null
+++ b/content/post/2014-08/index.md
@@ -0,0 +1,22 @@
+---
+author: koffee
+banner: downTime.jpg
+date: '2014-10-17'
+tags:
+  - downtime
+title: Emergency Downtime - Security Patching
+---
+
+All,
+
+We will be undertaking emergency downtime later this morning to mitigate any
+possible vulnerabilities to the recent SSL v3.0 (the exploit that must not be
+named) issues.
+
+We apologise for the short notice.
+
+Regards,
+
+Richard Walsh (koffee)
+
+Redbrick Admin
diff --git a/source/_posts/2014-09/fosdemBanner2014.jpg b/content/post/2014-09/fosdemBanner2014.jpg
similarity index 100%
rename from source/_posts/2014-09/fosdemBanner2014.jpg
rename to content/post/2014-09/fosdemBanner2014.jpg
diff --git a/content/post/2014-09/index.md b/content/post/2014-09/index.md
new file mode 100644
index 0000000..731752c
--- /dev/null
+++ b/content/post/2014-09/index.md
@@ -0,0 +1,130 @@
+---
+author: socks
+banner: fosdemBanner2014.jpg
+date: 2014-10-20'
+tags:
+  - screen
+  - associates
+  - admin
+  - EGM
+  - FOSDEM
+  - lotta
+title:
+  Week 5 | Screen at Redbrick | Associate talks | Admin talk | EGM and Admin
+  Training | FOSDEM | Social Night
+---
+
+Hey Everyone!
+
+Welcome to the week 5 Announce! We have lots of awesome things happening this
+week and we hope to see you at as many events as possible! Just to note:
+Unfortunately we don't know the rooms for the events just yet but we will be
+sending an email with the locations out tomorrow morning! Sorry for any
+inconvenience caused!
+
+In this weeks announce:
+
+- Screen at Redbrick: Hackers
+- Associate Talks
+- Admin Talk: An overview
+- EGM and admin training
+- Fosdem
+- Social Night
+
+ 
+
+## Screen at Redbrick: Hackers
+
+- When: Monday 20th October at 6pm
+- Where: Room To be confirmed.
+- Description:
+
+A young boy is arrested by the U.S. Secret Service for writing a computer virus
+and is banned from using a computer until his 18th birthday. Years later, he and
+his new-found friends discover a plot to unleash a dangerous computer virus, but
+they must use their computer skills to find the evidence while being pursued by
+the Secret Service and the evil computer genius behind the virus. This promises
+to keep you on the edge of your seat and will definitely be worth a watch!
+Please come along on Monday! We'd love to see you there!
+
+## Associate Talks: Lotta Mikkonen
+
+- When: Tuesday at 6.30pm
+- Where: Room to be confirmed.
+- Description:
+
+This week we have the lovely Lotta Mikkonen (attol) coming in to talk to us
+about interview techniques and 3/4 project presentation. This talk will be great
+for everybody especially those of you with intra interviews and projects coming
+up! You should definitely come along as she'll be passing on some invaluable
+tips on acing those interviews!
+
+## Admin Talk - An overview
+
+- When: Wednesday 22nd at (Sean time??)
+- Where: Room To be confirmed.
+- Description:
+
+This week we will be having the first of our admin talks! It will be given by
+our very own Lorcan Boyle (Zergless). His talk will be an intro to Linux command
+line. He will be giving helpful hints and tips as well as some cool commands to
+help you get the most out of our servers! This promises to be a really
+interesting talk and we hope to see you all there. As always, there will be
+pizza!
+
+## EGM and Admin training
+
+- When: Wednesday (time to be confirmed)
+- Where: Room to be confirmed.
+- Description:
+
+This years EGM is happening on Wednesday! We will be discussing our plans for
+the year as well as electing new members to the committee. The positions that
+you can run for are:
+
+- PRO For those of you that passed the exams you can run for the following:
+- Helpdesk
+- Admin
+- Webmaster
+
+We hope to see as many of you at the EGM as possible!
+
+## Fosdem
+
+So, we're looking at going to the Free and Open Source Software Developers'
+European Meeting (Fosdem for short). It is to be held in Brussels on the 31st of
+January and the 1st of February. FOSDEM is a free event that offers open source
+communities a place to meet, share ideas and collaborate. It is renowned for
+being highly developer-oriented and brings together 5000+ geeks from all over
+the world. It is a really cool event with devrooms, lectures, lightning talks
+and cool opensource stuff. For those interested please take a look at the link
+below! We are trying to gauge interest, so if you would like to go as part of
+Redbrick please let us know as soon as possible. It will be a fantastic
+experience!
+
+The website: https://fosdem.org/2015/
+
+## Social Night
+
+- When: Thursday at 6
+- Where: The nuBar
+- Description: After a long week full of hard work we think everyone deserves
+  the opportunity to come down to the nuBar for some well-earned drinks and a
+  bitta banter. We'd love to see you all there!
+
+Well that's all for this week!
+
+Don't forget to keep an eye on our various social media soapboxes:
+
+- Twitter @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+
+Till next week!
+
+Regards
+
+Gillian Morrison(socks)
+
+Computer Applications
+
+Redbrick Secretary 14/15
diff --git a/source/_posts/2014-10/halloweenBanner.jpg b/content/post/2014-10/halloweenBanner.jpg
similarity index 100%
rename from source/_posts/2014-10/halloweenBanner.jpg
rename to content/post/2014-10/halloweenBanner.jpg
diff --git a/content/post/2014-10/index.md b/content/post/2014-10/index.md
new file mode 100644
index 0000000..4733041
--- /dev/null
+++ b/content/post/2014-10/index.md
@@ -0,0 +1,98 @@
+---
+author: socks
+banner: halloweenBanner.jpg
+date: '2014-10-28'
+tags:
+  - associates
+  - pooka
+  - FOSDEM
+  - halloween
+  - wordpress
+  - helpdesk
+title: Week 6 | Associate talks | Helpdesk talk | Halloween Ball | FOSDEM
+---
+
+Hey everyone!
+
+I hope everybody enjoyed the long weekend and is ready for a spooktacular week
+full of events!
+
+In this weeks announce:
+
+- Associate talks: pooka at Redbrick
+- Helpdesk talk: HowTo at Redbrick - Wordpress 101
+- Halloween Ball at Redbrick
+- FOSDEM
+
+ 
+
+## pooka at Redbrick
+
+- When: Tuesday 28th October at 6pm
+- Where: C123
+- Description: Cian (pooka at redbrick) is a former Redbrick admin, and works as
+  a programmer for Hosted Graphite. He has previously worked for Google, Amazon,
+  and several Irish ISPs.
+
+This talk focuses on technical designs in large-scale software environments, and
+patterns which we have found work well. These can be relatively difficult to get
+exposure to. It is not an exhaustive treatment, but we hope to give the you an
+appreciation of the kinds of constraints and opportunities we have at scale;
+some tools for approaching design; and a better idea of the kinds of systems
+engineers engage with at large scale. This promises to be a really interesting
+talk not to be missed! so please come along and bring your friends! As always,
+there will be pizza!
+
+## HowTo at Redbrick - Wordpress 101
+
+- When: Wednesday 29th October at 3pm
+- Where: LG26
+- Description: This week our Helpdesk team will be going through how to install
+  and manage Wordpress on Redbrick. Please come along as our helpdesk team will
+  be passing on some invaluable information.
+
+## Halloween Ball at Redbrick
+
+- When:Thursday 30th October 6.30pm
+- Where: The Nubar
+- Description: Scarier than finding Mak just put a rootkit on your server...
+  Redbrick is hoping to bring back the Hallowe'en ball.
+
+* Fancy Dress
+* Spot Prizes
+* Gruesome games.
+
+This year we will be holding a Halloween ball for all of you fancy dress lovers.
+There will be spot prizes on the night for best dressed and winners of the
+Halloween games along with some tasty platters. So get the costumes out and lets
+have some fun!
+
+## FOSDEM
+
+So for those who dont know, we're looking at going to the Free and Open Source
+Software Developers' European Meeting (FOSDEM for short). It is to be held in
+Brussels on the 31st of January and the 1st of February. FOSDEM is a free event
+that offers open source communities a place to meet, share ideas and
+collaborate. It is renowned for being highly developer-oriented and brings
+together 5000+ geeks from all over the world. It is a really cool event with
+devrooms, lectures, lightning talks and cool opensource stuff. For those
+interested please take a look at the link below! We are still taking signups for
+those that want to go, so if you would like to go as part of Redbrick please let
+us know as soon as possible. It will be a fantastic experience!
+
+The website: https://fosdem.org/2015/
+
+Don't forget to keep an eye on our various social media soapboxes:
+
+- Twitter @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+
+Till next week!
+
+Regards
+
+Gillian Morrison(socks)
+
+Computer Applications
+
+Redbrick Secretary 14/15
diff --git a/source/_posts/2015-01/birthdayBrick.jpg b/content/post/2015-01/birthdayBrick.jpg
similarity index 100%
rename from source/_posts/2015-01/birthdayBrick.jpg
rename to content/post/2015-01/birthdayBrick.jpg
diff --git a/content/post/2015-01/index.md b/content/post/2015-01/index.md
new file mode 100644
index 0000000..2e218de
--- /dev/null
+++ b/content/post/2015-01/index.md
@@ -0,0 +1,57 @@
+---
+author: zergless
+banner: birthdayBrick.jpg
+date: '2015-09-20'
+tags:
+  - birthday
+title: Redbrick turns 20!
+---
+
+Hi Guys
+
+First of all, I'd like to welcome everyone back after what I hope was a great
+summer!
+
+So as many of you may or may not know Redbrick will be turning 20 this year!
+Myself and the committee would like to make a it a pretty big party for such a
+great milestone but that can't be achieved without the help of all our members.
+
+ 
+
+We have set the date for April 9th 2016. In the coming weeks we will be looking
+at venues, thinking of ideas for the party and setting up a webpage with all
+details. This is where the help from you guys would be greatly appreciated in a
+couple of ways.
+
+## SPREAD THE WORD!
+
+We can only let so many people know via email and social media so we're bound to
+miss a few. So if you guys could spread the word to any old Redbrick members you
+can think of. Once we have the website up and running I'd ask that you share it
+where ever you can think of. The more the merrier :D
+
+## MEMORIES!
+
+Since this is Redbricks 20th year we of course want to remember the earlier
+years so if anyone has any old photo, videos, posters or anything else they want
+to share please bring it on the night or email it to us or even send it in.
+
+## IDEAS!
+
+So far we've come up with music in a function room somewhere in town with beer
+and brickies. Do people want to do more? Does anyone have ideas of a venue? Send
+any and all ideas to us we want to make this an awesome event.
+
+Lastly, we have no idea how much this party will cost or how much money we will
+get granted by the SU. If any members would like to donate money to us it would
+be greatly appreciated by us all.
+
+Paypal: accounts at redbrick.dcu.ie
+
+## Kind Regards
+
+Lorcan Boyle (zergless)
+
+Redbrick Chairperson
+
+Computer Applications - Software Engineering Year 3
diff --git a/content/post/2015-02/index.md b/content/post/2015-02/index.md
new file mode 100644
index 0000000..d3088ce
--- /dev/null
+++ b/content/post/2015-02/index.md
@@ -0,0 +1,151 @@
+---
+author: koffee
+banner: pythonBanner.jpg
+date: '2015-09-23'
+tags:
+  - clubs and socs
+  - intro
+  - talks
+  - maK
+  - associates
+  - pycon
+  - EGM
+  - google
+title:
+  Week 1 - Clubs and Socs Days | Intro to RB | Bug Bounties | Google OpenHouse |
+  EGM | Pycon 2015
+---
+
+Hey Everyone
+
+Welcome back to all of our members returning to college. To all our graduands
+who have just finished 4th year, congratulations! Congratulations on entering
+the rank of esteemed associate members.
+
+To all our dedicated associates, welcome back to our 20th year! The wisdom that
+was to come with age still hasn't materialized.
+
+We've got lots planned for the year; and we hope you'll join us.
+
+Order of business for the first announce back:
+
+- Clubs & Socs Days
+- Intro to Redbrick
+- "Bug Bounties: Cad é an scéal?"
+- Sign Up for Google OpenHouse
+- EGM
+- Pycon 2015
+
+ 
+
+## Clubs & Socs
+
+- Date: Mon&Tue 28/09 & 29/09/2015.
+- Time: All Day.
+- Location: The Venue ( The Hub ).
+
+It's the time of the year when we indoctr... _welcome_ a new members. This year
+sees us herald in Gen21. (although we need to check with shadow) As usual
+there'll be Redbrick committee members floating around the Venue, they'll have
+goodies and will answer questions about the year to come.
+
+Anyone can come by and renew their membership or sign up over the 2 days. And as
+usual; if you can't make it down there are plenty of other ways to renew.
+
+## Intro to Redbrick
+
+- Date: Wed 30/09/2015.
+- Time: 2pm
+- Location: TBC
+
+The Helpdesk team will be taking a whistle stop tour of Redbrick services. The
+Committee shall also be introducing themselves to the new members and outlining
+the plans for the coming year, as well as taking suggestions. (inb4 resign)
+
+Members and associates are welcome to come along, if you have friends who'd like
+to join, bring them along on the night if they didn't make it to C&S days!
+
+## "Bug Bounties - Cad é an scéal?"
+
+- Speaker: Ciarán McNally (https://securit.ie)
+- Date: Tuesday 06/10/15.
+- Time: 17:00
+- Location: TBC
+
+One of Redbrick's favourite InfoSec specialists is back to chat about Bug
+Bounties.
+
+What are they? Why should you do them? Bug bounties provide an excellent
+opportunity to sharpen your Pentesting skills. This talk will give tips and
+insight into getting started with Bug Bounties. Ciaran will share creative but
+effective attack methodologies, real-world examples and tooling advice.
+
+For more info on Ciarán's consultancy check out https://securit.ie
+
+## Register for Google OpenHouse 2015
+
+- Date: Friday 09/10/2015.
+- Time: 9am
+- Location: https://goo.gl/IMXW6q
+
+Event: https://events.withgoogle.com/google-tech-ireland-open-house-2015/
+Redbrick went along to the Google Openhouse event last year, it was a huge
+success. We met other computing societies and likeminded people and learned a
+lot about Engineering at Google as well as learning CV tips and about the
+various bursaries and programs Google Run.
+
+The Open House is aimed at 1st and 2nd Years primarily. The Event itself is on
+Friday 6/11/2015 from 14:00 - 19:00. It will be held in Gordon House on Barrow
+St. http://min.ie/KVdSLW9i
+
+## EGM
+
+- When: Wednesday 17/10/15.
+- Time: 2pm
+- Where: Room TBC.
+
+It's that time of year again where we look to expand our ranks of the committee.
+You'll have a say in the day to day running of the society.
+
+Committee positions available
+
+- Secretary
+- Events officer
+- First Year Rep
+
+If you want any information on the role or have questions email committee at
+redbrick.dcu.ie
+
+## PyCon
+
+- Date: Sat&Sun 24/10 - 25/10/2015.
+- Location: Radisson Blu Royal Hotel Dublin
+- Website: https://python.ie/pycon-2015/
+- Tickets: €40 (preliminary)
+
+PyCon is the largest annual gathering of the Irish Python community. The
+conference will bring together Irish talent and world class leaders in the
+Python community for a fun, informative and friendly event. Saturday and Sunday
+will consist of talks, tutorials, workshops, open-spaces and sprints.
+
+We are hoping to organise a group to attend PyCon, so please get in touch with
+the committee if you're interested in attending. You can email events at
+redbrick.dcu.ie or get in touch on IRC.
+
+That's all for now folks. We hope to see as many of you as possible at events
+throughout the year.
+
+Don't forget to keep an eye on our social media pages and our Calendar:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+On behalf of the Committee 2015/'16
+
+Richard Walsh
+
+koffee at redbrick
+
+SysAdmin
diff --git a/source/_posts/2015-02/pythonBanner.jpg b/content/post/2015-02/pythonBanner.jpg
similarity index 100%
rename from source/_posts/2015-02/pythonBanner.jpg
rename to content/post/2015-02/pythonBanner.jpg
diff --git a/content/post/2015-03/index.md b/content/post/2015-03/index.md
new file mode 100644
index 0000000..8f8eb59
--- /dev/null
+++ b/content/post/2015-03/index.md
@@ -0,0 +1,163 @@
+---
+author: koffee
+banner: introToRedbrick.png
+date: '2015-09-30'
+tags:
+  - EGM
+  - pycon
+  - google
+  - maK
+  - talks
+  - associates
+title:
+  Welcome to Redbrick - Intro to Redbrick | Bug Bounties | Games Consoles and
+  much more
+---
+
+Hey Everyone
+
+A huge welcome to all of our new members this year! We hope Redbrick becomes a
+big part of what will be a great experience here in DCU.
+
+For all of the freshers that have joined us, we hope your first week of
+University has been fun, and that you've gone to at least a few of your
+lectures.
+
+And now, down to business, the Agenda for the upcoming weeks is as follows:
+
+- Intro to Redbrick
+- Sign Up for Google OpenHouse
+- Pycon 2015
+- "Bug Bounties: Cén scéal?"
+- EGM
+
+ 
+
+## Intro to Redbrick
+
+- Date: Wed 30/09/2015.
+- Time: 2pm
+- Location: LG25 (Computing Building, Ground Floor labs)
+
+The Helpdesk team will be taking a whistle stop tour of Redbrick services. Most
+of the committee will be introducing themselves to you and outlining the plans
+for the coming year. We'll talk about events we're excited about like TechWeek
+and our annual FOSDEM trip; But we'd also love to hear your ideas of projects
+that might interest you and others.
+
+Bring along friends if you think they should be there, if they're not members
+yet they can join up there and then.
+
+Come and shape the societies events for the year to come.
+
+## "Bug Bounties - Cén scéal?"
+
+- Speaker: Ciarán McNally (https://securit.ie)
+- Date: Tuesday 06/10/15.
+- Time: 17:00
+- Location: CG03 (Henry Grattan Building)
+
+Newly appointed application security engineer at bugcrowd, independent security
+consultant, former Redbrick admin and general security badass Ciarán McNally is
+coming to talk about bug bounties.
+
+What are they? Why should you do them? Bug bounties provide an excellent
+opportunity to sharpen your pentesting skills. maK's talk will give tips and
+insights into getting started with Bug Bounties. Ciaran will share creative but
+effective attack methodologies, real-world examples and tooling advice.
+
+For more info on Ciarán's consultancy check out https://securit.ie
+
+## Data Science at AIB
+
+~~followed by~~
+
+## Helpdesk Talk: How to build a MAME Console
+
+- Date: Wednesday 07/10/2015.
+- Time: 14:00 - 17:00
+- Location: LG25
+
+AIB will be talking about the applications of data analytics and how information
+is collected and processed. The talk will be focused on the technologies that
+the Data Innovation team at AIB use daily.
+
+This talk will also give us some information on the upcoming DataHack event
+which consists of a 'Hackathon' and 'Datathon' on the 7th November there are
+promises of fantastic prizes as well.
+
+This presentation will be followed by a practical workshop by Cian (butlerx) and
+Cormac (pints). The lads will be talking about MAME Consoles
+(http://min.ie/263c2csJ). Want to turn a Raspberry Pi into a games console? Come
+along and find out how!
+
+## Register for Google OpenHouse 2015
+
+- Date: Friday 09/10/2015.
+- Time: 9am
+- Location: https://goo.gl/IMXW6q
+
+Event: https://events.withgoogle.com/google-tech-ireland-open-house-2015/
+
+Redbrick went along to the Google Open house event last year, it was a huge
+success. We met other computing societies and like minded people and learned a
+lot about Engineering at Google as well as learning CV tips and about the
+various bursaries and programs Google Run.
+
+The Open House is aimed at 1st and 2nd Years primarily. The Event itself is on
+Friday 6/11/2015 from 14:00 - 19:00. It will be held in Gordon House on Barrow
+St. http://min.ie/KVdSLW9i
+
+## EGM
+
+- When: Wednesday 14/10/15.
+- Time: 2pm
+- Where: Room TBC.
+
+It's that time of year again where we look to expand our ranks of the committee.
+You'll have a say in the day to day running of the society.
+
+Committee positions available
+
+- Secretary
+- Events officer
+- First Year Rep
+
+If you want any information on the role or have questions email committee at
+redbrick.dcu.ie
+
+## PyCon
+
+- Date: Sat&Sun 24/10 - 25/10/2015.
+- Location: Radisson Blu Royal Hotel Dublin
+- Website: https://python.ie/pycon-2015/
+- Tickets: €40 (preliminary)
+
+PyCon is the largest annual gathering of the Irish Python community. The
+conference will bring together Irish talent and world class leaders in the
+Python community for a fun, informative and friendly event. Saturday and Sunday
+will consist of talks, tutorials, workshops, open-spaces and sprints.
+
+We are hoping to organise a group to attend PyCon, so please get in touch with
+the committee if you're interested in attending. You can email events at
+redbrick.dcu.ie or get in touch on IRC.
+
+That's all for now folks. We hope to see as many of you as possible at events
+throughout the year.
+
+Don't forget to keep an eye on our social media pages and our Calendar:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+On behalf of those wonderful people on committee
+
+`<3`
+
+Richard Walsh
+
+koffee at redbrick
+
+SysAdmin
diff --git a/source/_posts/2015-03/introToRedbrick.png b/content/post/2015-03/introToRedbrick.png
similarity index 100%
rename from source/_posts/2015-03/introToRedbrick.png
rename to content/post/2015-03/introToRedbrick.png
diff --git a/source/_posts/2015-04/fosdemBanner.png b/content/post/2015-04/fosdemBanner.png
similarity index 100%
rename from source/_posts/2015-04/fosdemBanner.png
rename to content/post/2015-04/fosdemBanner.png
diff --git a/content/post/2015-04/index.md b/content/post/2015-04/index.md
new file mode 100644
index 0000000..5e670bd
--- /dev/null
+++ b/content/post/2015-04/index.md
@@ -0,0 +1,119 @@
+---
+author: cac
+banner: fosdemBanner.png
+date: '2015-10-18'
+tags:
+  - UKIEPC
+  - facebook
+  - pycon
+  - EGM
+title: 'Week 5: FOSDEM | EGM Results | Facebook | PyCon | UKIEPC'
+---
+
+Hello all,
+
+I'm cac, the hip new Sec on the block, and it's my pleasure to give you a
+rundown of all the events this week. There's lots of stuff happening, so you
+have no excuse to be bored:
+
+- Tech Talk on Production Engineering at Facebook: Wednesday 21/10/15 -14:00 -
+  CG86
+- PyCon: Saturday 24/10 and Sunday 25/10 - Radisson Blu Royal Hotel, Dublin
+- UKIEPC: Saturday 24/10 - Sign-in at 9am - DCU School of Computing
+
+ 
+
+## FOSDEM
+
+- Date: 29/01/2016 - 31/01/2016
+- Location: Brussels
+- More info: https://fosdem.org/2016/
+
+FOSDEM is the Free Open Source Developers European Meeting which will be held in
+Brussels.
+
+It is a two day event which consists of talks and workshops each day.
+
+The event itself will be free but the cost will be roughly 70 euro (subject to
+change).
+
+We will be going over again this year but spaces will be limited to 30 people.
+spaces will be given on a first come first served basis. If you are interested
+in joining us email events at redbrick.dcu.ie.
+
+## EGM Results
+
+The results of the EGM election on Wednesday are as follows:
+
+- Noah Donnelly (cac) - Secretary
+- Cliodhna Harrison (thegirl) - Events
+- Cian Ruane (induxi0n) - PRO
+- Liam Rooney (ginger) - First Year Rep.
+
+The CPSSD takeover is well underway, you are all doomed.
+
+## Tech Talk on Production Engineering at Facebook
+
+- Date: Wednesday 21/10/15.
+- Time: 2pm
+- Location: CG86
+- More info: https://www.facebook.com/events/529307537236583/
+
+Facebook are coming in to DCU and will talk about what it's like to work at
+Facebook, and about their Production Engineer Internship taking place next
+summer.
+
+They will be focusing on Production Engineering at Facebook, and how they ensure
+that Facebook's services run smoothly and have the capacity for growth at the
+growing European headquarters. If it sounds exciting, come along to CG86 in the
+Henry Grattan building at 2pm on Wednesday.
+
+More info about their internship can be found here http://fb.me/PEDublinIntern.
+
+## PyCon
+
+- Date: Sat&Sun 24/10 - 25/10/2015.
+- Location: Radisson Blu Royal Hotel Dublin
+- Website: https://python.ie/pycon-2015/
+- Tickets: \$40e (preliminary)
+
+PyCon is the largest annual gathering of the Irish Python community. The
+conference will bring together Irish talent and world class leaders in the
+Python community for a fun, informative and friendly event. Saturday and Sunday
+will consist of talks, tutorials, workshops, open-spaces and sprints.
+
+For anyone going look for the guys in the Redbrick hoodies or get in touch with
+the committee if you'd like to meetup before or during the event.
+
+## UK/Ireland Intercollegiate Programming Competition (UKIEPC)
+
+- Date: Saturday 25/10/15.
+- Location: Sign-in at School of Computing foyer
+- Time: Sign-in at 9.00-9.45am, competition start at 10.00
+- [Website](http://www.computing.dcu.ie/event/ukireland-intercollegiate-programming-competition-ukiepc)
+
+If you're not going to PyCon, and if you're interested in some hardcore
+problem-solving, maybe I'll see you at the UKIEPC hosted in DCU on Saturday.
+Competitive programming is a great way to up your skills, and looks great on the
+CV.
+
+Google are sponsoring the DCU competition, and there will be goodies galore,
+including Chromecasts for the top 3 teams. Lunch will be provided. You can still
+register a team (2-3 people) until this Wednesday, the 21st.
+
+See the above UKIEPC page for details.
+
+Don't forget to keep an eye on our social media pages and our GCalendar:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- GCalendar: http://tinyurl.com/redbrickCalendar
+
+All the best from myself & the Committee,
+
+Noah Donnelly (cac)
+
+1st Year Computational Problem Solving & Software Development (ie. "computers")
+
+Redbrick Secretary 2015/16
diff --git a/content/post/2015-05/index.md b/content/post/2015-05/index.md
new file mode 100644
index 0000000..3825db1
--- /dev/null
+++ b/content/post/2015-05/index.md
@@ -0,0 +1,80 @@
+---
+author: cac
+banner: tux.png
+date: '2015-10-25'
+tags:
+  - helpdesk
+  - virtualistion
+  - linux
+  - associates
+  - talks
+  - halloween
+title: 'Week 6: Virtualising Linux | Mastering Interviews | Halloween Drinks'
+---
+
+Hey all,
+
+This week news broke that there may be a Lego brick shortage this Christmas
+(http://cnnmon.ie/1LKEeZZ) but there's still plenty of Redbrick goodness to go
+around `<3`
+
+- Helpdesk: Virtualising Linux - Wednesday 28/10 - 2pm - LG25
+- Mastering Interviews & Presentations - Thursday 29/10 - 5pm - QG22
+- Halloween Drinks - Thursday 29/10 - 6.30pm - The Slipper
+
+ 
+
+## Helpdesk: Virtualising Linux
+
+- Date: Wednesday 28/10/15
+- Time: 2pm - 4pm
+- Location: LG25
+- More info: https://www.facebook.com/events/968181899914904/
+
+This week the Helpdesk team will go through how to set up a Virtual Machine (VM)
+& a basic Linux install and configuration. They'll be on hand to answer
+questions as the tutorial goes. Make sure to turn up if you want to pester
+Helpdesk like I do.
+
+## Mastering Interviews & Presentations
+
+- Date: Thursday 29/10/15
+- Time: 5pm
+- Location: QG22
+- More info: https://www.facebook.com/events/1659468500978429/
+
+On Thursday we have the lovely Lotta Mikkonen (attol) coming in to talk to us
+about interview techniques and 3 & 4 project presentation. This talk will be
+great for everybody especially those of you with intra interviews and projects
+coming up. You should definitely come along as she'll be passing on some
+invaluable tips on acing those interviews!
+
+We'll also be heading out for Halloween drinks afterwards at the Slipper! See
+below.
+
+## Halloween Drinks!
+
+- Date: Thursday 29/10/15
+- Time: 6.30pm
+- Location: The Slipper
+
+The only thing better than practising interview techniques is practising them
+under the influence of alcohol! After Lotta's talk on Thursday, we'll be heading
+to The Slipper for some Halloween drinks and festive tomfoolery. Fancy dress is
+optional, but warmly welcomed!
+
+Don't forget to take a peek at our social media pages and our calendar to end
+all calendars:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+All the best from myself & the Rb Committee,
+
+Noah Donnelly (cac)
+
+1st Year Computational Problem Solving & Software Development (ie. "computers")
+
+Redbrick Secretary 2015/16
diff --git a/source/_posts/2015-05/tux.png b/content/post/2015-05/tux.png
similarity index 100%
rename from source/_posts/2015-05/tux.png
rename to content/post/2015-05/tux.png
diff --git a/source/_posts/2015-06/cancelled.png b/content/post/2015-06/cancelled.png
similarity index 100%
rename from source/_posts/2015-06/cancelled.png
rename to content/post/2015-06/cancelled.png
diff --git a/source/_posts/2015-06.md b/content/post/2015-06/index.md
similarity index 64%
rename from source/_posts/2015-06.md
rename to content/post/2015-06/index.md
index 9fbb9a7..bf39480 100644
--- a/source/_posts/2015-06.md
+++ b/content/post/2015-06/index.md
@@ -1,36 +1,35 @@
 ---
-title: 'Update on events this evening'
-date: '2015-10-29'
 author: cac
 banner: cancelled.png
+date: '2015-10-29'
 tags:
   - halloween
   - talks
+title: Update on events this evening
 ---
+
 Hey all,
 
-Regrettably, the talk scheduled for this evening on interviews and
-presentations has been cancelled. It will be rescheduled at some point in
-the coming weeks.
+Regrettably, the talk scheduled for this evening on interviews and presentations
+has been cancelled. It will be rescheduled at some point in the coming weeks.
 
 However, our Halloween drinks are still going ahead! Meet us at 7pm in The
-Slipper. You can dress up as something scary (~zergless), something sexy
-(~cac), your Blueblock alter ego (~theboy), or even yourself - bonus
-points for wearing computing equipment as clothing. I look forward to
-seeing you there!
+Slipper. You can dress up as something scary (~zergless), something sexy (~cac),
+your Blueblock alter ego (~theboy), or even yourself - bonus points for wearing
+computing equipment as clothing. I look forward to seeing you there!
 
+Don't forget to risk a peek at our social media pages and jam-packed society
+calendar:
 
-Don't forget to risk a peek at our social media pages and jam-packed
-society calendar:
-- Twitter:  @RedbrickDCU
+- Twitter: @RedbrickDCU
 - Facebook: https://www.facebook.com/dcuredbrick
 - Snapchat: RedbrickDCU
 - Calendar: http://tinyurl.com/redbrickCalendar
 
-
 Spooky salutations from myself & the Redbrick Committee,
 
 Noah Donnelly (cac)
-1st Year Computational Problem Solving & Software Development (ie.
-"computers")
+
+1st Year Computational Problem Solving & Software Development (ie. "computers")
+
 Redbrick Secretary 2015/16
diff --git a/source/_posts/2015-07/committee.jpg b/content/post/2015-07/committee.jpg
similarity index 100%
rename from source/_posts/2015-07/committee.jpg
rename to content/post/2015-07/committee.jpg
diff --git a/source/_posts/2015-07.md b/content/post/2015-07/index.md
similarity index 52%
rename from source/_posts/2015-07.md
rename to content/post/2015-07/index.md
index 703314e..096f49a 100644
--- a/source/_posts/2015-07.md
+++ b/content/post/2015-07/index.md
@@ -1,27 +1,29 @@
 ---
-title: 'EGM Next Week!'
-date: '2015-11-26'
 author: cac
 banner: committee.jpg
+date: '2015-11-26'
 tags:
   - EGM
+title: EGM Next Week!
 ---
+
 Hey all,
 
-With a heavy heart and an uncontrollable fit of giggles, I'm sorry to say
-that our beloved Gillian (socks) has resigned from her position as
-treasurer. That means we get to have the fun of holding an EGM next
-Thursday (2/12/15) to vote in a new treasurer! Time will be confirmed in
-the next few days.
+With a heavy heart and an uncontrollable fit of giggles, I'm sorry to say that
+our beloved Gillian (socks) has resigned from her position as treasurer. That
+means we get to have the fun of holding an EGM next Thursday (2/12/15) to vote
+in a new treasurer! Time will be confirmed in the next few days.
 
-If you are interested in running for the position, please email the
-committee. The treasurer is expected to be well organised, and to have a
-deep passion for filling in forms weekly.
+If you are interested in running for the position, please email the committee.
+The treasurer is expected to be well organised, and to have a deep passion for
+filling in forms weekly.
 
 Look forward to seeing you there on Thursday!
 
 Best regards from myself and the rest of committee,
 
 Noah Donnelly (cac)
+
 1st Year Computational Problem Solving & Software Development
+
 Redbrick Secretary 2015/16
diff --git a/content/post/2015-08/index.md b/content/post/2015-08/index.md
new file mode 100644
index 0000000..61981c2
--- /dev/null
+++ b/content/post/2015-08/index.md
@@ -0,0 +1,79 @@
+---
+author: butlerx
+banner: javaScriptText.jpg
+date: '2015-11-30'
+tags:
+  - competitive programming
+  - JavaScript
+  - EGM
+title:
+  'Week 11: Intro to Competitive Programming, Webmaster: Advanced JavaScript &
+  EGM'
+---
+
+Sorry for the delayed announce, cac is currently dead (meaning we have no idea
+where he is), we hope he turns up soon!
+
+- Introduction to Competitive Programming - Thuesday 1/12 - 5pm - LG25
+- Webmaster: Advanced Javascript - Wednesday 2/12 - 2pm - LG25
+- EGM - Thursday 3/12 - 5pm - CG05
+
+ 
+
+## Introduction to Competitive Programming
+
+- Date: Tuesday 1/12
+- Time: 5pm - 6pm
+- Location: LG25
+- More info: https://www.facebook.com/events/194492020892876/
+
+Join us on Tuesday as Gary Conway, the organiser of the All-Ireland Programming
+Olympiad and a DCU computing department sysadmin, gives us an introduction to
+competitive programming. He'll cover what's involved, how to get started, and
+will have loads of time for a good old-fashioned Q&A. If you want to learn how
+to bolster our CV with competitive programming feats or jet off to exotic places
+to compete in exciting contests, then come to this talk to figure out what's
+what!
+
+## Webmaster: Advanced JavaScript
+
+- Date: Wednesday 2/12
+- Time: 2pm - 4pm
+- Location: LG25
+- More info: https://www.facebook.com/events/1522888658021968/
+
+Not completely scared off JavaScript after last week? Fair play to you! Well
+then let's try this again, this week come on down to LG25 again for Advanced
+JavaScript (with maybe a few of the basics that we missed last week) with one of
+our helpful elves (also known as admins) voy! He'll be taking us on a magical
+journey through the mysterious void that is object orientated programming.
+Topics include objects, prototyping and (more) async!
+
+## Redbrick EGM
+
+- Date: Thursday 3/12
+- Time: 5pm - 6pm
+- Location: CG05
+- More info: https://www.facebook.com/events/512468695591467/
+
+With a heavy heart and an uncontrollable fit of giggles, I'm sorry to say that
+our beloved Gillian (socks) has resigned from her position as treasurer. That
+means we get to have the fun of holding an EGM this Thursday to vote in a new
+treasurer!
+
+If you are interested in running for the position, please email the committee.
+The treasurer is expected to be well organised, and to have a deep passion for
+filling in forms weekly.
+
+Don't forget to steal a sordid glance at our calendar and social media pages:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+Best regards from myself and the rest of the Committee,
+
+Cian Butler
+
+Helpdesk 2014/16
diff --git a/source/_posts/2015-08/javaScriptText.jpg b/content/post/2015-08/javaScriptText.jpg
similarity index 100%
rename from source/_posts/2015-08/javaScriptText.jpg
rename to content/post/2015-08/javaScriptText.jpg
diff --git a/content/post/2016-02/index.md b/content/post/2016-02/index.md
new file mode 100644
index 0000000..10294b5
--- /dev/null
+++ b/content/post/2016-02/index.md
@@ -0,0 +1,71 @@
+---
+author: cac
+banner: webDesign.png
+date: '2016-03-7'
+tags:
+  - irlcpc
+  - web design
+  - mps
+title: 'Week 18.1: Web Design | IrlCPC Signup'
+---
+
+Hello my lovelies,
+
+Because Redbrick is _so great_, and because I am _so inefficient_, there are
+even more events in the near future that I didn't mention in the earlier email!
+Whooo!
+
+ 
+
+## Web Design with MPS
+
+- Date: Tuesday 08/03 (tomorrow!)
+- Time: 5pm - 6pm
+- Location: C102
+
+Our friends in the Media Production Society are joining us to learn about
+building websites and making moolah. Our very own Aaron (~devoxel) will be
+looking at the basics of HTML and CSS and making new media-producing friends in
+the shiny Mac labs in the Henry Grattan, with plans to continue tainting them
+with web development knowledge next week too. Pop over if you want to learn how
+to make a sexy site, hug a sexy committee member, or just have some fun!
+
+If you have anything in particular you want Aaron to talk about, send an
+all-caps email to devoxel at redbrick.dcu.ie.
+
+## Irish Collegiate Programming Contest (IrlCPC)
+
+- Date: Saturday 02/04
+- Time: 9.30am - 6.30pm
+- Location: University College Cork
+- More info: http://acm.ucc.ie/irlcpc
+
+If you want to take your programming to the next level, then this is the event
+for you. The IrlCPC is a programming competition hosted by the UCC ACM Student
+Chapter, and is the place to be to meet the who's who of the Irish programming
+red carpet. Teams of 3 ready for the event need to register before the 16th of
+March.
+
+Redbrick will be sending a contingent, and will be paying some of the costs
+involved! The extent of the funding will depend on numbers; if you're interested
+in competing, then email your friendly neighbourhood Redbrick committee. There
+are limited spaces however, so get your name in quick if you want to show off
+your sick programming skillz!
+
+Don't forget to hurriedly write a second announce email and check out our
+calendar and social media pages:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+Le gach dea-ghuí, agus dea-memes, uaimse agus ón gcoiste ar fad,
+
+Noah Donnelly (~cac)
+
+1st Year Computational Problem Solving & Software Development
+
+Redbrick Secretary 2015/16
+
+Total nerd lol
diff --git a/source/_posts/2016-02/webDesign.png b/content/post/2016-02/webDesign.png
similarity index 100%
rename from source/_posts/2016-02/webDesign.png
rename to content/post/2016-02/webDesign.png
diff --git a/source/_posts/2016-03/bash.jpg b/content/post/2016-03/bash.jpg
similarity index 100%
rename from source/_posts/2016-03/bash.jpg
rename to content/post/2016-03/bash.jpg
diff --git a/content/post/2016-03/index.md b/content/post/2016-03/index.md
new file mode 100644
index 0000000..e684ecc
--- /dev/null
+++ b/content/post/2016-03/index.md
@@ -0,0 +1,86 @@
+---
+author: cac
+banner: bash.jpg
+date: '2016-03-14'
+tags:
+  - bash
+  - helpdesk
+  - birthday
+  - irlcpc
+title: 'Week 19: Bash Scripting'
+---
+
+Hey all,
+
+The leprechauns are frolicking in the meadows, and the warm Spring sun is
+bothering people in other countries. That means that this week is the perfect
+week for more Redbrick networking wizardry! Helpdesk is going to be dishing out
+the deets on console scripting in Linux, so make sure you appear if you want to
+learn how to make your hard drive eject automatically every sixteen minutes
+while your speakers beep in Morse code.
+
+ 
+
+## Helpdesk: Bash Scripting
+
+- Date: Wednesday 16/03
+- Time: 2pm
+- Location: LG26
+- More info: https://www.facebook.com/events/483410278526920/
+
+Have you seen the cool kids who have those .sh files littering up their
+repositories? Are you jealous of the h4ck3rs automating their builds and making
+their computers obey their every whim? Maybe scripting is for you. Helpdesk is
+going to teach the ups and downs and ins and outs of bash scripting, so you can
+be the hacker you dream to be. If you ask nicely, they might also teach you how
+to make your console text green and your background black.
+
+## Irish Collegiate Programming Contest (IrlCPC)
+
+- Date: Saturday 02/04
+- Time: 9.30am - 6.30pm
+- Location: University College Cork
+- More info: http://acm.ucc.ie/irlcpc
+
+Your university needs YOU to write some algorithms and mash on a keyboard! If
+you want to take your programming to the next level, then this is the event for
+you. The IrlCPC is a programming competition hosted by the UCC ACM Student
+Chapter, and is the place to be to meet the who's who of the Irish programming
+red carpet. Teams of 3 ready for the event need to register before the 16th of
+March (this Wednesday).
+
+Redbrick will be sending a contingent, and will be paying some of the costs
+involved! The extent of the funding will depend on numbers; if you're interested
+in competing, then email your friendly neighbourhood Redbrick committee. There
+are limited spaces however, so get your name in quick if you want to show off
+your sick programming skillz!
+
+## Redbrick 20th Birthday
+
+- Date: 09/04
+- Location: Opium Cafe, Wexford Street, Dublin
+- More info: http://birthday.redbrick.dcu.ie/
+
+Get your airhorns ready and your finger guns poised! The 20th birthday of your
+favourite networking society is around the corner! On the 9th of April, meet the
+Redbrick veterans that aren't behind bars, party with two decades of dodgy
+admins, and find your true love! Help us in taking the piddle of the mistakes
+and crying about the successes of the past two decades of networking glory. The
+party to end all parties approaches, join us in making it as memorable as the
+past 20 years have been! Sign up at the link above to reserve a piece of
+birthday cake!
+
+Don't forget to write a birthday card to our calendar and social media pages:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+Best regards from myself and the rest of the Redbrick committee,
+
+Noah Donnelly (~cac)
+
+1st Year Computational Problem Solving & Software Development
+
+Redbrick Secretary 2015/16
diff --git a/source/_posts/2016-04/downtime.jpg b/content/post/2016-04/downtime.jpg
similarity index 100%
rename from source/_posts/2016-04/downtime.jpg
rename to content/post/2016-04/downtime.jpg
diff --git a/source/_posts/2016-04.md b/content/post/2016-04/index.md
similarity index 65%
rename from source/_posts/2016-04.md
rename to content/post/2016-04/index.md
index 46482bc..e6476c7 100644
--- a/source/_posts/2016-04.md
+++ b/content/post/2016-04/index.md
@@ -1,26 +1,26 @@
 ---
-title: 'Downtime for Maintenance and Upgrades -	Saturday 19/03/16'
-date: '2016-03-16'
 author: koffee
 banner: downtime.jpg
+date: '2016-03-16'
 tags:
- - downtime
- - upgrades
+  - downtime
+  - upgrades
+title: "Downtime for Maintenance and Upgrades -\tSaturday 19/03/16"
 ---
 
 Evenin' All,
 
 Just a quick word to let you know that we'll be doing some upgrade works
-(physical and application) on servers this weekend. We'll, probably, be
-starting at 11a.m. on Saturday give or take a few minutes.
+(physical and application) on servers this weekend. We'll, probably, be starting
+at 11a.m. on Saturday give or take a few minutes.
 
-All servers will be affected by these updates and we'll be stopping
-services and doing cascading updates.
+All servers will be affected by these updates and we'll be stopping services and
+doing cascading updates.
 
 Apologies for any inconvenience caused.
 
 Regards,
 
 Richard Walsh (koffee)
-Redbrick Admin
 
+Redbrick Admin
diff --git a/source/_posts/2016-05/arduino.png b/content/post/2016-05/arduino.png
similarity index 100%
rename from source/_posts/2016-05/arduino.png
rename to content/post/2016-05/arduino.png
diff --git a/content/post/2016-05/index.md b/content/post/2016-05/index.md
new file mode 100644
index 0000000..007ea12
--- /dev/null
+++ b/content/post/2016-05/index.md
@@ -0,0 +1,117 @@
+---
+author: cac
+banner: arduino.png
+date: '2016-03-28'
+tags:
+  - intel
+  - workshop
+  - AGM
+  - table quiz
+  - birthday
+thumbnail: intel.png
+title: "Week 21: Being an Embedded Software Engineer |\tAGM | Table Quiz!"
+---
+
+Hi all,
+
+O how I have missed thee; the glint of your sharp reading eyes, the disappointed
+sigh as you see my jokes, the swear words you mutter as you delete my
+eagerly-written message. You may have noticed that there was no announce last
+week; as you know, Redbrick aren't very good with any of that computer business,
+and our mailing list interface was down. But alas, my love, it works now, and
+just in time for one of the most exciting weeks of the year! Here's what's on
+this week:
+
+- Being: An Embedded Software Engineer - Wednesday 30/03 - C166 - 3pm
+- Redbrick AGM - Thursday 31/03 - QG21 - 5.30pm
+- Annual Table Quiz - Thursday 31/03 - Nubar - 7pm
+
+ 
+
+## Being: An Embedded Software Engineer
+
+- Date: Wednesday 30/03
+- Time: 3pm
+- Location: C166
+- More info: https://www.facebook.com/events/1573499596309955/
+- Sign up: http://events.redbrick.dcu.ie/intel/
+
+Real life Intel embedded software engineers are coming to DCU! They work
+developing a hardware abstraction layer for Intel Quark based microcontroller
+products, and will be providing an insight into what is involved in being an
+embedded software engineer. There will also be a talk from an Intel Ireland
+Quark Solutions Division hiring representative about career opportunities for
+graduates. Finally, get pumped for the workshop, including some hands-on
+experience programming an Intel® Quark D2000 Microcontroller.
+
+If you want to know what the IoT is or get excited at the thought of embedding
+some systems, then you'll enjoy this event as much as I enjoy a good Easter
+omelette.
+
+## Redbrick AGM
+
+- Date: Thursday 31/03
+- Time: 5.30pm
+- Location: QG21
+- More info: https://www.facebook.com/events/1050611171676971/
+
+The Redbrick throne is up for grabs! On Thursday the 31st, your chance will come
+to kill off the old committee and replace it with a newer, shinier model. Are
+you dissatisfied with the comfiness of the chair? Are you upset about the legs
+on the helpdesk? Do you (_gasp_) dislike the announces of the tearful secretary?
+Now is the time to put yourself forward, and leap onto the stage of the Redbrick
+theatre. Anyone can stand for a committee position, no matter how much they like
+Windows, and we'll welcome them with open arms. We swear. If you want to run for
+the positions of helpdesk, admin, or webmaster, please email us in advance so we
+can prepare the exams and sharpen our knives.
+
+## Annual Table Quiz
+
+- Date: Thursday 31/03
+- Time: 7pm
+- Location: Nubar
+- More info: https://www.facebook.com/events/1063804460327814/
+
+After the power struggles and family feuds of the AGM, we'll all come together
+as friends (and maybe more `<3`) at the infamous Redbrick quiz, at 6.30pm. There
+will be great prizes on offer, including a free holiday (_applause_), an
+exclusive t-shirt (_wow_), and a free meal at everyone's favourite burger vendor
+(_reader goes wild_). There will be a lineup of stellar questions from
+questionable people, and even a picture round for any competitors who can't
+read, so make sure you grab your awkward neighbours and enter a team!
+
+## Redbrick 20th Birthday
+
+- Date: Saturday 09/04
+- Time: 7pm
+- Location: Opium Cafe, Wexford Street, Dublin
+- More info: http://birthday.redbrick.dcu.ie/
+
+Get your alibi ready, because the 20th birthday of your favourite networking
+society is around the corner, and it's going to be as slick as a sweaty
+sysadmin! On the 9th of April, meet the Redbrick veterans that aren't behind
+bars, party with two decades of dodgy admins, and find your true love! Help us
+in taking the piddle of the mistakes and crying about the successes of the past
+two decades of networking glory. The party to end all parties approaches, join
+us in making it as memorable as the past 20 years have been! Sign up at the link
+above to reserve a piece of birthday cake!
+
+If you would like to record a few seconds sharing memories about Redbrick, or
+would like to bash Redbrick on video, get in touch! We can record you, or you
+can make a recording yourself and throw it our way. Video or audio is fine, and
+we'd very much appreciate anything you want to say.
+
+Don't forget to go on an Easter egg hunt on our calendar and social media pages:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+Best regards from myself and the rest of the Redbrick committee,
+
+Noah Donnelly (~cac)
+
+1st Year Computational Problem Solving & Software Development
+
+Redbrick Secretary 2015/16
diff --git a/source/_posts/2016-05/intel.png b/content/post/2016-05/intel.png
similarity index 100%
rename from source/_posts/2016-05/intel.png
rename to content/post/2016-05/intel.png
diff --git a/source/_posts/2016-week-10-announce/2016-week-10-announce.png b/content/post/2016-week-10-announce/2016-week-10-announce.png
similarity index 100%
rename from source/_posts/2016-week-10-announce/2016-week-10-announce.png
rename to content/post/2016-week-10-announce/2016-week-10-announce.png
diff --git a/content/post/2016-week-10-announce/index.md b/content/post/2016-week-10-announce/index.md
new file mode 100644
index 0000000..fe2ad57
--- /dev/null
+++ b/content/post/2016-week-10-announce/index.md
@@ -0,0 +1,65 @@
+---
+author: oskar
+banner: 2016-week-10-announce.png
+date: '2016-11-20 14:37:18'
+tags:
+  - Burnout
+  - Talks
+  - Raspberry Pi
+  - Helpdesk
+  - Secret Santa
+title:
+  Week 10 | Burnout, How to Recognise It | Helpdesk, Raspberry Pi Projects |
+  Redbrick Secret Santa
+---
+
+Dear Redbrick members,
+
+It's week 10! Double digits! We did it friends, we survived the single digit
+weeks and are now in double digit bliss. Here are the events we're throwing in
+celebration:
+
+ 
+
+## Burnout: How to Recognise it
+
+- When: Monday 28th, 5pm
+- Where: CG86
+- More information here: https://www.facebook.com/events/902199496580631/
+
+Mental Health has often been a taboo subject, but it's something that can affect
+us all at some time. We've got a veteran Engineer and Manager who's worked his
+way through the computing industry for nearly 20 years. John Looney (valen@rb)
+will talk about how to recognise and triage burnout. Recognising there's a
+problem can be half of the battle to helping alleviate its effects, paired with
+some tips on how to combat it you'll hopefully leave this talk with an arsenal
+to stave off burnout as you go through life.
+
+## Helpdesk: Raspberry Pi Projects
+
+- When: Wednesday 23rd, 3-4pm
+- Where: LG25
+- More information here: https://www.facebook.com/events/191242068000680/
+
+So you want to buy a pi but people keep asking you, 'what can you do with
+that?' - Well, we got pis and now you need projects. Drop by and hear the
+ever-glowing helpdesk give you project ideas and a basis to get you started.
+
+## RedBrick Secret Santa:
+
+RedBrick is doing a secret Santa (you're anonymously given the name of a person
+to buy a gift for and someone else is made to buy you a gift) the gifts will be
+exchanged at our Christmas event in the last week of the semester - where maybe
+if you're all extra good, Santa Claus will make an appearance. If you want to
+sign up to the secret Santa the link is: events.redbrick.dcu.ie/christmas
+
+Here’s our social media in case you miss us:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: http://tinyurl.com/redbrickCalendar
+
+Have a hoppin' week you guys.
+
+- Oskar McDermott (oskar)
diff --git a/source/_posts/2016-week-3-announce/2016-week-3.png b/content/post/2016-week-3-announce/2016-week-3.png
similarity index 100%
rename from source/_posts/2016-week-3-announce/2016-week-3.png
rename to content/post/2016-week-3-announce/2016-week-3.png
diff --git a/content/post/2016-week-3-announce/index.md b/content/post/2016-week-3-announce/index.md
new file mode 100644
index 0000000..90ec985
--- /dev/null
+++ b/content/post/2016-week-3-announce/index.md
@@ -0,0 +1,51 @@
+---
+author: cac
+banner: 2016-week-3.png
+date: '2016-10-03'
+tags:
+  - freshers
+  - EGM
+title: 'Week 3: The brickies are back in town!'
+---
+
+Summer is reaching its close- it's time to break up with the sun, and rebound
+with Redbrick, DCU's favourite networking society! I'd like to give our new
+members a warm welcome, and our returning members a grudging acknowledgement.
+
+While watching DCU be torn apart one building at a time is entertaining, we have
+some even more exciting things going on in Redbrick in the coming days:
+
+- Intro to Redbrick - Wednesday 05/10 - 3pm - LG25
+- EGM - Wednesday 12/10 - 3pm
+
+ 
+
+## Intro to Redbrick
+
+- Date: Wednesday 05/10/16
+- Time: 3pm
+- Location: LG25
+- More info: https://facebook.com/events/1788596538064082
+
+Redbrick by name sounds like an architectural society, so why do we keep hanging
+around computers? Join us on Wednesday to find out why Redbrick doesn't design
+buildings, hear our plans for the year, learn some of our long and sexy history,
+and ask what exactly Redbrick will do for you.
+
+## EGM (and pizza)
+
+- Date: Wednesday 12/10/16
+- Time: 3pm
+- More info: https://facebook.com/events/1779386902315301
+
+In 10 days time (and not this week, as the crafty SU will lead you to believe),
+you'll have your chance to get thrown in the deep end! At the Redbrick EGM you
+will get to vote on who will take the committee positions of Secretary,
+Webmaster, Helpdesk, Admin, Public Relations Officer, First Year Rep, and
+Cross-Campus Liaison Officer. We will also supply you with pizza - because
+you're worth it.
+
+If you want to be involved in DCU's most active and attractive society, send us
+an email with which of the above positions you'd like to run for. You'll need to
+do an exam beforehand for the positions of Webmaster, Helpdesk, and Admin, to
+make sure you're sufficiently incompetent for the job. Don't be shy, apply!
diff --git a/source/_posts/2016-week-4-announce/2016-week-4-announce.png b/content/post/2016-week-4-announce/2016-week-4-announce.png
similarity index 100%
rename from source/_posts/2016-week-4-announce/2016-week-4-announce.png
rename to content/post/2016-week-4-announce/2016-week-4-announce.png
diff --git a/content/post/2016-week-4-announce/index.md b/content/post/2016-week-4-announce/index.md
new file mode 100644
index 0000000..0650c93
--- /dev/null
+++ b/content/post/2016-week-4-announce/index.md
@@ -0,0 +1,67 @@
+---
+author: butlerx
+banner: 2016-week-4-announce.png
+date: '2016-10-10 09:40:26'
+tags:
+  - EGM
+  - TechWeekDCU
+  - UKIEPC
+title: Week 4 EGM | UKIEPC | Techweek
+---
+
+Hey guys
+
+Was great to see so many new faces at our intro to redbrick last week. we hope
+to see you all and familiar faces at our EGM this week. Speaking of, let's move
+on to the next couple weeks.
+
+- EGM - C104 - Wednesday 15:00
+
+ 
+
+## EGM
+
+- Date: Wednesday 12/10/16
+- Time: 15:00
+- Location: C104
+- More info: https://facebook.com/events/1779386902315301
+
+It's that time of year again to get some fresh faces on to the committee. The
+open positions are First year rep, PRO, Admin, Helpdesk and Webmaster. Just a
+reminder if you want Helpdesk, Admin or Webmaster you need to email so as to
+take the exam.
+
+## UKIEPC 2016
+
+- Date: Tuesday 29/10/16
+- More info:
+  http://www.computing.dcu.ie/event/ukireland-intercollegiate-programming-competition-ukiepc
+
+The UKIEPC 2016, the regional ACM programming competition for UK & Ireland, will
+be held on the 29th of October in DCU. Late registration closes on the 21st
+October. If you want to be in it to win it, see here:
+http://www.computing.dcu.ie/event/ukireland-intercollegiate-programming-competition-ukiepc
+
+## Techweek
+
+- Date: 24th to 28th of October
+- More info: http://techweek.dcu.ie
+
+It's almost time for Redbrick's biggest event of the year Techweek. A week of
+talks from big companies and smart people. It's shaping up to be an amazing week
+of great talks. So keep an eye for more info soon.
+
+Hope to see all of you this week. Find us on the internet
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
+
+BYE GUYS ITS BEEN FUN
+
+Cian Butler (butlerx)
+
+Redbrick Secretary 2016-2017
+
+Computer Applications and Software Engineering - Year 4
diff --git a/source/_posts/2016-week-5-announce/IntroLinux.png b/content/post/2016-week-5-announce/IntroLinux.png
similarity index 100%
rename from source/_posts/2016-week-5-announce/IntroLinux.png
rename to content/post/2016-week-5-announce/IntroLinux.png
diff --git a/source/_posts/2016-week-5-announce.md b/content/post/2016-week-5-announce/index.md
similarity index 53%
rename from source/_posts/2016-week-5-announce.md
rename to content/post/2016-week-5-announce/index.md
index 2412be9..3358dc5 100644
--- a/source/_posts/2016-week-5-announce.md
+++ b/content/post/2016-week-5-announce/index.md
@@ -1,27 +1,29 @@
 ---
-title: Week 5 EGM | UKIEPC | Intro to Linux | Pycon
-banner: IntroLinux.png
-date: 2016-10-17 16:44:26
 author: oskar
+banner: IntroLinux.png
+date: '2016-10-17 16:44:26'
 tags:
   - EGM
   - UKIEPC
   - Linux
   - Pycon
+title: Week 5 EGM | UKIEPC | Intro to Linux | Pycon
 ---
 
 Dear Redbrick Crew,
 
-My name is Oskar and I'm your new bad-boy secretary.
-My first action as secretary is to inform you of all the events and goings
-on happening in Redbrick. Let’s hit it.
+My name is Oskar and I'm your new bad-boy secretary. My first action as
+secretary is to inform you of all the events and goings on happening in
+Redbrick. Let’s hit it.
 
  
 
 ## EGM:
-Redbrick held its EGM on Wednesday, electing a new committee and coming to
-the conclusion that pineapple on pizza is a-okay.
-The new additions to the committee are as follows:
+
+Redbrick held its EGM on Wednesday, electing a new committee and coming to the
+conclusion that pineapple on pizza is a-okay. The new additions to the committee
+are as follows:
+
 - Admin - Cormac Smartt (pints)
 - First year rep - George Burac (georgey)
 - Helpdesk - Tom Doyle (greenday)
@@ -31,61 +33,68 @@ The new additions to the committee are as follows:
 - Webmaster - Cian Butler (butlerx)
 
 ## UKIEPC:
+
 - When: Actual event Saturday 29th October 11am – 4pm
 - Registration: 26th October
 - Where: Hosted in DCU School of Computing
 - More information here:
-http://www.computing.dcu.ie/event/ukireland-intercollegiate-programming-competition-ukiepc
+  http://www.computing.dcu.ie/event/ukireland-intercollegiate-programming-competition-ukiepc
 
-The UKIEPC is the UK & Ireland Intercollegiate Programming Competition run
-in the DCU School of Computing, sponsored by Arista, in which
-undergraduate students are given five hours to solve ten problems of
-varying difficulties.
+The UKIEPC is the UK & Ireland Intercollegiate Programming Competition run in
+the DCU School of Computing, sponsored by Arista, in which undergraduate
+students are given five hours to solve ten problems of varying difficulties.
 Prizes for top 3 Irish UKIEPC teams are:
 
-1. Trip to Bath to compete in the NWERC programming competition
-2. €300 Amazon voucher
-3. €150 Amazon voucher
-It’s free and apparently there’s t-shirts and pizzas (not sure about
-whether or not they’re with pineapple) given to the entrants so I would
-definitely recommend coming.
+1.  Trip to Bath to compete in the NWERC programming competition
+2.  €300 Amazon voucher
+3.  €150 Amazon voucher
+
+It’s free and apparently there’s t-shirts and pizzas (not sure about whether or
+not they’re with pineapple) given to the entrants so I would definitely
+recommend coming.
 
 ## Intro to Linux:
+
 - When: Wednesday 19th, 3-4pm.
 - Where: LG25
 - More information here: https://www.facebook.com/events/1787222271546156/
 
-Have you ever wondered how to install Linux but not lose your precious
-Windows or Mac OS?
+Have you ever wondered how to install Linux but not lose your precious Windows
+or Mac OS?
 
-Have you ever wanted something you were not afraid to break?
-Come to our new helpdesk team’s first ever workshop!
+Have you ever wanted something you were not afraid to break? Come to our new
+helpdesk team’s first ever workshop!
 
 ## PyCon Ireland 2016:
+
 - When: Saturday 5th – Sunday 6th November.
 - Where: Radisson Blu Royal Hotel Dublin
 - More information here: http://python.ie/pycon-2016/
 
-Python Ireland’s two day convention is back and this year features talks
-on Data Science Tools, Machine Learning, Data Visualisation and Cleaning
-Data on top of loads of python tutorials and workshops.
+Python Ireland’s two day convention is back and this year features talks on Data
+Science Tools, Machine Learning, Data Visualisation and Cleaning Data on top of
+loads of python tutorials and workshops.
 
-Finally, on Wednesday Startup Europe are hosting an event in DCU in their
-series of attending European universities to showcase the commitment
-universities have towards entrepreneurship and innovation. It’s taking
-place Wednesday 19th October in HG22 at 6:30pm.
-More information can be found here:
+Finally, on Wednesday Startup Europe are hosting an event in DCU in their series
+of attending European universities to showcase the commitment universities have
+towards entrepreneurship and innovation. It’s taking place Wednesday 19th
+October in HG22 at 6:30pm. More information can be found here:
 https://www.linkedin.com/pulse/join-us-startup-europes-sec2u-event-dublin-city-university-
 
-Also check out our social media pages to keep up to date with the day to
-day goings on of Redbrick.
+Also check out our social media pages to keep up to date with the day to day
+goings on of Redbrick.
+
 Twitter: @RedbrickDCU
+
 Facebook: https://www.facebook.com/dcuredbrick
+
 Snapchat: RedbrickDCU
+
 Google Calendar: http://tinyurl.com/redbrickCalendar
 
-That’s it from me this week. I’ll see you next week when I stuff another
-one of these newsletters down your chute.
-I hope you have a fantastic week.
+That’s it from me this week. I’ll see you next week when I stuff another one of
+these newsletters down your chute. I hope you have a fantastic week.
+
+Oskar McDermott (oskar)
 
- Oskar McDermott (oskar) // Redbrick Secretary 2016/17
+Redbrick Secretary 2016/17
diff --git a/content/post/2016-week-6-announce/index.md b/content/post/2016-week-6-announce/index.md
new file mode 100644
index 0000000..bc47aa1
--- /dev/null
+++ b/content/post/2016-week-6-announce/index.md
@@ -0,0 +1,56 @@
+---
+author: oskar
+banner: redbrickhalloween.png
+date: '2016-10-24 16:44:26'
+tags:
+  - Halloween
+  - UKIEPC
+  - helpdesk
+  - Pycon
+title: Week 6 How to Redbrick and Halloween
+---
+
+Dear Redbrick pals,
+
+As the nights are getting longer and Christmas lights begin to fill the streets
+of Dublin we can safely come to the conclusion that the mean nights of latish
+October have arrived.
+
+Luckily, Redbrick has loads of cool things going on to combat your onset winter
+blues:
+
+ 
+
+## HOW TO REDBRICK:
+
+- When: Wednesday 26th October 3pm – 4pm
+- Where: LG25
+- More information here: https://www.facebook.com/events/1324843697535442/
+
+If you’re like me and don’t know exactly why you joined redbrick or how to use
+it properly this is for you. The Helpdesk team are doing their second talk on
+how to get the most out of Redbrick’s array of services.
+
+## REDBRICK HALLOWEEN:
+
+- When: Thursday 27th October 7pm – 12am
+- Where: The Slipper
+- More information here: https://www.facebook.com/events/662443723929133/
+
+![Redbrick Halloween](./redbrickhalloween.png)
+
+Redbrick loves Halloween! Come celebrate it and have a few drinks with us in the
+Slipper. Fancy dress is optional but I speak on behalf of the whole committee in
+saying we’ll love people who dress up just a bit more than those who don’t.
+
+Also, as referenced in our last newsletter both PyCon and UKIEPC are coming up
+very shortly with the UKIEPC registration deadline being this Wednesday the 26th
+October and PyCon taking place the weekend after.
+
+On top of this, Accenture are running an event in DCU on Wednesday 1pm – 3pm
+about potential careers in STEM. More info found here:
+https://www.eventbrite.com/e/accenture-stem-event-dcu-tickets-28727605040
+
+Hope y’all had a fab week and I’ll see you soon.
+
+Oskar McDermott (oskar)
diff --git a/source/_posts/2016-week-6-announce/redbrickhalloween.png b/content/post/2016-week-6-announce/redbrickhalloween.png
similarity index 100%
rename from source/_posts/2016-week-6-announce/redbrickhalloween.png
rename to content/post/2016-week-6-announce/redbrickhalloween.png
diff --git a/source/_posts/2016-week-8-announce/2016-week-8-announce.png b/content/post/2016-week-8-announce/2016-week-8-announce.png
similarity index 100%
rename from source/_posts/2016-week-8-announce/2016-week-8-announce.png
rename to content/post/2016-week-8-announce/2016-week-8-announce.png
diff --git a/content/post/2016-week-8-announce/index.md b/content/post/2016-week-8-announce/index.md
new file mode 100644
index 0000000..e5015c8
--- /dev/null
+++ b/content/post/2016-week-8-announce/index.md
@@ -0,0 +1,77 @@
+---
+author: oskar
+banner: 2016-week-8-announce.png
+date: '2016-11-04 14:37:12'
+tags:
+  - Bash
+  - Data Hack
+  - FOSDEM
+  - Talks
+title: Week 8 | Bash Scripting | AIB DataHack | Buying a Laptop | FOSDEM
+---
+
+Dear Redbrick Crew,
+
+We're already up to week 8 which means we're two thirds of the way through
+semester 1. To energise you for the final third, Redbrick has got some hopping
+things going on:
+
+ 
+
+## Bash Scripting with Helpdesk:
+
+- When: Wednesday 9th, 3-4pm.
+- Where: LG25
+- More information here: https://www.facebook.com/events/1805312056375861/
+
+Time to learn some bash with Redbrick's very own Bonnie and Clyde-esque
+helpdesk. Get some scripts going to make those repetitive tasks that much
+easier, maybe get some programs up and running at start-up or just make backing
+up that much nicer!
+
+## AIB Data Hack:
+
+- When: Saturday 12th
+- Where: AIB Bankcentre, Ballsbridge, Dublin 4
+- More information here: https://www.aibdatahack.com/
+
+This weekend AIB is holding two 12 hour events simultaneously, a Datathon and a
+Hackathon. There's loads of prizes for the best teams and good buzz all-round.
+
+## Buying a Laptop:
+
+- When: Tuesday 15th, 5-6pm
+- Where: LG25
+- More information here: https://www.facebook.com/events/574819529368242/
+
+Lorcan (zergless) is doing a talk on what to look into when buying a laptop,
+this will be especially helpful for people looking to get the most of their
+money while still getting the laptop they need.
+
+## FOSDEM:
+
+- When: 4th & 5th February 2017
+- Where: Brussels, Belgium
+- Registration: http://events.redbrick.dcu.ie/fosdem/
+
+Should you wish to join Redbrick on our trip to Brussels for FOSDEM (Free and
+Open Source Software Developers' European Meeting), a two day event filled with
+loads of talks, hacking sessions, open discussions and much much more, please
+sign up ASAP as there are very few spaces remaining.
+
+If you bought tickets to go to PyCon this past weekend, could you please email
+our treasurer Ross (sully - email: sully@redbrick.dcu.ie) about potential
+rebate. Also as a reminder, Github offer a free student pack that is packed to
+the brim with cool stuff that you might need at some point (why turn down free
+domains and hosting amirite). The link to all the free stuff is:
+https://education.github.com/pack That's it from me this week - I hope you have
+a great week and I'll hopefully see all of you around?
+
+Here's our social media in case you had forgotten:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: http://tinyurl.com/redbrickCalendar
+
+Oskar McDermott (oskar)
diff --git a/source/_posts/2016-week-9-announce/2016-week-9-announce.jpg b/content/post/2016-week-9-announce/2016-week-9-announce.jpg
similarity index 100%
rename from source/_posts/2016-week-9-announce/2016-week-9-announce.jpg
rename to content/post/2016-week-9-announce/2016-week-9-announce.jpg
diff --git a/content/post/2016-week-9-announce/index.md b/content/post/2016-week-9-announce/index.md
new file mode 100644
index 0000000..2e7a8c7
--- /dev/null
+++ b/content/post/2016-week-9-announce/index.md
@@ -0,0 +1,75 @@
+---
+author: oskar
+banner: 2016-week-9-announce.jpg
+date: '2016-11-11 14:37:18'
+tags:
+  - Burnout
+  - Talks
+  - Networking
+  - Helpdesk
+  - Secret Santa
+title:
+  Week 9 Buying A Laptop | Raspberry Pi, Networking 101 | Burnout, How to
+  Recognise and Avoid it
+---
+
+Dear Redbrick Crew,
+
+It’s week 9 which means that it’s now so frequently dark I don’t remember the
+last time I saw actual day-light. Here are some events to hopefully perk up your
+spirits:
+
+ 
+
+## Buying a Laptop:
+
+- When: Tuesday 15th, 5-6pm
+- Where: LG25
+- More information here: https://www.facebook.com/events/574819529368242/
+
+Reminder that Lorcan (zergless) is doing a talk on what to look into when buying
+a laptop, this will be especially helpful for people looking to get the most of
+their money while still getting the laptop they need and avoiding buying an
+incredibly expensive paperweight.
+
+## Helpdesk: Networking with Raspberry Pi
+
+- When: Wednesday 16th, 3-4pm
+- Where: LG25
+- More information here: https://www.facebook.com/events/966801600091374/
+
+Time to dive right in with raspberry pi and networking. What better way to start
+than with our cute and tiny pis. Come along to get an intro to networking and
+get to grips with what raspberry pi and networking could mean for you.
+
+## Burnout: How to Recognise it
+
+- When: Monday 28th, 5pm
+- Where: TBD
+- More information here: https://www.facebook.com/events/902199496580631/
+
+John Looney from Google will be doing a talk on Burnout, covering a range of
+topics from defining it, all the way to its prevention and cure.
+
+## RedBrick Secret Santa:
+
+RedBrick is doing a secret Santa (you're anonymously given the name of a person
+to buy a gift for and someone else is made to buy you a gift) the gifts will be
+exchanged at our Christmas event in the last week of the semester - where maybe
+if you're all extra good, Santa Claus will make an appearance. If you want to
+sign up to the secret Santa the link is: events.redbrick.dcu.ie/christmas
+
+Also, as a reminder to anybody going on the FOSDEM trip, the payment deadline is
+this Wednesday the 16th. Payment details can be found in the email sent out to
+everyone by Cormac (pints).
+
+As always, I hope you have a lovely week.
+
+Here’s our social media in case you miss us:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: http://tinyurl.com/redbrickCalendar
+
+Oskar McDermott (oskar)
diff --git a/content/post/2017-AGM.md b/content/post/2017-AGM.md
new file mode 100644
index 0000000..16690f5
--- /dev/null
+++ b/content/post/2017-AGM.md
@@ -0,0 +1,24 @@
+---
+author: butlerx
+date: '2017-04-06 09:00:27'
+tags:
+  - AGM
+title: AGM Results
+---
+
+Dear Redbrick members,
+
+Redbrick would like to introduce our new committee and wish them good luck in
+the next year.
+
+- Chairperson: Terry Bolt (tbolt)
+- Secretary: Wojtek Bednarzak (voy)
+- Treasurer: Ciara Godwin (hexagon)
+- Public Relations Officer: Chris Dowling (winesnob)
+- Events Officer: James Mc Dermott (mctastic)
+- System Administrator: Alex Mcgrath Kraak (akraak)
+- System Administrator: Cormac Smartt (pints)
+- System Administrator: Tom Doyle (greenday)
+- Webmaster: Ben McMahon (mcmahon)
+- Helpdesk: Sahil Mehra (pr0n)
+- Helpdesk: Michal Durinik (mikello)
diff --git a/content/post/2017-EGM.md b/content/post/2017-EGM.md
new file mode 100644
index 0000000..cd415a2
--- /dev/null
+++ b/content/post/2017-EGM.md
@@ -0,0 +1,25 @@
+---
+author: winesnob
+date: '2017-11-08 21:38:37'
+tags:
+  - EGM
+title: EGM Results
+---
+
+Dear Redbrick members,
+
+Redbrick would like to introduce our new committee members along with the old
+ones... and wish them good luck.
+
+- **Chairperson**: Terry Bolt (tbolt)
+- **Secretary**: Chris Dowling (winesnob)
+- **Treasurer**: Ciara Godwin (hexagon)
+- **Public Relations Officer**: Josh Malone (sangreal)
+- **Events Officer**: James Mc Dermott (mctastic)
+- **System Administrator**: Alex Mcgrath Kraak (akraak)
+- **System Administrator**: Cormac Smartt (pints)
+- **System Administrator**: Tom Doyle (greenday)
+- **Webmaster**: Ben McMahon (mcmahon)
+- **Helpdesk**: Nevan Oman Crowe (branch)
+- **Helpdesk**: Cliodhna Harrison (thegirl)
+- **First Year Liason Officer**: Anthony Doran (albino)
diff --git a/source/_posts/2017-Week-2-announce/E+C-poster-banner.png b/content/post/2017-Week-2-announce/E+C-poster-banner.png
similarity index 100%
rename from source/_posts/2017-Week-2-announce/E+C-poster-banner.png
rename to content/post/2017-Week-2-announce/E+C-poster-banner.png
diff --git a/source/_posts/2017-Week-2-announce.md b/content/post/2017-Week-2-announce/index.md
similarity index 79%
rename from source/_posts/2017-Week-2-announce.md
rename to content/post/2017-Week-2-announce/index.md
index 927732d..a046aa8 100644
--- a/source/_posts/2017-Week-2-announce.md
+++ b/content/post/2017-Week-2-announce/index.md
@@ -1,25 +1,26 @@
 ---
-title: Week 2 | Welcome | EGM | Intro to Redbrick
-date: 2017-09-26 22:07:50
 author: voy
 banner: E+C-poster-banner.png
+date: '2017-09-26 22:07:50'
 tags:
   - EGM
   - Freshers
   - Ball
+title: Week 2 | Welcome | EGM | Intro to Redbrick
 ---
+
 Dear Brickies, old and new,
 
 First of all, we would like to welcome all new members to Redbrick, the best
 society in DCU, holding strong since 1996.
 
-
+ 
 
 ## Intro To Redbrick
 
 To get you started, we have a n00b friendly introduction session into what
-Redbrick does, why you should care, and how to connect to Redbrick to be part
-of the hipster IRC squad. The talk will be held on Wednesday, 2017-09-27 16:00
+Redbrick does, why you should care, and how to connect to Redbrick to be part of
+the hipster IRC squad. The talk will be held on Wednesday, 2017-09-27 16:00
 IST.  
 https://www.facebook.com/events/134674780502310
 
@@ -34,9 +35,8 @@ Week 3, on Wed 2017-10-04 at 17:00
 
 We would also like to remind existing members about importance of renewals and
 unit tests. You can either renew on the [website](https://www.redbrick.dcu.ie/
-help/joining/ "Joining/Renewing") or send us money by PayPal.
-Just make sure that you email admins@redbrick.dcu.ie with your transaction ID
-so we can verify.
+help/joining/ "Joining/Renewing") or send us money by PayPal. Just make sure
+that you email admins@redbrick.dcu.ie with your transaction ID so we can verify.
 
 ## Engineering and Computing Ball
 
@@ -45,7 +45,6 @@ in The Bonnington Hotel (formerly the Regency Hotel). You can sign up today by
 throwing 10 euro at a committee member.  
 https://www.facebook.com/events/312772709198090
 
+Your favourite secretary,
 
-Your favourite secretary,  
 voy
-
diff --git a/content/post/2017-Week-6-announce/index.md b/content/post/2017-Week-6-announce/index.md
new file mode 100644
index 0000000..02ee5aa
--- /dev/null
+++ b/content/post/2017-Week-6-announce/index.md
@@ -0,0 +1,87 @@
+---
+author: pints
+banner: rb-demonware.png
+date: '2017-10-22 13:25:00'
+tags:
+  - Demonware
+  - Linux
+  - Ball
+  - HvZ
+  - Hackerclub
+title: Week 6 | Demonware | Linux Installfest | Ball Tickets
+---
+
+Happy Sunday, folks! As Week 6 rolls around and mid-term exams loom, we've a
+week of fantastic events to keep your spirits up!
+
+TL;DR:
+
+- Demonware @ Redbrick
+- Linux Installfest
+- E & C Ball Tickets now on sale!
+- Humans vs Zombies
+- Hackerclub
+
+ 
+
+## Demonware @ Redbrick
+
+### Monday 23/10/2017 | 5pm | L101
+
+Demonware provides online gaming services for Activision games, including Call
+of Duty. Engineers at Demonware will talk about working in the gaming industry
+and challenges associated with providing online services for one of the worlds
+largest entertainment franchises.
+
+https://www.facebook.com/events/121880845157722/
+
+## Linux Installfest
+
+### Wednesday 25/10/2017 | 5pm | LG26
+
+What's this Linux thing all the cool kids are talking about? _Why should you
+care?_ Come on down to LG26 this Wednesday, where we'll give you the low-down on
+the world's most widely used operating system!
+
+There'll be a quick overview of what Linux is & what is has to offer, followed
+by a hands-on tutorial where you'll install your very own Linux system, either
+on a Virtual Machine, or your own laptop.
+
+This may sound like an intimidating event, but we're committed to making our
+talks accessible to everyone! People of all skill levels are more than welcome,
+and we'll be ensuring everyone's up to speed before we move on to anything new.
+
+https://www.facebook.com/events/113047719456696/
+
+## Humans vs. Zombies
+
+Once again, DCU Games Society (Gamessoc) have asked that we remind everyone that
+their annual Humans Vs. Zombies event begins this Monday! Full details of the
+event & how to sign up can be found below:
+
+https://www.facebook.com/events/288110335029405/
+
+## Engineering & Computing Ball Tickets
+
+Just a quick heads up that tickets for this year's Engineering & Computing ball
+will be on sale this week! Details and pricing can be found on the event page
+below:
+
+[Engineering & Computing Ball](https://www.facebook.com/events/312772709198090/)
+
+## Hackerclub
+
+### Thursday 26/10/2017 | 4pm | L101
+
+Hackerclub will be continuing as usual this Thursday, starting at 4pm. Come on
+down to practive your programming, eat pizza, and chat with us! We'll be working
+through some less-demanding problems until 5pm, and then we'll step up the
+difficulty for the brave amongst you!
+
+https://www.facebook.com/events/144497879493359/
+
+Have a good week everyone!
+
+Your friendly neighborhood SysAdmin,
+
+~pints
diff --git a/source/_posts/2017-Week-6-announce/rb-demonware.png b/content/post/2017-Week-6-announce/rb-demonware.png
similarity index 100%
rename from source/_posts/2017-Week-6-announce/rb-demonware.png
rename to content/post/2017-Week-6-announce/rb-demonware.png
diff --git a/source/_posts/2017-week-10-announce/ball.jpg b/content/post/2017-week-10-announce/ball.jpg
similarity index 100%
rename from source/_posts/2017-week-10-announce/ball.jpg
rename to content/post/2017-week-10-announce/ball.jpg
diff --git a/source/_posts/2017-week-10-announce.md b/content/post/2017-week-10-announce/index.md
similarity index 75%
rename from source/_posts/2017-week-10-announce.md
rename to content/post/2017-week-10-announce/index.md
index 4e4bae3..a729ede 100644
--- a/source/_posts/2017-week-10-announce.md
+++ b/content/post/2017-week-10-announce/index.md
@@ -1,29 +1,29 @@
 ---
-title: Week 10 | Ball | Social Engineering | HackerClub | Christmas Party
-date: '2017-11-20'
-banner: ball.jpg
 author: winesnob
+banner: ball.jpg
+date: '2017-11-20'
 tags:
   - Ball
   - Hackerclub
   - Social Engineering
   - Christmas Party
+title: Week 10 | Ball | Social Engineering | HackerClub | Christmas Party
 ---
 
 Hey Everyone,
 
 TL;DR
+
 - Social Engineering For Hacking, Wednesday LG26 @ 16:00
 - HackerClub, Thursday L101 @ 16:00
 - Christmas Party, Slipper, 29th of November
 
-
+ 
 
 ## Ball
 
-We would like to thank everyone who came to the ball on Thursday!
-We hope you all had a good time and we can now stop spamming you about it!
-
+We would like to thank everyone who came to the ball on Thursday! We hope you
+all had a good time and we can now stop spamming you about it!
 
 ## Social Engineering For Hacking
 
@@ -38,25 +38,22 @@ out both the sophisticated techniques, and the not so sophisticated ones too!
 
 https://www.facebook.com/events/137845460318279/
 
-
 ## HackerClub
 
-Hackerclub will be continuing as usual this Thursday, starting at 4pm.
-Come on down to practice your programming, eat pizza, and chat with us!
-
+Hackerclub will be continuing as usual this Thursday, starting at 4pm. Come on
+down to practice your programming, eat pizza, and chat with us!
 
 https://www.facebook.com/events/144497879493359
 
 ## Christmas Party
 
-The annual Redbrick Christmas party is on the horizon friends!
-The festivities kick off at 19:00 in the Slipper on Wednesday the 29th of
-November, so make sure you tag along for some festive Christmas cheer...
-even if the party is in the month of November...
+The annual Redbrick Christmas party is on the horizon friends! The festivities
+kick off at 19:00 in the Slipper on Wednesday the 29th of November, so make sure
+you tag along for some festive Christmas cheer... even if the party is in the
+month of November...
 
 https://www.facebook.com/events/237258386809051/
 
-
 Chris Dowling (winesnob)
 
 Redbrick Secretary 2017-2018
diff --git a/source/_posts/2017-week-11-announce.md b/content/post/2017-week-11-announce/index.md
similarity index 65%
rename from source/_posts/2017-week-11-announce.md
rename to content/post/2017-week-11-announce/index.md
index df7df5c..7ff2db7 100644
--- a/source/_posts/2017-week-11-announce.md
+++ b/content/post/2017-week-11-announce/index.md
@@ -1,30 +1,30 @@
 ---
-title: Week 11 | Christmas Party | Building A Desktop | HackerClub
-date: '2017-11-28'
-banner: santaredbrick.jpg
 author: winesnob
+banner: santaredbrick.jpg
+date: '2017-11-28'
 tags:
   - Hackerclub
   - Desktop
   - Christmas Party
+title: Week 11 | Christmas Party | Building A Desktop | HackerClub
 ---
 
-
 Hey Everyone,
 
 TL;DR
+
 - Building a Desktop, Wednesday LG26 @ 15:00
 - HackerClub, Thursday L101 @ 16:00
 - Christmas Party, Slipper, Wednesday @ 19:00
 
-
+ 
 
 ## Christmas Party
 
-The annual Redbrick Christmas party is on the horizon friends!
-The festivities kick off at 19:00 in the Slipper on Wednesday the 29th of
-November, so make sure you tag along for some festive Christmas cheer...
-even if the party is in the month of November...
+The annual Redbrick Christmas party is on the horizon friends! The festivities
+kick off at 19:00 in the Slipper on Wednesday the 29th of November, so make sure
+you tag along for some festive Christmas cheer... even if the party is in the
+month of November...
 
 https://www.facebook.com/events/237258386809051/
 
@@ -35,24 +35,22 @@ individual components work inside your machine? Do you need help fixing your PC?
 Just need some buyers tips in general?
 
 At some time or another we all venture into the world of building and on
-Wednesday the 29th at 15:00 a Redbrick member by the username of mikello will
-be giving a great talk, introducing you to the world of desktop building.
+Wednesday the 29th at 15:00 a Redbrick member by the username of mikello will be
+giving a great talk, introducing you to the world of desktop building.
 
 https://www.facebook.com/events/140205686637856/
 
 ## HackerClub
 
 After weeks of persistent problem solving and programming, it's safe to assume
-you all know your STDIN from your STDOUT. Now you get to prove it to us!
-This week HackerClub will hold a friendly little competition which is open to
-everyone and anyone!
-Will it be a little before from your weekly run of the mill HackerClub? Yes.
-Will there be prizes? You bet ya!
-Pop in to L101 on Thursday at 16:00 and join in on the fun!
+you all know your STDIN from your STDOUT. Now you get to prove it to us! This
+week HackerClub will hold a friendly little competition which is open to
+everyone and anyone! Will it be a little before from your weekly run of the mill
+HackerClub? Yes. Will there be prizes? You bet ya! Pop in to L101 on Thursday at
+16:00 and join in on the fun!
 
 https://www.facebook.com/events/144497879493359
 
-
 Chris Dowling (winesnob)
 
 Redbrick Secretary 2017-2018
diff --git a/source/_posts/2017-week-11-announce/santaredbrick.jpg b/content/post/2017-week-11-announce/santaredbrick.jpg
similarity index 100%
rename from source/_posts/2017-week-11-announce/santaredbrick.jpg
rename to content/post/2017-week-11-announce/santaredbrick.jpg
diff --git a/source/_posts/2017-week-12-announce.md b/content/post/2017-week-12-announce/index.md
similarity index 95%
rename from source/_posts/2017-week-12-announce.md
rename to content/post/2017-week-12-announce/index.md
index 50ec467..a308c8b 100644
--- a/source/_posts/2017-week-12-announce.md
+++ b/content/post/2017-week-12-announce/index.md
@@ -1,30 +1,30 @@
 ---
-title: Week 12 | HackerClub | Exams | Merry Christmas
-date: '2017-12-5'
-banner: xmasbrick.jpg
 author: mctastic
+banner: xmasbrick.jpg
+date: '2017-12-5'
 tags:
   - Hackerclub
   - Exams
   - Merry Christmas
+title: Week 12 | HackerClub | Exams | Merry Christmas
 ---
 
 Hey Everybody,
 
 TL;DR
+
 - HackerClub, Thursday L125 @ 16:00.
 - Good Luck in your Semester 1 Exams!
 - Merry Christmas to all our Brickies!
 
-
-
+ 
 
 ## HackerClub
 
 First off, a big thanks to all who took part in our HackerClub Competition last
 week, you guys can expect one or two next semester again! A special
-congratulations to Sean Hammond, Shane Grouse and Conor Berns, our first,
-second and third placed participants respectively. Well done guys!
+congratulations to Sean Hammond, Shane Grouse and Conor Berns, our first, second
+and third placed participants respectively. Well done guys!
 
 Seeing as it is Computer Science Education Week and all, HackerClub will resume
 as normal for this week, except it's going to be in L125 (it's a nicer room).
@@ -41,7 +41,6 @@ been a long semester. After the break you'll all be facing into your semester
 one exams! We at Redbrick want to wish you all the best of luck in your studies
 and subsequent January Exams!
 
-
 ## Merry Christmas To All
 
 Finally, from myself and the rest of committee, we would like to wish you all a
@@ -50,12 +49,10 @@ Alone is a must), and eat some fantastically delicious dinner when the big day
 finally arrives. Take care everybody, we can't wait to see you all next
 semester!
 
-
 James McDermott (~mctastic)
 
 Redbrick Events Officer 2017-2018
 
-
 ## s o c i a l m e d i a
 
 Twitter: @RedbrickDCU
diff --git a/source/_posts/2017-week-12-announce/xmasbrick.jpg b/content/post/2017-week-12-announce/xmasbrick.jpg
similarity index 100%
rename from source/_posts/2017-week-12-announce/xmasbrick.jpg
rename to content/post/2017-week-12-announce/xmasbrick.jpg
diff --git a/source/_posts/2017-week-2-downtime/downtime.jpg b/content/post/2017-week-2-downtime/downtime.jpg
similarity index 100%
rename from source/_posts/2017-week-2-downtime/downtime.jpg
rename to content/post/2017-week-2-downtime/downtime.jpg
diff --git a/content/post/2017-week-2-downtime/index.md b/content/post/2017-week-2-downtime/index.md
new file mode 100644
index 0000000..e8c3ded
--- /dev/null
+++ b/content/post/2017-week-2-downtime/index.md
@@ -0,0 +1,100 @@
+---
+author: mctastic
+banner: downtime.jpg
+date: '2017-10-05 13:35:00'
+tags:
+  - EGM
+  - Freshers
+  - Ball
+  - FOSDEM
+  - Microsoft
+title: Week 3 | Downtime | Webspace | Microsoft | E & C Ball | FOSDEM
+---
+
+Hey folks, So, we have a few bits and bobs to clear up, hence the special
+midweek announce! There's been a few changes to the events running today
+specifically, but along with that we have a few more things we'd like to
+mention.
+
+TL;DR
+
+- Downtime Over Weekend
+- RB Webspace Setup (L114 , Thu @ 16:00)
+- Competitive Programming Practice (L114, Thu @ 17:00)
+- Microsoft Programming Competition (LG25, 11th Oct @ 15:00)
+- Engineering & Computing Ball: we are taking deposits!
+- FOSDEM: we're going!
+
+ 
+
+## Downtime Over Weekend
+
+Redbrick will be going down for maintenance this Sunday, at 1pm, for
+approximately 2 hours. This is to facilitate updates to our hosts, and a general
+health check on the network. All services will be affected, and logins will be
+disabled prior to the shutdown. If you have any questions, please contact
+admins@redbrick.dcu.ie
+
+## Webspace Setup
+
+Webspace was originally at 16:00 today, but due to unforeseen circumstances,
+we've had to move it an hour earlier. Webspace is now at 16:00 in L114. Our
+webmaster will show you how to upload any\* file to your website so you can show
+your friends how awesome you are!
+https://www.facebook.com/events/152571942006133/
+
+## Competitive Programming Practice Evening
+
+We wanted Webspace Setup and our Practice evening to run back to back, so when
+Webspace changed, this in turn had to change. Our practice evening is now at
+17:00 (not really evening time) in L114. Come to brush up on your skills, chill
+with some brickies and of course, indulge in some pizza.
+https://www.facebook.com/events/1801483303480200
+
+## Microsoft Programming Competition
+
+Redbrick and Microsoft are teaming up to bring you some competitive programming
+funsies on October 11th! If you want to be in with the chance of winning some
+swag you better pop along to LG25 at 15:00, we have prizes for the top three
+teams, with the top team winning a €100 One4all gift voucher for each member. If
+that wasn't enough for you, there's even an Xbox One being raffled. Incentives
+galore.
+
+Teams can have between 1 - 3 people, you can use any too/language you want and
+there's no restrictions in terms of internet. The competition is more geared for
+second year students and above, but don't let that discourage you if you're a
+first year! Pop along and see what competitive programming is like!
+
+The room is LG25 and the date is Wednesday 11th of October and the time is
+15:00, come along and join us for some good old fashioned problem solving,
+programming, and pizza. https://www.facebook.com/events/150523242215382
+
+## Engineering & Computing Ball
+
+The Engineering and Redbrick societies have been working hard over the past few
+months to bring you one of the top highlights of the year! It will take place on
+Thursday, November 16th, in The Bonnington Hotel(formerly The Regency Hotel
+Dublin), on the Swords road. The events runs something like this: Prosecco
+reception, three course banquet, a band, and finally a DJ.
+
+Concession tickets are €45 and the standard tickets are €50. If you want to
+avail of the concession ticket price and save yourself a fiver (the cost of
+goujons and chips in NuBar) all you have to do is pay a €10 deposit before the
+end of the week to any committee member from either Redbrick or EngSoc.
+https://www.facebook.com/events/312772709198090/
+
+## FOSDEM
+
+In short, FOSDEM is the biggest European meetup of developers, and Redbrick is
+going. If you like hanging around a big convention talking about open source
+software with nerds, this is the place for you! FOSDEM will be held in Brussels
+on the 3rd & 4th or February 2018. Redbrick will be flying out to Belgium on the
+evening of the 2nd and returning on the evening of the 4th. So far all we can
+say is that the overall price will be less than €100, that includes flights and
+accommodation by the way. If you're interested, sign up at the link below,
+places are limited and it's pretty much first come first served.
+https://events.redbrick.dcu.ie/fosdem/
+
+"Should we send out a midweek announce?"  
+James McDermott (mctastic)  
+Redbrick Events Officer 2017-2018
diff --git a/source/_posts/2017-week-21-announce/2017-week-21-announce.jpg b/content/post/2017-week-21-announce/2017-week-21-announce.jpg
similarity index 100%
rename from source/_posts/2017-week-21-announce/2017-week-21-announce.jpg
rename to content/post/2017-week-21-announce/2017-week-21-announce.jpg
diff --git a/source/_posts/2017-week-21-announce.md b/content/post/2017-week-21-announce/index.md
similarity index 62%
rename from source/_posts/2017-week-21-announce.md
rename to content/post/2017-week-21-announce/index.md
index cff34e1..0e31326 100644
--- a/source/_posts/2017-week-21-announce.md
+++ b/content/post/2017-week-21-announce/index.md
@@ -1,8 +1,7 @@
 ---
-title: Announce 21, FOSDEM and Phishing
-banner: 2017-week-21-announce.jpg
-date: 2017-02-07 14:37:18
 author: oskar
+banner: 2017-week-21-announce.jpg
+date: '2017-02-07 14:37:18'
 tags:
   - Phishing
   - Talks
@@ -11,14 +10,15 @@ tags:
   - FOSDEM
   - InterSocs
   - Helpdesk
+title: Announce 21, FOSDEM and Phishing
 ---
 
 Dear Redbrick friends,
 
 It's now the second week of the new semester or week 21 overall.
 
-In an attempt to fill you with excitement for the coming semester here is
-what we have planned:
+In an attempt to fill you with excitement for the coming semester here is what
+we have planned:
 
  
 
@@ -28,17 +28,13 @@ what we have planned:
 - Where: LG25
 - More information here: https://www.facebook.com/events/630149340519458/
 
-Do you want to keep yourself safe online? Are you tired of losing control
-of your accounts
-and having no idea why?
+Do you want to keep yourself safe online? Are you tired of losing control of
+your accounts and having no idea why?
 
-We talk about some of the known and unknown techniques that hackers use to
-gain access to
-your account including phishing on unsuspecting victims and unknowingly
-giving your password
-to hackers and social engineering; giving away too much info to the people
-you think you
-can trust.
+We talk about some of the known and unknown techniques that hackers use to gain
+access to your account including phishing on unsuspecting victims and
+unknowingly giving your password to hackers and social engineering; giving away
+too much info to the people you think you can trust.
 
 ## InterSocs Social
 
@@ -46,9 +42,8 @@ can trust.
 - Where: The Brew Dock - 1 Amiens Street, Dublin
 - More information here: https://www.facebook.com/events/1794062740854987/
 
-For the second year running, come join us along with five other NetSocs
-from five other
-lesser universities for some food and drinks and no doubt arguing.
+For the second year running, come join us along with five other NetSocs from
+five other lesser universities for some food and drinks and no doubt arguing.
 
 ## Google #HashCode 2017
 
@@ -59,28 +54,29 @@ lesser universities for some food and drinks and no doubt arguing.
 Once again, DCU School of Computing will be a Hub for Google's HashCode
 competition.
 
-The online Qualification Round will take place in LG25 on Thursday 23rd
-February 5-9pm.
-Hash Code is open to university students and industry professionals in
-Europe, the Middle
-East and Africa. Participants compete in teams of two to four.
+The online Qualification Round will take place in LG25 on Thursday 23rd February
+5-9pm. Hash Code is open to university students and industry professionals in
+Europe, the Middle East and Africa. Participants compete in teams of two to
+four.
 
-Registration is free of charge and will close on 20th February 2017 at
-17:00 GMT.
+Registration is free of charge and will close on 20th February 2017 at 17:00
+GMT.
 
 ## FOSDEM
+
 Finally - for those of you who got enough sleep, ate well and thus weren't
-present at FOSDEM
-this year - all the videos of the talks are now available here:
-https://video.fosdem.org/2017/
+present at FOSDEM this year - all the videos of the talks are now available
+here: https://video.fosdem.org/2017/
 
 Thank you all,
+
 Oskar McDermott (oskar)
 
 Here are our social media links in case you want to kiss us thru the phone:
-Twitter: @RedbrickDCU
-Facebook: https://www.facebook.com/dcuredbrick
-Snapchat: RedbrickDCU
-Google Calendar: https://www.redbrick.dcu.ie/events/
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
 
 ps. These announces will become consistent again, I promise. x
diff --git a/source/_posts/2017-week-22-announce/2017-week-22-announce.jpg b/content/post/2017-week-22-announce/2017-week-22-announce.jpg
similarity index 100%
rename from source/_posts/2017-week-22-announce/2017-week-22-announce.jpg
rename to content/post/2017-week-22-announce/2017-week-22-announce.jpg
diff --git a/content/post/2017-week-22-announce/index.md b/content/post/2017-week-22-announce/index.md
new file mode 100644
index 0000000..902d4da
--- /dev/null
+++ b/content/post/2017-week-22-announce/index.md
@@ -0,0 +1,69 @@
+---
+author: oskar
+banner: 2017-week-22-announce.jpg
+date: '2017-02-13 13:48:27'
+tags:
+  - Admins
+  - Hoodies
+  - HashCode
+thumbnail: 2017-week-22-announce.jpg
+title: Announce 22, Web Servers and Hoodies
+---
+
+Dear Redbrick friends,
+
+We're ploughing through the academic year. With 22 weeks gone, here's what's
+still to come:
+
+ 
+
+# Admin Talk: Setting up a Server for Fun and Profit
+
+- When: Wednesday 15th, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/606208012923445/
+
+Have you ever started your own billion dollar social network only to realise you
+don't have space in your tiny bedroom for racks on racks of servers? You're not
+the only one! Luckily, with a special talk from pints and zergless, you'll
+finally get to figure out how to avoid an appearance on Makeover: Home Edition
+and learn how to host your web-servers on other peoples' computers.
+
+SIDE-NOTE: if you have anything you would like to hear a talk about, please let
+us know! We're always into fresh new ideas.
+
+# Google #HashCode 2017
+
+- When: Thursday 23rd, 5-9pm
+- Where: LG25
+- More information here: https://hashcode.withgoogle.com/
+
+Once again, DCU School of Computing will be a Hub for Google's HashCode
+competition.
+
+The online Qualification Round will take place in LG25 on Thursday 23rd February
+5-9pm. Hash Code is open to university students and industry professionals in
+Europe, the Middle East and Africa. Participants compete in teams of two to
+four.
+
+Registration is free of charge and will close on 20th February 2017 at 17:00
+GMT.
+
+# Hoodies
+
+Finally, Redbrick is making hoodies! If you're interested in some
+primo-nice-cool-trendy-zip-up-hoodies, fill out your interest here:
+http://hoodies.redbrick.dcu.ie/ They'll cost around 35 euros and will have a
+logo on the chest and the back and if you want you can get your name on the
+sleeve. You have until the end of the month to register.
+
+See you soon,
+
+- Oskar McDermott (oskar)
+
+Here are our social media links in case you can't get enough of us:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
diff --git a/source/_posts/2017-week-23-announce/hackerclub.png b/content/post/2017-week-23-announce/hackerclub.png
similarity index 100%
rename from source/_posts/2017-week-23-announce/hackerclub.png
rename to content/post/2017-week-23-announce/hackerclub.png
diff --git a/content/post/2017-week-23-announce/index.md b/content/post/2017-week-23-announce/index.md
new file mode 100644
index 0000000..0c8d382
--- /dev/null
+++ b/content/post/2017-week-23-announce/index.md
@@ -0,0 +1,90 @@
+---
+author: oskar
+banner: hackerclub.png
+date: '2017-02-20 19:48:27'
+tags:
+  - Admins
+  - Hackerclub
+  - Hoodies
+  - HashCode
+thumbnail: hackerclub.png
+title: Announce 23, Hacker Club and Docker
+---
+
+Dear Redbrick friends,
+
+If you like computers and stuff this is for you:
+
+ 
+
+# Admin Talk: Setting up and Building With Docker
+
+- When: Wednesday 22nd, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/413879082284294
+
+This week, Cian (~butlerx) will be introducing the wonderful world of Docker:
+the container engine that everyone's talking about! The talk will start with the
+basics of containers and what they are, and culminate in a live demonstration of
+what Docker can do for you! Please, pretty please, sign up for the Github
+Student Developer Pack and register a domain name if you're going to be
+attending this talk: https://education.github.com/pack
+
+# Redbrick HackerClub
+
+- When: Thursday 23rd, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/1240853515968668/
+
+Redbrick will be getting together with all its members to start its first
+hackerclub!
+
+Bring your friends, bring your family, we don't care if you bring your pet rock
+just come on down if you are interested in learning programming, both for your
+own projects or competitive competitions.
+
+# Google #HashCode 2017
+
+- When: Thursday 23rd, 5-9pm
+- Where: LG25
+- More information here: https://hashcode.withgoogle.com/ Once again, DCU School
+  of Computing will be a Hub for Google's HashCode competition.
+
+The online Qualification Round will take place in LG25 on Thursday 23rd February
+5-9pm. Hash Code is open to university students and industry professionals in
+Europe, the Middle East and Africa. Participants compete in teams of two to
+four. Registration is free of charge and will close on 20th February 2017 at
+17:00 GMT.
+
+# Safe Sexting
+
+- When: March 8th
+- Where: LG26
+- More information here: https://www.facebook.com/events/184569888696957/
+
+Diarmaid McManus (elephant), a former Redbrick member and now a Security
+Engineer is coming into to give a talk on safer sexting. If you're worried about
+Donald Trump seeing your private parts and dirty messages this is the event for
+you.
+
+# Hoodies
+
+Redbrick is making hoodies! If you're interested in some
+primo-nice-cool-trendy-zip-up-hoodies, fill out your interest here:
+http://hoodies.redbrick.dcu.ie/ They'll cost around 35 euros and will have a
+logo on the chest and the back and if you want you can get your name on the
+sleeve. You have until the end of the month to register.
+
+Finally, if you're interested in becoming a member of the redbrick helpdesk
+team, contact us [here](mailto:helpdesk@redbrick.dcu.ie)
+
+i love u,
+
+- Oskar McDermott (oskar)
+
+social media boys we out here:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
diff --git a/source/_posts/2017-week-24-announce/hackerclub.jpg b/content/post/2017-week-24-announce/hackerclub.jpg
similarity index 100%
rename from source/_posts/2017-week-24-announce/hackerclub.jpg
rename to content/post/2017-week-24-announce/hackerclub.jpg
diff --git a/content/post/2017-week-24-announce/index.md b/content/post/2017-week-24-announce/index.md
new file mode 100644
index 0000000..74fdde8
--- /dev/null
+++ b/content/post/2017-week-24-announce/index.md
@@ -0,0 +1,77 @@
+---
+author: oskar
+banner: hackerclub.jpg
+date: '2017-02-28 11:48:27'
+tags:
+  - Admins
+  - Hackerclub
+  - Hoodies
+  - Associate
+  - Webmaster
+title: Announce 24, Safer Sexting and Static Site Generation
+---
+
+Dear Redbrick friends,
+
+If you're really sad about February ending, here's what we're hosting for you:
+
+ 
+
+## Admin Talk: Static Site Generation
+
+- When: Wednesday 1st, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/1797761773773828/
+
+Our wonderful webmaster Cian (~butlerx) will be taking you through the ins and
+outs of the new hotness in web design: Static Site Generation! As well as some
+do's and don'ts of web design in general.
+
+## Redbrick HackerClub
+
+- When: Thursday 2nd, 3-5pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/1140348096087078/
+
+Redbrick will be getting together with all its members to start its second
+hackerclub! Bring your friends, bring your family, we don't care if you bring
+your pet rock just come on down if you are interested in learning programming,
+both for your own projects or programming competitively. We have pizza :D
+
+## Safer Sexting
+
+- When: March 8th, 3-5pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/184569888696957/
+
+Diarmaid McManus (elephant), a former Redbrick member and now a Security
+Engineer, is coming into to give a talk on safer sexting. If you're worried
+about Donald Trump seeing your private parts and dirty messages, this is the
+event for you!
+
+## Hoodies
+
+Redbrick is making hoodies! If you're interested in some
+primo-nice-cool-trendy-zip-up-hoodies, fill out your interest here:
+https://hoodies.redbrick.dcu.ie/ They'll cost 35 euros and will have a logo on
+the chest and the back. If you want you can get your name on the sleeve. You
+have until the end of the month to register. For those of you who have
+registered, please pay a member of committee or PayPal us here:
+accounts@redbrick.dcu.ie
+
+If you're interested in becoming a member of the redbrick helpdesk, admin or
+webmaster team, contact us here: committee@redbrick.dcu.ie
+
+Finally, if you were on the trip to FOSDEM and would like a cool 15 euro back
+from Redbrick, please email treasurer@redbrick.dcu.ie to arrange a pickup.
+
+Thanks for reading everybody,
+
+- Oskar McDermott (oskar)
+
+Social media boys we out here:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
diff --git a/content/post/2017-week-26-announce/index.md b/content/post/2017-week-26-announce/index.md
new file mode 100644
index 0000000..ad95c86
--- /dev/null
+++ b/content/post/2017-week-26-announce/index.md
@@ -0,0 +1,67 @@
+---
+author: oskar
+banner: techweek.png
+date: '2017-03-13 22:48:27'
+tags:
+  - Admins
+  - Hackerclub
+  - Techweek
+  - IRLCPC
+  - Associate
+  - Webmaster
+title: Announce 26, TechWeek and IRLCPC
+---
+
+Dear Redbrick members,
+
+We have a fairly packed couple of weeks coming up, here's the gist of what's
+happening:
+
+ 
+
+## TechWeek Day One
+
+- When: Wednesday 15th March, 3-6pm
+- Where: LG26
+- More information here: http://techweek.dcu.ie/#Wednesday-15th
+
+Our techweek has been deconstructed this year and is now being split into three
+days over three weeks. The first one is this Wednesday on the topic of Security.
+We've got three talks from people in industry + an opening event by the
+committee. It'll be really fun and informative, hope to see you there.
+
+## Redbrick HackerClub
+
+- When: Thursday 16th March, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/240185859777710/
+
+Redbrick's got a hackerclub going. It's the hottest thing on campus. Know how to
+program? Come program. Don't know? Come learn and chat! As long you're
+interested in technology, show up and it'll be good times all round.
+
+## irlCPC
+
+- When: Saturday 25th March,
+- Where: UCC Cork
+- More information here: http://acm.ucc.ie/irlcpc
+
+It's that time of the year again when we take a trip to dear old Cork for
+IrlCPC! For those of you who don't know it's the Irish Collegiate Programming
+Competition and signups are open. The competition is on the 25th of March 2017
+and signups close on March 15th. The competition is for teams of 3 people. If
+you wish to join us on this trip please email commitee@redbrick.dcu.ie
+
+Finally, if you’re interested in becoming a member of the redbrick helpdesk,
+admin or webmaster team, contact us here: committee@redbrick.dcu.ie
+
+Respectfully,
+
+- Oskar McDermott (oskar)
+
+social media:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
diff --git a/source/_posts/2017-week-26-announce/techweek.png b/content/post/2017-week-26-announce/techweek.png
similarity index 100%
rename from source/_posts/2017-week-26-announce/techweek.png
rename to content/post/2017-week-26-announce/techweek.png
diff --git a/content/post/2017-week-27-announce/index.md b/content/post/2017-week-27-announce/index.md
new file mode 100644
index 0000000..a1d3657
--- /dev/null
+++ b/content/post/2017-week-27-announce/index.md
@@ -0,0 +1,64 @@
+---
+author: oskar
+banner: techweek.png
+date: '2017-03-20 22:48:27'
+tags:
+  - Admins
+  - Hackerclub
+  - Techweek
+  - IRLCPC
+  - Associate
+  - Webmaster
+title: Announce 27, Development Tools and Hackerz
+---
+
+Dear Redbrick members,
+
+This is what we have coming up this week:
+
+ 
+
+## Tech Week Day Two
+
+- When: Wednesday 22nd March, 3-6pm
+- Where: LG26
+- More information here: http://techweek.dcu.ie/#Wednesday-22nd
+
+Our techweek has been deconstructed this year and is now being split into three
+days over three weeks. The second one is this Wednesday on the topic of
+development tools. We've got three talks from people in industry and from
+current students.
+
+## Redbrick Hackerclub
+
+- When: Thursday 23rd March, 3-4pm
+- Where: LG26
+- More information here: https://www.facebook.com/events/139162633276464/
+
+Redbrick's got a hackerclub going. It's the hottest thing on campus. Know how to
+program? Come program. Don't know? Come learn and chat! As long you're
+interested in technology, show up and it'll be good times all round.
+
+## irlCPC
+
+- When: Saturday 25th March,
+- Where: UCC, Cork
+- More information here: http://acm.ucc.ie/irlcpc
+
+It's that time of the year again when we take a trip to dear old Cork for
+IrlCPC! If you wish to travel and stay with us on this trip please email
+commitee@redbrick.dcu.ie. It should come out to around 12 euros per person.
+
+Finally, if you’re interested in becoming a member of the redbrick helpdesk,
+admin or webmaster team, contact us here: committee@redbrick.dcu.ie
+
+Hope you had a nice weekend,
+
+- Oskar McDermott (oskar)
+
+social media:
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: https://www.redbrick.dcu.ie/events/
diff --git a/source/_posts/2017-week-27-announce/techweek.png b/content/post/2017-week-27-announce/techweek.png
similarity index 100%
rename from source/_posts/2017-week-27-announce/techweek.png
rename to content/post/2017-week-27-announce/techweek.png
diff --git a/source/_posts/2017-week-28-announce/cat.jpg b/content/post/2017-week-28-announce/cat.jpg
similarity index 100%
rename from source/_posts/2017-week-28-announce/cat.jpg
rename to content/post/2017-week-28-announce/cat.jpg
diff --git a/source/_posts/2017-week-28-announce.md b/content/post/2017-week-28-announce/index.md
similarity index 67%
rename from source/_posts/2017-week-28-announce.md
rename to content/post/2017-week-28-announce/index.md
index 0401c34..c7bb7b9 100644
--- a/source/_posts/2017-week-28-announce.md
+++ b/content/post/2017-week-28-announce/index.md
@@ -1,45 +1,46 @@
 ---
-title: Announce 28  AGM | Exams | Table Quiz | TechWeek Videos
-banner: cat.jpg
-date: 2017-03-27 22:00:27
 author: pints
+banner: cat.jpg
+date: '2017-03-27 22:00:27'
 tags:
   - Techweek
   - AGM
   - Table Quiz
   - Exams
+title: Announce 28  AGM | Exams | Table Quiz | TechWeek Videos
 ---
+
 Dear Redbrick members,
 
 Friends, Brickies and countrymen,
 
 The time is upon us! As Redbrick nears the end of our 21st year as a society,
-we're preparing for this year's Annual General Meeting, followed by the one
-and only Redbrick Table Quiz! Read on for more...
+we're preparing for this year's Annual General Meeting, followed by the one and
+only Redbrick Table Quiz! Read on for more...
 
  
 
 ## Redbrick AGM 2017
 
- - When: 4PM, Wednesday 5/4/2017
- - Where: CG04, Henry Grattan Building
- - RSVP: https://www.facebook.com/events/1357413470985789/
+- When: 4PM, Wednesday 5/4/2017
+- Where: CG04, Henry Grattan Building
+- RSVP: https://www.facebook.com/events/1357413470985789/
 
 It's AGM time once again! The following positions will be open:
 
- - Chair
- - Secretary
- - Public Relations Officer
- - Events Officer
- - Treasurer
- - Helpdesk (x2)
- - System Administrator (x3)
- - Webmaster
+- Chair
+- Secretary
+- Public Relations Officer
+- Events Officer
+- Treasurer
+- Helpdesk (x2)
+- System Administrator (x3)
+- Webmaster
 
 If you wish to run for the positions of Helpdesk, SysAdmin or Webmaster, please
 email committee@redbrick.dcu.ie to express your interest on or before this
-Wednesday (29/3/17), as eligibility to run for these positions requires
-passing an exam devised by the current holders of said position.
+Wednesday (29/3/17), as eligibility to run for these positions requires passing
+an exam devised by the current holders of said position.
 
 Exams for all 3 positions from previous years can be found [here](/help/exams/)
 
@@ -48,10 +49,9 @@ proposed changes [here](https://github.com/redbrick/static-site/pull/145)
 
 ## Redbrick Table Quiz
 
- - When: 7PM, Wednesday 5/4/2017
- - Where: NuBar, DCU
- - RSVP: https://www.facebook.com/events/1851910805089883/
-
+- When: 7PM, Wednesday 5/4/2017
+- Where: NuBar, DCU
+- RSVP: https://www.facebook.com/events/1851910805089883/
 
 Following the AGM, we'll be welcoming our shiny new Committee aboard at our
 annual table quiz! We invite you all to eat, drink and be merry with us, and
@@ -67,12 +67,11 @@ The recordings of this year's TechWeek talks are on their way! Keep an eye on
 
 On behalf of the entire committee, thanks to everyone for another amazing year!
 
-Catch you on the flipside,
-Cormac Smartt (~pints)
-Redbrick System Administrator
+Catch you on the flipside, Cormac Smartt (~pints) Redbrick System Administrator
 
 s o c i a l m e d i a
-Twitter: @RedbrickDCU
-Facebook: https://www.facebook.com/dcuredbrick
-Snapchat: RedbrickDCU
-Google Calendar: http://tinyurl.com/redbrickCalendar
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Google Calendar: http://tinyurl.com/redbrickCalendar
diff --git a/source/_posts/2017-week-32-announce/hoodies.jpg b/content/post/2017-week-32-announce/hoodies.jpg
similarity index 100%
rename from source/_posts/2017-week-32-announce/hoodies.jpg
rename to content/post/2017-week-32-announce/hoodies.jpg
diff --git a/source/_posts/2017-week-32-announce.md b/content/post/2017-week-32-announce/index.md
similarity index 80%
rename from source/_posts/2017-week-32-announce.md
rename to content/post/2017-week-32-announce/index.md
index fae48b1..1fc5fa2 100644
--- a/source/_posts/2017-week-32-announce.md
+++ b/content/post/2017-week-32-announce/index.md
@@ -1,31 +1,31 @@
 ---
-title: Announce 32 | New Committee | Good Luck | Hoodies | Survey
-banner: hoodies.jpg
-date: 2017-04-27 22:33:55
 author: voy
+banner: hoodies.jpg
+date: '2017-04-27 22:33:55'
 tags:
   - Hoodies
   - Exams
+title: Announce 32 | New Committee | Good Luck | Hoodies | Survey
 ---
+
 Dear Brickies,
 
-Exams in the distance, but we're nearly there! To cheer you up, hoodies
-have arrived!
+Exams in the distance, but we're nearly there! To cheer you up, hoodies have
+arrived!
 
 For those of you finishing college, good luck to you too, we'll miss you :(
 Remember to check your email when the new term starts so you can upgrade to our
 Associates Package. IRC is the best way to spend those long work hours, so
 you're more than welcome to join.
 
-
+ 
 
 ## New Committee
 
-As you might already know, with the AGM behind us, the committee has changed.
-We are working relentlessly - reviewing, planning and organising next year to
-make it better than all the previous ones. In case you don't know who is
-responsible for all the mess next year, let me re-introduce you to the new
-committee.
+As you might already know, with the AGM behind us, the committee has changed. We
+are working relentlessly - reviewing, planning and organising next year to make
+it better than all the previous ones. In case you don't know who is responsible
+for all the mess next year, let me re-introduce you to the new committee.
 
 - Chairperson: Terry Bolt (tbolt)
 - Secretary: Wojtek Bednarzak (voy)
@@ -49,15 +49,12 @@ it! Studying early helps :)
 
 ## Hoodies
 
-The hoodies have (finally) arrived! If you have ordered a hoodie you should
-get an email shortly regarding the collection. If you didn't order, you might
-get a chance next year, so don't worry :)
-
-"How does this announce thing work again?"  
-Wojtek Bednarzak (~voy)  
-Redbrick Secretary 2017-2018
+The hoodies have (finally) arrived! If you have ordered a hoodie you should get
+an email shortly regarding the collection. If you didn't order, you might get a
+chance next year, so don't worry :)
 
 ## Programming Survey
+
 We have been asked by a Trinity College professor to answer a survey regarding
 programming experience before starting college:
 
@@ -65,3 +62,7 @@ https://goo.gl/fMPurv
 
 Such surveys help to improve the computer courses in Ireland, and will only take
 10 minutes of your time. We would be grateful for your response.
+
+"How does this announce thing work again?"  
+Wojtek Bednarzak (~voy)  
+Redbrick Secretary 2017-2018
diff --git a/source/_posts/2017-week-4-announce/E+C-poster-banner.png b/content/post/2017-week-4-announce/E+C-poster-banner.png
similarity index 100%
rename from source/_posts/2017-week-4-announce/E+C-poster-banner.png
rename to content/post/2017-week-4-announce/E+C-poster-banner.png
diff --git a/content/post/2017-week-4-announce/index.md b/content/post/2017-week-4-announce/index.md
new file mode 100644
index 0000000..f3a753f
--- /dev/null
+++ b/content/post/2017-week-4-announce/index.md
@@ -0,0 +1,77 @@
+---
+author: voy
+banner: E+C-poster-banner.png
+date: '2017-10-09'
+tags:
+  - Microsoft
+  - Programming Competition
+  - HackerClub
+  - Ball
+title: Week 4 | Microsoft Programming Competition | HackerClub | Ball
+---
+
+Warm Welcomes (again),
+
+It has been brought to our attention some of our new users might not have been
+getting emails, but it should all be solved now. If you know anyone else still
+having trouble receiving emails, please let us know by emailing
+admins@redbrick.dcu.ie.
+
+TL;DR
+
+- Microsoft Programming Competition (Wed @ 15:30 | LG25)
+- Hackerclub (Thu 16:00 @ L101)
+
+ 
+
+## Microsoft Programming Competition
+
+We will be welcoming Microsoft, who will be running a programming competition.
+You will have a chance to win some nice prizes, and talk to a few engineers. You
+don't need to be a wizard in the art of competitive programming to attend. The
+event is aimed mostly at second years onwards, but first years can challange
+themselves if they want. Come to LG25 on Wednesday at 15:30 participate.
+
+Sign up [here](http://tinyurl.com/yaxuj479)
+
+Sign up here:
+
+http://tinyurl.com/yaxuj479
+
+https://www.facebook.com/events/150523242215382
+
+## HackerClub
+
+We will step through the basics of competitive programming, helping you
+understand how you should interpret the question and to understand STDIN and
+STDOUT. We will have questions of various difficulties, even for beginners, so
+relax. In case you are hungry we will give you pizza to boost your algorithms by
+O(n^2)! In the second hour we will run some harder problems, so you can release
+your inner programming beast. Come to L101 at 16:00 on Thursday for 2 hour
+session of fun!
+
+https://www.facebook.com/events/144497879493359
+
+## Engineering and Computing Ball
+
+In case you forgot, we are running this thing where we eat, dance (hah), and
+party until we fall asleep in Bonnington Hotel (formerly Regency Hotel), on
+Thursday the 16th of November. Tickets are €50.
+
+https://www.facebook.com/events/312772709198090
+
+"If I send it today it would be a good step :P"
+
+Wojtek Bednarzak (voy)
+
+Redbrick Secretary 2017-2018
+
+### s o c i a l m e d i a
+
+Twitter: @RedbrickDCU
+
+Facebook: https://www.facebook.com/dcuredbrick
+
+Snapchat: RedbrickDCU
+
+Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2017-week-5-and-a-half-announce/hvz.png b/content/post/2017-week-5-and-a-half-announce/hvz.png
similarity index 100%
rename from source/_posts/2017-week-5-and-a-half-announce/hvz.png
rename to content/post/2017-week-5-and-a-half-announce/hvz.png
diff --git a/content/post/2017-week-5-and-a-half-announce/index.md b/content/post/2017-week-5-and-a-half-announce/index.md
new file mode 100644
index 0000000..e079eb9
--- /dev/null
+++ b/content/post/2017-week-5-and-a-half-announce/index.md
@@ -0,0 +1,85 @@
+---
+author: winesnob
+banner: hvz.png
+date: '2017-10-18'
+tags:
+  - Git
+  - Common Room
+  - HvZ
+  - PyCon
+title: Week 5 and a Half | Intro to Git | Common Room | HvZ | PyCon
+---
+
+Hello Brickies,
+
+TL;DR
+
+- Intro to Git (Today 15:00 @ LG25)
+- Common Room Locked Today and Tomorrow
+- HvZ: Sign up before Monday! (Chase people with nerf guns)
+- PyCon: Subsidised tickets!
+
+ 
+
+## Intro to Git
+
+A quick reminder that Intro to Git is on today in LG25 @15:00. Stephen Blott
+will give a talk on the wondrous world of git.
+
+https://www.facebook.com/events/148090412473470/
+
+## Common Room
+
+As all of you know, we have repeatedly highlighted that members must clean up
+after themselves in the Common Room. Over the past week, the room has been left
+messy repeatedly. As a result, the Room Committee have elected to close the room
+for the following 2 days. Further closures and/or loss of access to the room can
+be expected if this situation does not improve.
+
+## HvZ
+
+The zombies are coming! GamesSoc's zombie-themed chase game, Humans vs Zombies,
+takes place next week - all week. Humans must fend off the zombies with Nerf
+guns, rolled-up socks, or their wit.
+
+This year, GamesSoc asked us to join them along with Airsoft, Harry Potter,
+Psychology, Postgrad, Circus to make it better than ever. Sign up before Monday
+and join the event on Faceboook too.
+
+https://www.facebook.com/events/288110335029405
+
+GamesSoc will also have a stand in the Henry Grattan building from 12pm until
+2pm on Thursday and Friday if you want to come by and ask some questions, or
+sign up then.
+
+GamesSoc are hosting an info and raffle event in C124 at 6pm on Thursday to
+explain HvZ. If you are lucky you may even win a nerf gun.
+
+## PyCon
+
+As you may have heard, PyCon will be taking place this Saturday & Sunday in
+Dublin! As in previous years, Redbrick will be offering subsidised tickets for
+our members who wish to attend.
+
+The first 20 Redbrick members to submit their ticket receipt to
+committee@redbrick.dcu.ie will be eligible to be reimbursed €20, half of the
+cost of a student ticket. This is strictly limited to current students of DCU,
+and to the first 20 people only.
+
+More details of the conference can be found here:
+
+https://pyconie17.python.ie/
+
+Chris Dowling (winesnob)
+
+Redbrick PRO 2017-2018
+
+## s o c i a l m e d i a
+
+Twitter: @RedbrickDCU
+
+Facebook: https://www.facebook.com/dcuredbrick
+
+Snapchat: RedbrickDCU
+
+Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2017-week-5-announce/E+C-poster-banner.png b/content/post/2017-week-5-announce/E+C-poster-banner.png
similarity index 100%
rename from source/_posts/2017-week-5-announce/E+C-poster-banner.png
rename to content/post/2017-week-5-announce/E+C-poster-banner.png
diff --git a/source/_posts/2017-week-5-announce.md b/content/post/2017-week-5-announce/index.md
similarity index 58%
rename from source/_posts/2017-week-5-announce.md
rename to content/post/2017-week-5-announce/index.md
index c6462aa..3be76ca 100644
--- a/source/_posts/2017-week-5-announce.md
+++ b/content/post/2017-week-5-announce/index.md
@@ -1,31 +1,35 @@
 ---
-title: 'Week 5 | Intro to Git | HackerClub | Ball'
-date: '2017-10-16'
 author: winesnob
 banner: E+C-poster-banner.png
+date: '2017-10-16'
 tags:
- - Git
- - HackerClub
- - Ball
+  - Git
+  - HackerClub
+  - Ball
+title: Week 5 | Intro to Git | HackerClub | Ball
 ---
 
-
 Hello Brickies,
 
 TL;DR
+
 - Intro to Git (Wed 15:00 @ LG25)
 - Hackerclub (Thu 16:00 @ L101)
 - Ball Tickets on Sale Week 6
 
-
+ 
 
 ##Intro to Git
 
-Git is a word you're going to hear a lot. But what is git? What can it do? How can you use it?
+Git is a word you're going to hear a lot. But what is git? What can it do? How
+can you use it?
 
-Well if you want to learn more, come along to LG25 on Wednesday the 18th of October at 15:00 where Stephen Blott will give a talk on the wondrous world of git.
+Well if you want to learn more, come along to LG25 on Wednesday the 18th of
+October at 15:00 where Stephen Blott will give a talk on the wondrous world of
+git.
 
-Stephen has given fantastic talks in the past on git and we are thrilled to have him in to introduce people to a very important part of software development.
+Stephen has given fantastic talks in the past on git and we are thrilled to have
+him in to introduce people to a very important part of software development.
 
 Come on down to LG25 next Wednesday at 15:00 to "git" good at git!
 
@@ -33,19 +37,28 @@ https://www.facebook.com/events/148090412473470/
 
 ##HackerClub
 
-We will step through the basics of competitive programming, helping you understand how you should interpret the question and to understand STDIN and STDOUT. We will have questions of various difficulties, even for beginners, so relax. In case you are hungry we will give you pizza to boost your algorithms by O(n^2)! In the second hour we will run some harder problems, so you can release your inner programming beast. Come to L101 at 16:00 on Thursday for 2 hour session of fun!
+We will step through the basics of competitive programming, helping you
+understand how you should interpret the question and to understand STDIN and
+STDOUT. We will have questions of various difficulties, even for beginners, so
+relax. In case you are hungry we will give you pizza to boost your algorithms by
+O(n^2)! In the second hour we will run some harder problems, so you can release
+your inner programming beast. Come to L101 at 16:00 on Thursday for 2 hour
+session of fun!
 
 https://www.facebook.com/events/144497879493359/
 
 ##Engineering and Computing Ball
 
-EngSoc and Redbrick have been working hard over the past few months to bring you one of the top highlights of the year!
+EngSoc and Redbrick have been working hard over the past few months to bring you
+one of the top highlights of the year!
 
 THE ENGINEERING AND COMPUTING BALL
 
-It will take place on Thursday, November 16th, in The Bonnington Dublin (Formally the Regency hotel), on the Swords road.
+It will take place on Thursday, November 16th, in The Bonnington Dublin
+(Formally the Regency hotel), on the Swords road.
 
 The event will be as follows:
+
 - Prosecco Reception
 - 3 course banquet
 - Band
@@ -55,11 +68,13 @@ Dress code is formal so stay classy 😉
 
 Tickets will go on sale on Monday of Week 6 (22nd October) in the Henry Grattan
 
-CONCESSION PRICE: 45euro*
+CONCESSION PRICE: 45euro\*
 
 STANDARD PRICE: 50euro
 
-\*To avail of concesion price, all you have to do is pay a €10 deposit at either of the societies' stands at sign-ups; EngSoc freshers with coupons can also avail of this price at ticket sales
+\*To avail of concesion price, all you have to do is pay a €10 deposit at either
+of the societies' stands at sign-ups; EngSoc freshers with coupons can also
+avail of this price at ticket sales
 
 https://www.facebook.com/events/312772709198090
 
diff --git a/source/_posts/2017-week-7-and-a-half-announce/egm.png b/content/post/2017-week-7-and-a-half-announce/egm.png
similarity index 100%
rename from source/_posts/2017-week-7-and-a-half-announce/egm.png
rename to content/post/2017-week-7-and-a-half-announce/egm.png
diff --git a/source/_posts/2017-week-7-and-a-half-announce.md b/content/post/2017-week-7-and-a-half-announce/index.md
similarity index 61%
rename from source/_posts/2017-week-7-and-a-half-announce.md
rename to content/post/2017-week-7-and-a-half-announce/index.md
index 2b08d73..ca98b16 100644
--- a/source/_posts/2017-week-7-and-a-half-announce.md
+++ b/content/post/2017-week-7-and-a-half-announce/index.md
@@ -1,64 +1,67 @@
 ---
-title: Week 7 and a half | EGM | HackerClub | Nubar | Ball
-date: '2017-11-01'
 author: winesnob
 banner: egm.png
+date: '2017-11-01'
 tags:
   - EGM
   - Microsoft
   - Hackerclub
   - Nubar
   - Ball
+title: Week 7 and a half | EGM | HackerClub | Nubar | Ball
 ---
 
 Hey Everyone,
 
 TL;DR
+
 - Microsoft Cancelled Today
 - EGM, November 8th
 - HackerClub, Thursday L101 @ 16:00
 - Mid-Semester Drinks, Thursday Nubar @ 19:00
 - Engineering and Computing Ball
 
-
+ 
 
 ## Microsoft Cancelled Today
 
-Unfortunately, The event today Microsoft Tech Talk: Chasing 9's has been postponed
-to later in the month, due to unforseen circumstances with the Microsoft team.
+Unfortunately, The event today Microsoft Tech Talk: Chasing 9's has been
+postponed to later in the month, due to unforseen circumstances with the
+Microsoft team.
 
 ## EGM
 
-We have unfortunately had some members leave our committee. Welp.
-This means we will be looking to fill a few positions.
-The positions up for grabs are:
+We have unfortunately had some members leave our committee. Welp. This means we
+will be looking to fill a few positions. The positions up for grabs are:
+
 - Secretary
 - PRO
 - First Year Rep
 - Helpdesk x2
 
-If you would like to run for helpdesk, please email committee@redbrick.dcu.ie 
-This is to facilitate running the necessary helpdesk exam. 
-Past exams are available on redbrick.dcu.ie/help/exams
+If you would like to run for helpdesk, please email committee@redbrick.dcu.ie
+This is to facilitate running the necessary helpdesk exam. Past exams are
+available on redbrick.dcu.ie/help/exams
 
 https://www.facebook.com/events/177316799488056
 
 ## HackerClub
 
-Hackerclub will be continuing as usual this Thursday, starting at 4pm.
-Come on down to practive your programming, eat pizza, and chat with us!
-We'll be working through some less-demanding problems until 5pm, and then we'll
-step up the difficulty for the brave amongst you!
+Hackerclub will be continuing as usual this Thursday, starting at 4pm. Come on
+down to practive your programming, eat pizza, and chat with us! We'll be working
+through some less-demanding problems until 5pm, and then we'll step up the
+difficulty for the brave amongst you!
 
 https://www.facebook.com/events/144497879493359
 
-## Mid-Semester Drinks
+## Mid-Semester Drinks
 
-It's reading week, and that means there's less people around than usual.
-Some of your friends may have gone home for the week, some may actually be
-hitting the books, but your friends at Redbrick won't let you down!
+It's reading week, and that means there's less people around than usual. Some of
+your friends may have gone home for the week, some may actually be hitting the
+books, but your friends at Redbrick won't let you down!
 
-Redbrick wil host a mid-semester party in the NuBar on Thursday starting at 19:00.
+Redbrick wil host a mid-semester party in the NuBar on Thursday starting at
+19:00.
 
 Feel free to pop down at any time, it's a great opportunity to get to know other
 members and the committee!
@@ -72,10 +75,11 @@ months to bring you one of the top highlights of the year!
 
 THE ENGINEERING AND COMPUTING BALL
 
-It will take place on Thursday, November 16th, in The Bonnington Dublin,
-on the Swords road.
+It will take place on Thursday, November 16th, in The Bonnington Dublin, on the
+Swords road.
 
 The event will be as follows;
+
 - Prosecco Reception
 - 3 course banquet
 - Band
@@ -83,16 +87,15 @@ The event will be as follows;
 
 Dress code is formal so stay classy 😉
 
-Tickets available here:
-http://bit.ly/2yLpDNI
+Tickets available here: http://bit.ly/2yLpDNI
 
 https://www.facebook.com/events/312772709198090
 
-Chris Dowling (winesnob)
-Redbrick PRO 2017-2018
+Chris Dowling (winesnob) Redbrick PRO 2017-2018
 
 s o c i a l m e d i a
-Twitter: @RedbrickDCU
-Facebook: https://www.facebook.com/dcuredbrick
-Snapchat: RedbrickDCU
-Events: https://events.redbrick.dcu.ie
+
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2017-week-7-announce.md b/content/post/2017-week-7-announce/index.md
similarity index 91%
rename from source/_posts/2017-week-7-announce.md
rename to content/post/2017-week-7-announce/index.md
index c1a11f7..3c5de6b 100644
--- a/source/_posts/2017-week-7-announce.md
+++ b/content/post/2017-week-7-announce/index.md
@@ -1,29 +1,30 @@
 ---
-title: Week 7 | Microsoft | HackerClub | Nubar | Ball | Hacktoberfest
-date: '2017-10-28'
 author: winesnob
 banner: rb-microsoft.png
+date: '2017-10-28'
 tags:
   - Microsoft
   - Hackerclub
   - Nubar
   - Ball
   - Hacktoberfest
+title: Week 7 | Microsoft | HackerClub | Nubar | Ball | Hacktoberfest
 ---
 
-
 Hello Brickies,
 
 TL;DR
+
 - Microsoft, Wednesday LG26 @ 15:30
 - HackerClub, Thursday L101 @ 16:00
 - Mid-Semester Drinks, Thursday Nubar @ 19:00
 - Engineering and Computing Ball
 - Hacktoberfest
 
-
+ 
 
 ## Microsoft @ Redbrick
+
 ### Wednesday | 15:30 | LG26
 
 Microsoft are back again! Last time Microsoft came in we had a fantastic coding
@@ -39,10 +40,10 @@ http://tinyurl.com/y89d3krv
 Come along to LG26 on the first day of November at 15:30. Redbrick, Microsoft
 and pizza is turning out to be quite the combination.
 
-See y'all there!
-https://www.facebook.com/events/1560927170635953/
+See y'all there! https://www.facebook.com/events/1560927170635953/
 
 ## Hackerclub
+
 ### Thursday | 4pm | L101
 
 Hackerclub will be continuing as usual this Thursday, starting at 4pm.
@@ -55,17 +56,18 @@ step up the difficulty for the brave amongst you!
 https://www.facebook.com/events/144497879493359
 
 ## Mid-Semester Drinks
+
 ### Thursday | 7pm | Nubar
 
-It's reading week, and that means there's less people around than usual. Some
-of your friends may have gone home for the week, some may actually be hitting
-the books, but your friends at Redbrick won't let you down!
+It's reading week, and that means there's less people around than usual. Some of
+your friends may have gone home for the week, some may actually be hitting the
+books, but your friends at Redbrick won't let you down!
 
 Redbrick wil host a mid-semester party in the NuBar next Thursday starting at
 19:00.
 
-Feel free to pop down at any time, it's a great opportunity to get to know
-other members and the committee!
+Feel free to pop down at any time, it's a great opportunity to get to know other
+members and the committee!
 
 https://www.facebook.com/events/1749574815336991/
 
@@ -80,6 +82,7 @@ It will take place on Thursday, November 16th, in The Bonnington Dublin, on the
 Swords road.
 
 The event will be as follows:
+
 - Prosecco Reception
 - 3 course banquet
 - Band
@@ -109,8 +112,6 @@ We've tagged some issues with the 'Hacktoberfest' label to get you started.
 
 https://hacktoberfest.digitalocean.com/
 
-
-
 Chris Dowling (winesnob)
 
 Redbrick PRO 2017-2018
diff --git a/source/_posts/2017-week-7-announce/rb-microsoft.png b/content/post/2017-week-7-announce/rb-microsoft.png
similarity index 100%
rename from source/_posts/2017-week-7-announce/rb-microsoft.png
rename to content/post/2017-week-7-announce/rb-microsoft.png
diff --git a/source/_posts/2017-week-8-announce/egm.png b/content/post/2017-week-8-announce/egm.png
similarity index 100%
rename from source/_posts/2017-week-8-announce/egm.png
rename to content/post/2017-week-8-announce/egm.png
diff --git a/source/_posts/2017-week-8-announce.md b/content/post/2017-week-8-announce/index.md
similarity index 67%
rename from source/_posts/2017-week-8-announce.md
rename to content/post/2017-week-8-announce/index.md
index 54baad6..b54d34f 100644
--- a/source/_posts/2017-week-8-announce.md
+++ b/content/post/2017-week-8-announce/index.md
@@ -1,28 +1,28 @@
 ---
-title: Week 8 | EGM | HackerClub | Ball
-date: '2017-11-07'
 author: winesnob
 banner: egm.png
+date: '2017-11-07'
 tags:
   - Hackerclub
   - EGM
   - Ball
+title: Week 8 | EGM | HackerClub | Ball
 ---
 
-
 Hey Everyone,
 
 TL;DR
+
 - EGM, Wednesday LG26 @ 17:00
 - HackerClub, Thursday L101 @ 16:00
 - Engineering and Computing Ball
 
-
-
+ 
 
 ## EGM
 
-We have unfortunately had some members leave our committee. Welp. This means we will be looking to fill a few positions. The positions up for grabs are:
+We have unfortunately had some members leave our committee. Welp. This means we
+will be looking to fill a few positions. The positions up for grabs are:
 
 - Secretary
 - PRO
@@ -30,44 +30,43 @@ We have unfortunately had some members leave our committee. Welp. This means we
 - Helpdesk x2
 
 If you would like to run for helpdesk, please email committee@redbrick.dcu.ie
-This is to facilitate running the necessary helpdesk exam.
-Past exams are available on redbrick.dcu.ie/help/exams
+This is to facilitate running the necessary helpdesk exam. Past exams are
+available on redbrick.dcu.ie/help/exams
 
 https://www.facebook.com/events/177316799488056
 
-
 ## HackerClub
 
-Hackerclub will be continuing as usual this Thursday, starting at 4pm.
-Come on down to practive your programming, eat pizza, and chat with us!
-We'll be working through some less-demanding problems until 5pm, and then we'll step up the difficulty for the brave amongst you!
+Hackerclub will be continuing as usual this Thursday, starting at 4pm. Come on
+down to practive your programming, eat pizza, and chat with us! We'll be working
+through some less-demanding problems until 5pm, and then we'll step up the
+difficulty for the brave amongst you!
 
 https://www.facebook.com/events/144497879493359
 
-
-
 ## Ball
 
-The Engineering and Redbrick societies have been working hard over the past few months to bring you one of the top highlights of the year!
+The Engineering and Redbrick societies have been working hard over the past few
+months to bring you one of the top highlights of the year!
 
 THE ENGINEERING AND COMPUTING BALL
 
-It will take place on Thursday, November 16th, in The Bonnington Dublin, on the Swords road.
+It will take place on Thursday, November 16th, in The Bonnington Dublin, on the
+Swords road.
 
 The event will be as follows;
+
 - Prosecco Reception
 - 3 course banquet
 - Band
-- DJ 
+- DJ
 
 Dress code is formal so stay classy 😉
 
-Tickets available here:
-http://bit.ly/2yLpDNI
+Tickets available here: http://bit.ly/2yLpDNI
 
 https://www.facebook.com/events/312772709198090
 
-
 Chris Dowling (winesnob)
 
 Redbrick PRO 2017-2018
diff --git a/source/_posts/2017-week-9-announce.md b/content/post/2017-week-9-announce.md
similarity index 74%
rename from source/_posts/2017-week-9-announce.md
rename to content/post/2017-week-9-announce.md
index 28ab84b..b778aac 100644
--- a/source/_posts/2017-week-9-announce.md
+++ b/content/post/2017-week-9-announce.md
@@ -1,41 +1,41 @@
 ---
-title: Week 9 | IoT | HackerClub | Ball
-date: '2017-11-12'
 author: winesnob
+date: '2017-11-12'
 tags:
   - IoT
   - Hackerclub
   - EGM
   - Ball
+title: Week 9 | IoT | HackerClub | Ball
 ---
 
-
 Hey Everyone,
 
 TL;DR
+
 - IoT, Wednesday LG26 @ 16:00
 - HackerClub, Thursday L101 @ 16:00
 - Engineering and Computing Ball
 
-
+ 
 
 ## EGM
 
-As you all know we held our EGM last week!
-I'd like to introduce our new and old and swapped aroud committee:
+As you all know we held our EGM last week! I'd like to introduce our new and old
+and swapped aroud committee:
 
 - **Chairperson**: Terry Bolt (tbolt)
-- **Secretary**: *Chris Dowling (winesnob)*
+- **Secretary**: _Chris Dowling (winesnob)_
 - **Treasurer**: Ciara Godwin (hexagon)
-- **Public Relations Officer**: *Josh Malone (sangreal)*
+- **Public Relations Officer**: _Josh Malone (sangreal)_
 - **Events Officer**: James Mc Dermott (mctastic)
 - **System Administrator**: Alex Mcgrath Kraak (akraak)
 - **System Administrator**: Cormac Smartt (pints)
 - **System Administrator**: Tom Doyle (greenday)
 - **Webmaster**: Ben McMahon (mcmahon)
-- **Helpdesk**: *Nevan Oman Crowe (branch)*
-- **Helpdesk**: *Cliodhna Harrison (thegirl)*
-- **First Year Liason Officer**: *Anthony Doran (albino)*
+- **Helpdesk**: _Nevan Oman Crowe (branch)_
+- **Helpdesk**: _Cliodhna Harrison (thegirl)_
+- **First Year Liason Officer**: _Anthony Doran (albino)_
 
 ## IoT Security Talk with d_fens
 
@@ -52,34 +52,26 @@ associate of ours, by the username of d_fens, is coming in to tell us about the
 world of IoT, IoT security, and some of the more odd and interesting
 vulnerabilities found over the years.
 
-
 https://www.facebook.com/events/1667728366625344/
 
-
 ## HackerClub
 
-Hackerclub will be continuing as usual this Thursday, starting at 4pm.
-Come on down to practive your programming, eat pizza, and chat with us!
-We'll be working through some less-demanding problems until 5pm, and then we'll
-step up the difficulty for the brave amongst you!
+Hackerclub will be continuing as usual this Thursday, starting at 4pm. Come on
+down to practive your programming, eat pizza, and chat with us! We'll be working
+through some less-demanding problems until 5pm, and then we'll step up the
+difficulty for the brave amongst you!
 
 https://www.facebook.com/events/144497879493359
 
-
-
 ## Ball
 
 The Engineering and Redbrick societies have been working hard over the past few
 months to bring you one of the top highlights of the year!
 
-
-Tickets available here:
-http://bit.ly/2yLpDNI
+Tickets available here: http://bit.ly/2yLpDNI
 
 https://www.facebook.com/events/312772709198090
 
-
-
 Chris Dowling (winesnob)
 
 Redbrick Secretary 2017-2018
diff --git a/source/_posts/2018-week-1-announce/2018-week-1-announce.jpg b/content/post/2018-week-1-announce/2018-week-1-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-1-announce/2018-week-1-announce.jpg
rename to content/post/2018-week-1-announce/2018-week-1-announce.jpg
diff --git a/source/_posts/2018-week-1-announce.md b/content/post/2018-week-1-announce/index.md
similarity index 54%
rename from source/_posts/2018-week-1-announce.md
rename to content/post/2018-week-1-announce/index.md
index c5fa2da..0038107 100644
--- a/source/_posts/2018-week-1-announce.md
+++ b/content/post/2018-week-1-announce/index.md
@@ -1,42 +1,52 @@
 ---
-title: 'Week 1 | Clubs and Socs | Intro to Redbrick'
-date: '2018-09-24'
-banner: 2018-week-1-announce.jpg
 author: branch
+banner: 2018-week-1-announce.jpg
+date: '2018-09-24'
 tags:
   - Clubs and Socs
   - Intro to Redbrick
+title: Week 1 | Clubs and Socs | Intro to Redbrick
 ---
 
-Hey everyone my name's branch and I'm back as your favourite Redbrick Secretary. 
+Hey everyone my name's branch and I'm back as your favourite Redbrick Secretary.
 
-It's finally here the start of another DCU year and another one full of Redbrick fun. It's scary how quick the Summertime flies, I know there's going to be loads on to fill your first busy week so I won't keep you long. Let's get right into it!
+It's finally here the start of another DCU year and another one full of Redbrick
+fun. It's scary how quick the Summertime flies, I know there's going to be loads
+on to fill your first busy week so I won't keep you long. Let's get right into
+it!
 
 TL;DR
+
 - Clubs & Socs 1st, 2nd and 3rd Oct
 - Intro to Redbrick 3rd Oct @3pm LG25
 
-
+ 
 
 ## Clubs & Socs
 
-Come down to see us at Clubs and Socs, We'll have a big stand set up and we'll be there all day on Monday the 1st, Tuesday the 2nd and Wednesday the 3rd.
-Come around to see us to have a chat, a slice of pizza and signup for another great year of events and talks!
+Come down to see us at Clubs and Socs, We'll have a big stand set up and we'll
+be there all day on Monday the 1st, Tuesday the 2nd and Wednesday the 3rd. Come
+around to see us to have a chat, a slice of pizza and signup for another great
+year of events and talks!
 
 ## Intro to Redbrick
 
-What's a Redbrick and how do I use it? On the last day of Clubs & Socs on Wednesday the 3rd from 3-4 @LG25 we will be introducing our new members to Redbrick!
+What's a Redbrick and how do I use it? On the last day of Clubs & Socs on
+Wednesday the 3rd from 3-4 @LG25 we will be introducing our new members to
+Redbrick!
 
 Come along and learn more about us, our community and what we can do for you!
 
-Current members and associates are welcome to come along, if you have friends who'd like to join, bring them along to the event if they didn't make it to C&S days!
+Current members and associates are welcome to come along, if you have friends
+who'd like to join, bring them along to the event if they didn't make it to C&S
+days!
 
 https://www.facebook.com/events/307132060077125/
 
-Nevan Oman Crowe (branch)
-Redbrick Secretary 2018-2019
+Nevan Oman Crowe (branch) Redbrick Secretary 2018-2019
 
 ## s o c i a l m e d i a
+
 Twitter: @RedbrickDCU
 
 Facebook: https://www.facebook.com/dcuredbrick
diff --git a/source/_posts/2018-week-2-announce/2018-week-2-announce.jpg b/content/post/2018-week-2-announce/2018-week-2-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-2-announce/2018-week-2-announce.jpg
rename to content/post/2018-week-2-announce/2018-week-2-announce.jpg
diff --git a/content/post/2018-week-2-announce/index.md b/content/post/2018-week-2-announce/index.md
new file mode 100644
index 0000000..3221b0a
--- /dev/null
+++ b/content/post/2018-week-2-announce/index.md
@@ -0,0 +1,66 @@
+---
+author: branch
+banner: 2018-week-2-announce.jpg
+date: '2018-09-30'
+tags:
+  - Clubs and Socs
+  - Intro to Redbrick
+  - Freshers Party
+title: Week 2 | Clubs and Socs | Intro to Redbrick | Freshers Party
+---
+
+Hey everyone it's me branch again! How did everyone's first week back go?
+Something new for everyone I hope. Well get ready cause the second week is where
+things really spice up. It's finally here, Clubs and Socs week. We here at
+Redbrick are going to have loads on so be sure to come around and see us!
+
+TL;DR
+
+- Clubs & Socs 1st, 2nd and 3rd Oct
+- Intro to Redbrick 3rd Oct @3pm LG25
+- Freshers Party 3rd Oct @4:15 Nubar
+
+ 
+
+## Clubs & Socs
+
+Come down to see us at Clubs and Socs, We'll have a big stand set up and we'll
+be there all day on Monday the 1st, Tuesday the 2nd and Wednesday the 3rd. Come
+around to see us to have a chat, get a big slice of pizza and signup for another
+great year of events and talks from your pals at Redbrick!
+
+## Intro to Redbrick
+
+What's a Redbrick and how do I use it? On the last day of Clubs & Socs on
+Wednesday the 3rd from 3-4 @LG25 we will be introducing our new members to
+Redbrick!
+
+Come along and learn more about us, our community and what we can do for you!
+
+Current members and associates are welcome to come along, if you have friends
+who'd like to join, bring them along to the event if they didn't make it to C&S
+days!
+
+https://www.facebook.com/events/307132060077125
+
+## Freshers Party
+
+We're having a party down in Nubar after our introduction for all our new
+members to get to know the committee and all the other Redbrick members. We'd
+love to see as many people there as we can, to chat and learn more about us, our
+community and what we can do for you!
+
+Current members and associates are encouraged to come along of course, the more
+people the the more craic to be had.
+
+Nevan Oman Crowe (branch) Redbrick Secretary 2018-2019
+
+## s o c i a l m e d i a
+
+Twitter: @RedbrickDCU
+
+Facebook: https://www.facebook.com/dcuredbrick
+
+Instagram: RedbrickDCU
+
+Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-20-announce/2018-week-20-announce.jpg b/content/post/2018-week-20-announce/2018-week-20-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-20-announce/2018-week-20-announce.jpg
rename to content/post/2018-week-20-announce/2018-week-20-announce.jpg
diff --git a/content/post/2018-week-20-announce/index.md b/content/post/2018-week-20-announce/index.md
new file mode 100644
index 0000000..8c0c79f
--- /dev/null
+++ b/content/post/2018-week-20-announce/index.md
@@ -0,0 +1,123 @@
+---
+author: mctastic
+banner: 2018-week-20-announce.jpg
+date: '2018-01-28'
+tags:
+  - Membership
+  - Hashcode
+  - Google
+  - IrlCPC
+  - HackerClub
+  - FOSDEM
+  - Agile
+  - B.Y.O.P
+title:
+  Week 1 | Semester Two Membership | Google Hash Code | IrlCPC | HackerClub |
+  FOSDEM | Agile & Friends | B.Y.O.P (Build Your Own Projects)
+---
+
+Hey all,
+
+Hope everyone enjoyed the break, even if it was littered with exams. Semester
+two has begun, and with it, Redbrick is here to brighten up your first week
+back!
+
+TL;DR
+
+- Semester Two Membership is half price!
+- Google Hash Code qualification round 1st March @ 18:30.
+- Rebrick are going to IrlCPC 10th March
+- HackerClub, Tuesday L101 @ 16:00.
+- FOSDEM, Talk on Wednesday LG26 @ 1400.
+- Agile & Friends, Wednesday LG26 15:00.
+- B.Y.O.P, Thursday L125 @ 14:00
+
+ 
+
+## Semester Two Membership
+
+Have a friend who feels it's too late to join a society? Have a friend who wants
+to get in on the Redbrick action? Well lucky for them, we are taking new
+memberships, but this time around it's half price!
+
+It's a pretty solid deal, it means you can avail of the multiple services we
+provide, and all for the low, low price of €2.00. Get all your friends to sign
+up. We know and you know that they are missing out.
+
+## Google Hash Code
+
+Step into the shoes of a Google engineer during Hash Code, a team programming
+competition that tasks students and professionals across Europe, the Middle East
+and Africa with solving a Google engineering problem. Are you up for the
+challenge? The first round (an Online Qualification Round) is on 1st March at
+18:30 CET.
+
+You can take part from anywhere you'd like, or you can participate in one of the
+Hash Code hubs. DCU's School of Computing is once again a Hash Code hub,
+providing a fun and exciting environment where teams compete side-by-side.
+
+Top scoring teams from this round will be invited to Google Dublin to compete
+for the title of Hash Code 2018 champion.
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March. If you intend to travel down with Redbrick to IrlCPC, please
+respond s soon as possible as we can give 50% off to the first seven teams that
+sign up to travel with us.
+
+If you're thinking of entering, head on over to
+http://acm.ucc.ie/node/add/registration to register your team!
+
+## HackerClub
+
+Last semester we saw a lot of our attending members develop as both problem
+solvers and programmers because of HackerClub and we hope this semester is just
+as successful!
+
+HackerClub is back once again, but this week it's on Tuesday at 16:00 in L101.
+Whether you've attended a HackerClub session before or not make sure you come
+along on Tuesday at 16:00 so you can start making HackerClub a staple of your
+weekly college diet in Semester Two!
+
+https://www.facebook.com/events/585509961786360/
+
+## FOSDEM
+
+Redbrick are off to FOSDEM once again. We fly out to Brussels this coming
+Friday. Needless to say we are all super excited and are anticipating a great
+weekend.
+
+For our traveling members, there will be a final talk to run over all details of
+our trip. This will take place at 14:00 on Wednesday in LG26. If you cannot
+attend this get together on Wednesday please let us know as soon as possible so
+we can organize and alternative time to talk to you individually.
+
+## Agile & Friends
+
+Wait you're meant to actually plan how you program? Why is waterfall bad? What
+does scrum have to do with software?? Ever ask yourself these questions? Then
+come along to Agile & Friends in LG26 on Wednesday at 15:00, where our friendly
+helpdesk will explain why project management might actually be useful and how to
+do it!
+
+https://www.facebook.com/events/203863537019965/
+
+## B.Y.O.P (Build Your Own Projects)
+
+Lastly to round the week off we have our brand new weekly project workshop -
+B.Y.O.P! Running in L125 on Thursday from 14:00 to 16:00 this week, B.Y.O.P is a
+workshop focused on project based learning, i.e applying what you already know
+to projects. Along the way you will show you some handy tools you can use to
+enhance and improve your projects.
+
+So come on down on Thursday with a project idea. If you don't have one, don't
+fret! We always come prepared with a few stock projects!
+
+https://www.facebook.com/events/339015276585338/
+
+James McDermott (~mctastic) Redbrick Events Officer 2017-2018
+
+s o c i a l m e d i a Twitter: @RedbrickDCU Facebook:
+https://www.facebook.com/dcuredbrick Snapchat: RedbrickDCU Instagram:
+@redbrickdcu Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-21-announce/2018-week-21-announce.jpg b/content/post/2018-week-21-announce/2018-week-21-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-21-announce/2018-week-21-announce.jpg
rename to content/post/2018-week-21-announce/2018-week-21-announce.jpg
diff --git a/content/post/2018-week-21-announce/index.md b/content/post/2018-week-21-announce/index.md
new file mode 100644
index 0000000..f8189e1
--- /dev/null
+++ b/content/post/2018-week-21-announce/index.md
@@ -0,0 +1,109 @@
+---
+author: mctastic
+banner: 2018-week-21-announce.jpg
+date: '2018-02-05'
+tags:
+  - Hash code
+  - IrlCPC
+  - Intro
+  - B.Y.O.P
+  - FOSDEM
+title:
+  Week 2 | Google Hash Code | IrlCPC | HackerClub | Reintroduction to Redbrick |
+  B.Y.O.P (Build Your Own Projects) | FOSDEM
+---
+
+Hello all,
+
+Week two is here. If that has you feeling somewhat lethargic, then we have a few
+events/workshops to help liven up your week!
+
+TL;DR
+
+- Google Hash Code qualification round 1st March @ 18:30.
+- Rebrick are going to IrlCPC 10th March
+- HackerClub, Tuesday L101 @ 16:00.
+- Reintroduction to Redbrick, Wednesday LG26 @ 15:00.
+- B.Y.O.P, Thursday LG125 @ 16:00
+- FOSDEM 2018 talks at https://video.fosdem.org/2018/
+
+ 
+
+## Google Hash Code
+
+Step into the shoes of a Google engineer during Hash Code, a team programming
+competition that tasks students and professionals across Europe, the Middle East
+and Africa with solving a Google engineering problem. Are you up for the
+challenge? The first round (an Online Qualification Round) is on 1st March at
+18:30 CET.
+
+You can take part from anywhere you'd like, or you can participate in one of the
+Hash Code hubs. DCU's School of Computing is once again a Hash Code hub,
+providing a fun and exciting environment where teams compete side-by-side.
+
+Top scoring teams from this round will be invited to Google Dublin to compete
+for the title of Hash Code 2018 champion.
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March. If you intend to travel down with Redbrick to IrlCPC, please
+respond s soon as possible as we can give 50% off to the first seven teams that
+sign up to travel with us.
+
+If you're thinking of entering, head on over to
+http://acm.ucc.ie/node/add/registration to register your team!
+
+## HackerClub
+
+Come down to L101 on Tuesday at 16:00 for HackerClub. Here we help you improve
+your problem solving and programming in a series of competitive programmig
+workshops.. Whether you've attended a HackerClub session before or not make sure
+you come along on Tuesday at 16:00 so you can start making HackerClub a staple
+of your weekly college diet!
+
+https://www.facebook.com/events/219722591921142/?event_time_id=219722621921139
+
+## Reintroduction to Redbrick
+
+Unfortunately, our previously scheduled talk for the 7th of February needs to be
+reorganized for another Wednesday later this semester. But never fear, we still
+have a great Wednesday talk!
+
+As the academic year progresses, you end up with a number of people who missed
+some of the more important and fundamental Redbrick talks.
+
+This one is for all the new faces, and for those not so new faces that need a
+friendly reintroduction to what Redbrick does, along with a crash course in how
+to become a part of the not so elite IRC squad.
+
+Come along to LG26 on Wednesday at 15:00 and catch up on all the action!
+
+https://www.facebook.com/events/587073878359328/
+
+## B.Y.O.P (Build Your Own Projects)
+
+Our brand new weekly workshop is back! Running in L125 on Thursday from 16:00 to
+18:00 this week, B.Y.O.P is a workshop focused on project based learning, i.e
+applying what you already know to projects. Along the way you will show you some
+handy tools you can use to enhance and improve your projects.
+
+So come on down on Thursday if you want to improve your software development
+skill-set!
+
+https://www.facebook.com/events/1766529560309030/?event_time_id=1766529590309027
+
+## FOSDEM
+
+Last but not least, for all those who ate and slept regularly this weekend, and
+thus as a result couldn't make it to FOSDEM, videos of some of the talks have
+already been made available already at https://video.fosdem.org/2018/
+
+Also a big shout out to the traveling members who flew back into Dublin airport
+late last night. Hope you all enjoy your lectures today!
+
+James McDermott (~mctastic) Redbrick Events Officer 2017-2018
+
+s o c i a l m e d i a Twitter: @RedbrickDCU Facebook:
+https://www.facebook.com/dcuredbrick Snapchat: RedbrickDCU Instagram:
+@redbrickdcu Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-22-announce/2018-week-22-announce.jpg b/content/post/2018-week-22-announce/2018-week-22-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-22-announce/2018-week-22-announce.jpg
rename to content/post/2018-week-22-announce/2018-week-22-announce.jpg
diff --git a/content/post/2018-week-22-announce/index.md b/content/post/2018-week-22-announce/index.md
new file mode 100644
index 0000000..5f92a16
--- /dev/null
+++ b/content/post/2018-week-22-announce/index.md
@@ -0,0 +1,128 @@
+---
+author: winesnob
+banner: 2018-week-22-announce.jpg
+date: '2018-02-12'
+tags:
+  - Interpints
+  - Automation
+  - HackerClub
+  - B.Y.O.P
+  - Hash code
+  - IrlCPC
+title:
+  Week 3 | Interpints | Automate & Chill | HackerClub | B.Y.O.P. | Google Hash
+  Code | IrlCPC
+---
+
+Hey Everyone,
+
+We have some events on this week to get you through your exam results!
+
+TL;DR
+
+- Interpints, Friday Alfie Byrne's by Galway Bay Brewery @ 19:00
+- Automate & Chill, Wednesday LG26 @ 15:00
+- HackerClub, Tuesday L101 @ 16:00
+- B.Y.O.P, Thursday LG125 @ 16:00
+- Google Hash Code qualification round 1st of March @ 18:30.
+- Redbrick are going to IrlCPC 10th March
+
+ 
+
+## Interpints
+
+This coming Friday (16th of February) is Interpints! Interpints is a somewhat
+cool name for a bunch of the networking societies around the city getting
+together and mingling to their herts content over a few drinks.
+
+Everyone is welcome to come, it's always fun to meet new like-minded people and
+an inter-society event is the perfect place to do it!
+
+Societies present at interpints: Redbrick, DU Netsoc, DIT CompSoc, and DUCSS.
+
+We hope to meet up in Alfie Byrne's at around 7:00pm on Friday.
+
+See you then!
+
+https://www.facebook.com/events/194581361289170/
+
+## Automate & Chill
+
+No plans for Valentine's Day yet? Rather eat pizza and find out how to make your
+life a little less hectic? Well then LG26 is where you need to be at 15:00 on
+Wednesday the 14th my friend!
+
+Over the past few months, some of the current Redbrick committee members have
+found ways to automate certain aspects of their roles. On Wednesday we look at
+what they've done and how you can apply it to your own jobs.
+
+No one likes having to do the same thing over and over again, so come along to
+LG26 on Wednesday at 15:00 and start eliminating the tedious day-to-day tasks
+from your life!
+
+https://www.facebook.com/events/189345721824940/
+
+## HackerClub
+
+Finding programming hard? At a point where you are too afraid to ask for help?
+
+Never fear - HackerClub is here!
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect right?
+
+People who attended HackerClub last semester improved more and more with each
+passing week, but most of all, they became increasingly confident in their code.
+HackerClub is run by people who know how chaotic it is as a newbie programmer,
+so this kind of development and growth is very important to us.
+
+Pop along to L101 at or indeed between 16:00 to 18:00 on a Tuesday this semester
+Rest assured that Redbrick will be there to help out!
+
+https://www.facebook.com/events/219722591921142/
+
+## B.Y.O.P
+
+Welcome to Redbrick's brand new weekly workshop, Build Your Own Projects!
+Running in L128 on Thursday from 16:00 to 18:00 this week, BYOP is a workshop
+focused on project based learning, i.e applying what you already know to
+projects.
+
+Along the way you will show you some handy tools you can use to enhance and
+improve your projects.
+
+So have a brainstorm and then come on down on Thursday and pick up some new
+skills as you build!
+
+https://www.facebook.com/events/410559502725777/
+
+## Google Hash Code
+
+Step into the shoes of a Google engineer during Hash Code, a team programming
+competition that tasks students and professionals across Europe, the Middle East
+and Africa with solving a Google engineering problem. Are you up for the
+challenge? The first round (an Online Qualification Round) is on 1st March at
+18:30 CET.
+
+You can take part from anywhere you'd like, or you can participate in one of the
+Hash Code hubs. DCU's School of Computing is once again a Hash Code hub,
+providing a fun and exciting environment where teams compete side-by-side.
+
+Top scoring teams from this round will be invited to Google Dublin to compete
+for the title of Hash Code 2018 champion.
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March in UCC. If you intend to travel down with Redbrick to IrlCPC,
+please respond s soon as possible as we can give 50% off to the first seven
+teams that sign up to travel with us.
+
+If you're thinking of entering, head on over to
+http://acm.ucc.ie/node/add/registration to register your team!
+
+Chris Dowling (winesnob) Redbrick Secretary 2017-2018
+
+s o c i a l m e d i a Twitter: @RedbrickDCU Facebook:
+https://www.facebook.com/dcuredbrick Instagram: RedbrickDCU Events:
+https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-23-announce/2018-week-23-announce.jpg b/content/post/2018-week-23-announce/2018-week-23-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-23-announce/2018-week-23-announce.jpg
rename to content/post/2018-week-23-announce/2018-week-23-announce.jpg
diff --git a/content/post/2018-week-23-announce/index.md b/content/post/2018-week-23-announce/index.md
new file mode 100644
index 0000000..8707b36
--- /dev/null
+++ b/content/post/2018-week-23-announce/index.md
@@ -0,0 +1,109 @@
+---
+author: thegirl
+banner: 2018-week-23-announce.jpg
+date: '2018-02-18'
+tags:
+  - SISTEM
+  - Bash
+  - HackerClub
+  - B.Y.O.P
+  - IrlCPC
+title:
+  'Week 4: SISTEM | Bash | HackerClub | B.Y.O.P. | Google Hash Code | IrlCPC'
+---
+
+Hey Everyone,
+
+Boy, have we got a lot going on at the moment!
+
+TL;DR
+
+- SISTEM, Saturday 24th March @ The Innovation Academy
+- BASH: Seizing the Memes of Production, Wednesday LG26 @ 15:00
+- HackerClub, Tuesday L101 @ 16:00
+- B.Y.O.P, Thursday LG125 @ 16:00
+- Google Hash Code qualification round 1st of March @ 18:30.
+- Redbrick is going to IrlCPC! 10th March
+
+ 
+
+## SISTEM - Student's Inter-Society Tech & Enterprise Meetup
+
+SISTEM is a meetup style conference run by students, for students. We hope
+SISTEM helps provide a link between students and those in the world of tech and
+enterprise in a casual meetup environment.
+
+Redbrick DCU, DUCSS, DIT Compsoc and DU Netsoc have come together to organise
+the tech event of the year! Those involved in organising SISTEM are
+undergraduates, and they recognised the lack of an event in Ireland that targets
+topics in a way that doesn’t leave students with heavy eyes & boggled minds.
+
+We hope this conference helps provide a link between students and those in the
+world of tech and enterprise in a casual meetup environment.
+
+SISTEM will take place on the 24th of March 2018 at The Innovation Academy. The
+conference will start at 9:00 AM and conclude around 5:00 PM that day. During
+the conference, there will be speakers from an array of different companies as
+well as workshops and lightning talks.
+
+We have a very exciting list of speakers and workshops that will be announced
+shortly, as will ticket sales. Tickets will be selling at €10 per person.
+
+https://www.facebook.com/events/183840945679947/
+
+## BASH: Seizing the Memes of Production
+
+Bash is a scripting language widely used for automating day-to-day tasks, like
+backups, software updates, and email alerts. However, we think we can do better.
+
+Come on down to LG26 at 3pm sharp on Wednesday the 21st for a workshop where we
+build our own meme generator script! We'll cover conditions, I/O redirection,
+and all the other things that go into serving up a spicy meme.
+
+https://www.facebook.com/events/1619231874829047/
+
+## HackerClub
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
+
+https://www.facebook.com/events/219722591921142/
+
+## B.Y.O.P
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
+
+https://www.facebook.com/events/410559502725777/
+
+## Google Hash Code
+
+Step into the shoes of a Google engineer during Hash Code, a team programming
+competition that tasks students and professionals across Europe, the Middle East
+and Africa with solving a Google engineering problem. Are you up for the
+challenge? The first round (an Online Qualification Round) is on 1st March at
+18:30 CET.
+
+You can take part from anywhere you'd like, or you can participate in one of the
+Hash Code hubs. DCU's School of Computing is once again a Hash Code hub,
+providing a fun and exciting environment where teams compete side-by-side.
+
+Top scoring teams from this round will be invited to Google Dublin to compete
+for the title of Hash Code 2018 champion.
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March in UCC. If you intend to travel down with Redbrick to IrlCPC,
+please emailcommittee@redbrick.dcu.ie as soon as possible as we can give 50% off
+to the first seven teams that sign up to travel with us.
+
+If you're thinking of entering, head on over to
+http://acm.ucc.ie/node/add/registration to register your team!
+
+Clíodhna Harrison (~thegirl) Redbrick Helpdesk 2017 - 2018
+
+s o c i a l m e d i a Twitter: @RedbrickDCU Facebook:
+https://www.facebook.com/dcuredbrick Instagram: RedbrickDCU Events:
+https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-24-announce/2018-week-24-announce.jpg b/content/post/2018-week-24-announce/2018-week-24-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-24-announce/2018-week-24-announce.jpg
rename to content/post/2018-week-24-announce/2018-week-24-announce.jpg
diff --git a/source/_posts/2018-week-24-announce/2018-week-24-announce.png b/content/post/2018-week-24-announce/2018-week-24-announce.png
similarity index 100%
rename from source/_posts/2018-week-24-announce/2018-week-24-announce.png
rename to content/post/2018-week-24-announce/2018-week-24-announce.png
diff --git a/content/post/2018-week-24-announce/index.md b/content/post/2018-week-24-announce/index.md
new file mode 100644
index 0000000..846ad9c
--- /dev/null
+++ b/content/post/2018-week-24-announce/index.md
@@ -0,0 +1,122 @@
+---
+author: winesnob
+banner: 2018-week-24-announce.jpg
+date: '2018-02-25'
+tags:
+  - Hash Code
+  - IrlCPC
+  - Linux
+  - HackerClub
+  - B.Y.O.P
+  - SISTEM
+title: Week 5 | SISTEM | HackerClub | B.Y.O.P. | Google Hash Code | IrlCPC
+---
+
+Hey Everyone,
+
+Tonnes of stuff happening this week!
+
+TL;DR
+
+- SISTEM, Saturday 24th March @ The Innovation Academy
+- SISTEM Tickets on Sale Monday @ 11:00
+- Linux Fundamentals, Wednesday LG26 @ 15:00
+- HackerClub, Tuesday L101 @ 16:00
+- B.Y.O.P, Thursday LG125 @ 16:00
+- Google Hash Code qualification round 1st of March @ 18:30.
+- Redbrick are going to IrlCPC 10th March
+
+ 
+
+SISTEM - Student's Inter-Society Tech & Enterprise Meetup We're proud to
+announce #SISTEM tickets will go on sale on Monday 26th February at 11AM! The
+link for tickets will be live on the facebook event page!
+https://www.facebook.com/events/183840945679947/
+
+## SISTEM Website: https://sistem.redbrick.dcu.ie/
+
+SISTEM is a meetup style conference run by students, for students. We hope
+SISTEM helps provide a link between students and those in the world of tech and
+enterprise in a casual meetup environment.
+
+Redbrick DCU, DUCSS, DIT Compsoc and DU Netsoc have come together to organise
+the tech event of the year! Those involved in organising SISTEM are
+undergraduates, and they recognised the lack of an event in Ireland that targets
+topics in a way that doesn’t leave students with heavy eyes & boggled minds.
+
+We hope this conference helps provide a link between students and those in the
+world of tech and enterprise in a casual meetup environment.
+
+SISTEM will take place on the 24th of March 2018 at The Innovation Academy. The
+conference will start at 9:00 AM and conclude around 5:00 PM that day. During
+the conference, there will be speakers from an array of different companies as
+well as workshops and lightning talks.
+
+We have a very exciting list of speakers and workshops that will be announced
+shortly, as will ticket sales. Tickets will be selling at €10 per person.
+
+https://www.facebook.com/events/183840945679947/
+
+## Linux Fundamentals
+
+Following the success of our BASH talk, we are doing Redbrick by request this
+week! You asked for it, so here's Linux Fundamentals!
+
+Sure, you could 'cd' and 'ls' your way around the terminal for the rest of your
+life, but you're going to need a bit more than that.
+
+On Wednesday we will be talking to you about what a kernel is, the structure of
+the filesystem, and your processes. We will also be diving into a lot of
+important commands, covering file permissions, piping, redirection, and process
+management, along with a multitude of other things!
+
+Come along to LG26 on Wednesday at 15:00 to learn some Linux and eat some pizza
+!
+
+https://www.facebook.com/events/121984521891527/
+
+## HackerClub
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
+
+https://www.facebook.com/events/219722591921142/
+
+## B.Y.O.P
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
+
+https://www.facebook.com/events/410559502725777/
+
+## Google Hash Code
+
+Step into the shoes of a Google engineer during Hash Code, a team programming
+competition that tasks students and professionals across Europe, the Middle East
+and Africa with solving a Google engineering problem. Are you up for the
+challenge? The first round (an Online Qualification Round) is on 1st March at
+18:30 CET.
+
+You can take part from anywhere you'd like, or you can participate in one of the
+Hash Code hubs. DCU's School of Computing is once again a Hash Code hub,
+providing a fun and exciting environment where teams compete side-by-side.
+
+Top scoring teams from this round will be invited to Google Dublin to compete
+for the title of Hash Code 2018 champion.
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March in UCC. If you intend to travel down with Redbrick to IrlCPC,
+please emailcommittee@redbrick.dcu.ie as soon as possible as we can give 50% off
+to the first seven teams that sign up to travel with us.
+
+If you're thinking of entering, head on over to
+http://acm.ucc.ie/node/add/registration to register your team!
+
+Chris Dowling (winesnob) Redbrick Secretary 2017-2018
+
+s o c i a l m e d i a Twitter: @RedbrickDCU Facebook:
+https://www.facebook.com/dcuredbrick Instagram: RedbrickDCU Events:
+https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-25-announce/2018-week-25-announce.jpg b/content/post/2018-week-25-announce/2018-week-25-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-25-announce/2018-week-25-announce.jpg
rename to content/post/2018-week-25-announce/2018-week-25-announce.jpg
diff --git a/content/post/2018-week-25-announce/index.md b/content/post/2018-week-25-announce/index.md
new file mode 100644
index 0000000..92e0312
--- /dev/null
+++ b/content/post/2018-week-25-announce/index.md
@@ -0,0 +1,92 @@
+---
+author: winesnob
+banner: 2018-week-25-announce.jpg
+date: '2018-03-04'
+tags:
+  - Ancient Brain Bug Bounty
+  - SISTEM
+  - Jobs Board Survey
+  - HackerClub
+  - B.Y.O.P
+  - IrlCPC
+title:
+  Week 6 | Ancient Brain Bug Bounty | SISTEM | HackerClub | B.Y.O.P. | IrlCPC
+---
+
+Hey Everyone,
+
+Hope everyone enjoyed the snow days! As a welcome back we have some pretty great
+events happening this week!
+
+TL;DR
+
+- SISTEM, Saturday 24th March @ The Innovation Academy, Tickets on Sale Now!
+- Ancient Brain Bug Bounty, Wednesday LG26 @ 15:00
+- HackerClub, Tuesday L101 @ 16:00
+- B.Y.O.P, Thursday LG125 @ 16:00
+- IrlCPC 10th March in UCC
+- Hoodies! €35! https://redbrickdcu.typeform.com/to/PiqlH7
+- Jobs Board Survey: https://redbrickdcu.typeform.com/to/sTtVlK
+
+ 
+
+## Ancient Brain Bug Bounty
+
+DCU Lecturer Mark Humphrys want to recruit some white hat hackers for a "bug
+bounty" scheme, and he thought Redbrick would be a good place to start!
+
+Mark will be coming in to talk to us about finding bugs and exploits in his
+site, Ancient Brain. Each valid exploit or bug comes with a generous cash
+reward, so come along to LG26 at 15:00 on Wednesday the 7th of March to find out
+how you can help stress-test his site!
+
+More info can be found at https://ancientbrain.com/bugs.php
+
+https://www.facebook.com/events/805842319608633/
+
+## SISTEM - Student's Inter-Society Tech & Enterprise Meetup
+
+SISTEM is a meetup style conference run by students, for students. We hope
+SISTEM helps provide a link between students and those in the world of tech and
+enterprise in a casual meetup environment.
+
+Tickets are now on sale!
+https://dcusu.ticketsolve.com/sh…/873585454/events/128131489
+
+Facebook Event:
+https://www.facebook.com/events/183840945679947/permalink/186575878739787/
+
+Keep an eye on our lineup to see talks over at: https://sistem.redbrick.dcu.ie
+
+## Jobs Board Survey
+
+Here at Redbrick we sometimes hear about different jobs that might be of
+interest to our members. As a committee we want to hear what our members think
+about the idea of a jobs board as one of our services.
+
+We have made a typeform survey to gather your opinions. We would really
+appreciate it if you could fill it out!
+
+https://redbrickdcu.typeform.com/to/sTtVlK
+
+## HackerClub
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
+
+https://www.facebook.com/events/219722591921142/
+
+## B.Y.O.P
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
+
+https://www.facebook.com/events/410559502725777/
+
+## IrlCPC
+
+The 2018 Irish Collegiate Programming Competition will be held on Saturday the
+10th of March in UCC. If you intend to travel down with Redbrick to IrlCPC,
+please email committee@redbrick.dcu.ie as soon as possible as we can give 50%
+off to the first seven teams that sign up to travel with us.
diff --git a/source/_posts/2018-week-26-announce/2018-week-26-announce.jpg b/content/post/2018-week-26-announce/2018-week-26-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-26-announce/2018-week-26-announce.jpg
rename to content/post/2018-week-26-announce/2018-week-26-announce.jpg
diff --git a/source/_posts/2018-week-26-announce.md b/content/post/2018-week-26-announce/index.md
similarity index 50%
rename from source/_posts/2018-week-26-announce.md
rename to content/post/2018-week-26-announce/index.md
index d2ff051..6b1d458 100644
--- a/source/_posts/2018-week-26-announce.md
+++ b/content/post/2018-week-26-announce/index.md
@@ -1,60 +1,77 @@
 ---
-title: 'Week 7 | Linux Fundamentals | SISTEM | HackerClub | B.Y.O.P. | IrlCPC'
-date: '2018-03-11'
-banner: 2018-week-26-announce.jpg
 author: winesnob
+banner: 2018-week-26-announce.jpg
+date: '2018-03-11'
 tags:
   - Linux Fundamentals
   - SISTEM
   - HackerClub
   - B.Y.O.P
   - IrlCPC
+title: Week 7 | Linux Fundamentals | SISTEM | HackerClub | B.Y.O.P. | IrlCPC
 ---
-Hey Everyone,
 
+Hey Everyone,
 
 TL;DR
+
 - SISTEM, Saturday 24th March @ The Innovation Academy, Tickets on Sale Now!
 - Linux Fundamentals, Wednesday LG26 @ 15:00
 - HackerClub, Tuesday L101 @ 16:00
 - B.Y.O.P, Thursday LG125 @ 16:00
 
-
-
+ 
 
 ## Linux Fundamentals
-Following the success of our BASH talk, we are doing Redbrick by request this week! You asked for it, so here's Linux Fundamentals!
 
-Sure, you could 'cd' and 'ls' your way around the terminal for the rest of your life, but you're going to need a bit more than that.
+Following the success of our BASH talk, we are doing Redbrick by request this
+week! You asked for it, so here's Linux Fundamentals!
+
+Sure, you could 'cd' and 'ls' your way around the terminal for the rest of your
+life, but you're going to need a bit more than that.
 
-On Wednesday we will be talking to you about what a kernel is, the structure of the filesystem, and your processes. We will also be diving into a lot of important commands, covering file permissions, piping, redirection, and process management, along with a multitude of other things!
+On Wednesday we will be talking to you about what a kernel is, the structure of
+the filesystem, and your processes. We will also be diving into a lot of
+important commands, covering file permissions, piping, redirection, and process
+management, along with a multitude of other things!
 
-Come along to LG26 on Wednesday at 15:00 to learn some Linux and eat some pizza !
+Come along to LG26 on Wednesday at 15:00 to learn some Linux and eat some pizza
+!
 
 https://www.facebook.com/events/121984521891527/
 
 ## SISTEM - Student's Inter-Society Tech & Enterprise Meetup
-SISTEM is a meetup style conference run by students, for students. We hope SISTEM helps provide a link between students and those in the world of tech and enterprise in a casual meetup environment.
+
+SISTEM is a meetup style conference run by students, for students. We hope
+SISTEM helps provide a link between students and those in the world of tech and
+enterprise in a casual meetup environment.
 
 Tickets are now on sale!
 https://dcusu.ticketsolve.com/shows/873585454/events/128131489
 
-Facebook Event: https://www.facebook.com/events/183840945679947/permalink/186575878739787/
+Facebook Event:
+https://www.facebook.com/events/183840945679947/permalink/186575878739787/
 
-Keep an eye on our lineup to see talks over at:
-https://sistem.redbrick.dcu.ie
+Keep an eye on our lineup to see talks over at: https://sistem.redbrick.dcu.ie
 
 ## HackerClub
-Come along to L101 on Tuesdays at 16:00 to improve your programming skills by solving competitive programming problems. Practice makes perfect, right?
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
 
 https://www.facebook.com/events/219722591921142/
 
 ## B.Y.O.P
-Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128 on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on project-based learning, i.e applying what you already know to projects.
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
 
 https://www.facebook.com/events/410559502725777/
 
 ## IrlCPC
-We would like to congratulate all of our members who took part in IrlCPC! Especially our treasurer Ciara (Hexagon) and her team for coming first!
-If you are one of our members who took part this weekend, contact us for your partial reimbursement of entry fee.
 
+We would like to congratulate all of our members who took part in IrlCPC!
+Especially our treasurer Ciara (Hexagon) and her team for coming first! If you
+are one of our members who took part this weekend, contact us for your partial
+reimbursement of entry fee.
diff --git a/source/_posts/2018-week-27-announce/2018-week-27-announce.jpg b/content/post/2018-week-27-announce/2018-week-27-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-27-announce/2018-week-27-announce.jpg
rename to content/post/2018-week-27-announce/2018-week-27-announce.jpg
diff --git a/source/_posts/2018-week-27-announce.md b/content/post/2018-week-27-announce/index.md
similarity index 55%
rename from source/_posts/2018-week-27-announce.md
rename to content/post/2018-week-27-announce/index.md
index cd70aaf..6752109 100644
--- a/source/_posts/2018-week-27-announce.md
+++ b/content/post/2018-week-27-announce/index.md
@@ -1,50 +1,61 @@
 ---
-title: 'Week 8 | SISTEM | Movie Night | HackerClub | B.Y.O.P.'
-date: '2018-03-18'
-banner: 2018-week-27-announce.jpg
 author: winesnob
+banner: 2018-week-27-announce.jpg
+date: '2018-03-18'
 tags:
   - Movie Night
   - SISTEM
   - HackerClub
   - B.Y.O.P
+title: Week 8 | SISTEM | Movie Night | HackerClub | B.Y.O.P.
 ---
-Hey Everyone,
 
+Hey Everyone,
 
 TL;DR
+
 - SISTEM, Saturday 24th March @ The Innovation Academy, Tickets on Sale!
 - Movie Night, Wednesday @ 15:00, Room: TBA
 - HackerClub, Tuesday L101 @ 16:00
 - B.Y.O.P, Thursday LG125 @ 16:00
 
-
-
+ 
 
 ## Movie Night
-Redbrick is bringing our movie nights back! This week we're taking a bit of a break but still learning (maybe not) by watching the tech cult classic Hackers! Come along Wednesday after class, relax and have some pizza!
+
+Redbrick is bringing our movie nights back! This week we're taking a bit of a
+break but still learning (maybe not) by watching the tech cult classic Hackers!
+Come along Wednesday after class, relax and have some pizza!
 
 https://www.facebook.com/events/1708390009250789/
 
 ## SISTEM - Student's Inter-Society Tech & Enterprise Meetup
+
 SISTEM is on this Saturday!
 
-SISTEM is a meetup style conference run by students, for students. We hope SISTEM helps provide a link between students and those in the world of tech and enterprise in a casual meetup environment.
+SISTEM is a meetup style conference run by students, for students. We hope
+SISTEM helps provide a link between students and those in the world of tech and
+enterprise in a casual meetup environment.
 
 Tickets are on sale!
 https://dcusu.ticketsolve.com/shows/873585454/events/128131489
 
-Facebook Event: https://www.facebook.com/events/183840945679947/permalink/186575878739787/
+Facebook Event:
+https://www.facebook.com/events/183840945679947/permalink/186575878739787/
 
-Keep an eye on our lineup to see talks over at:
-https://sistem.redbrick.dcu.ie
+Keep an eye on our lineup to see talks over at: https://sistem.redbrick.dcu.ie
 
 ## HackerClub
-Come along to L101 on Tuesdays at 16:00 to improve your programming skills by solving competitive programming problems. Practice makes perfect, right?
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
 
 https://www.facebook.com/events/219722591921142/
 
 ## B.Y.O.P
-Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128 on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on project-based learning, i.e applying what you already know to projects.
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
 
 https://www.facebook.com/events/410559502725777/
diff --git a/source/_posts/2018-week-28-announce/2018-week-28-announce.jpg b/content/post/2018-week-28-announce/2018-week-28-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-28-announce/2018-week-28-announce.jpg
rename to content/post/2018-week-28-announce/2018-week-28-announce.jpg
diff --git a/source/_posts/2018-week-28-announce.md b/content/post/2018-week-28-announce/index.md
similarity index 50%
rename from source/_posts/2018-week-28-announce.md
rename to content/post/2018-week-28-announce/index.md
index b4a5c6b..a590f42 100644
--- a/source/_posts/2018-week-28-announce.md
+++ b/content/post/2018-week-28-announce/index.md
@@ -1,50 +1,70 @@
 ---
-title: 'Week 9 | Programming Easter Eggs | SISTEM | AGM | HackerClub | B.Y.O.P.'
-date: '2018-03-25'
-banner: 2018-week-28-announce.jpg
 author: winesnob
+banner: 2018-week-28-announce.jpg
+date: '2018-03-25'
 tags:
   - SISTEM
   - Programming Easter Eggs
   - HackerClub
   - B.Y.O.P
   - AGM
+title: Week 9 | Programming Easter Eggs | SISTEM | AGM | HackerClub | B.Y.O.P.
 ---
-Hello there's lots of great things on this week. Be sure to read the info regarding the AGM too!
+
+Hello there's lots of great things on this week. Be sure to read the info
+regarding the AGM too!
 
 TL;DR
+
 - Programming Easter Eggs, Wednesday @ 15:00, LG26
 - HackerClub, Tuesday L101 @ 16:00
 - B.Y.O.P, Thursday LG125 @ 16:00
 - AGM, Tuesday April 3rd @ 19:00 in CG04
 
-
-
+ 
 
 ## SISTEM
-A big thank you to everyone who came to SISTEM! We can't wait for next year!
-An even bigger thank you to all the committees involved, Redbrick, TCD Netsoc, DUCSS and DIT CompSoc.
+
+A big thank you to everyone who came to SISTEM! We can't wait for next year! An
+even bigger thank you to all the committees involved, Redbrick, TCD Netsoc,
+DUCSS and DIT CompSoc.
 
 ## Programming Easter Eggs
-Sometimes programmers are bored or just want to inject a little fun into their work! So this week we're exploring all the fun little treats and tricks in various websites and programming languages! There will also be Easter eggs raffled off!
+
+Sometimes programmers are bored or just want to inject a little fun into their
+work! So this week we're exploring all the fun little treats and tricks in
+various websites and programming languages! There will also be Easter eggs
+raffled off!
 
 https://www.facebook.com/events/183580289097725/
 
 ## HackerClub
-Come along to L101 on Tuesdays at 16:00 to improve your programming skills by solving competitive programming problems. Practice makes perfect, right?
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
 
 https://www.facebook.com/events/219722591921142/
 
 ## B.Y.O.P
-Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128 on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on project-based learning, i.e applying what you already know to projects.
+
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
 
 https://www.facebook.com/events/410559502725777/
 
 ## AGM
-Tuesday the 3rd of April is torch passing day! That's right folks, the Redbrick AGM is here, which means it's time to say farewell to the current committee as we know it.
 
-On Tuesday the 3rd of April at 7:00pm we will be running elections for the following positions: Chair, Secretary, P.R.O, Treasurer, System Administrators (x3), Helpdesk (x2), Webmaster, and Events Officer.
+Tuesday the 3rd of April is torch passing day! That's right folks, the Redbrick
+AGM is here, which means it's time to say farewell to the current committee as
+we know it.
+
+On Tuesday the 3rd of April at 7:00pm we will be running elections for the
+following positions: Chair, Secretary, P.R.O, Treasurer, System Administrators
+(x3), Helpdesk (x2), Webmaster, and Events Officer.
 
-If you are thinking about run for the positions of helpdesk, admin, or webmaster, please email us at committee@redbrick.dcu.ie so we can prepare the exams.
+If you are thinking about run for the positions of helpdesk, admin, or
+webmaster, please email us at committee@redbrick.dcu.ie so we can prepare the
+exams.
 
-https://www.facebook.com/events/1594689983960391/
\ No newline at end of file
+https://www.facebook.com/events/1594689983960391/
diff --git a/source/_posts/2018-week-29-announce/2018-week-29-announce.jpg b/content/post/2018-week-29-announce/2018-week-29-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-29-announce/2018-week-29-announce.jpg
rename to content/post/2018-week-29-announce/2018-week-29-announce.jpg
diff --git a/source/_posts/2018-week-29-announce.md b/content/post/2018-week-29-announce/index.md
similarity index 51%
rename from source/_posts/2018-week-29-announce.md
rename to content/post/2018-week-29-announce/index.md
index d7c4b36..cf6bfd2 100644
--- a/source/_posts/2018-week-29-announce.md
+++ b/content/post/2018-week-29-announce/index.md
@@ -1,41 +1,51 @@
 ---
-title: ' Week 10 | Containers: How Do They Work? | AGM Results | Annual Table Quiz | HackerClub | B.Y.O.P.'
-date: '2018-04-01'
-banner: 2018-week-29-announce.jpg
 author: thegirl
+banner: 2018-week-29-announce.jpg
+date: '2018-04-01'
 tags:
   - Containers
   - Annual Table Quiz
   - AGM Results
   - HackerClub
   - B.Y.O.P
+title:
+  ' Week 10 | Containers: How Do They Work? | AGM Results | Annual Table Quiz |
+  HackerClub | B.Y.O.P.'
 ---
+
 Hello hello hello everyone,
 
-We're a little late this week (forgive us, we did some committee shuffling), but here is all that's coming up in the Redbrick calendar!
+We're a little late this week (forgive us, we did some committee shuffling), but
+here is all that's coming up in the Redbrick calendar!
 
 TL;DR
+
 - Containers: How Do They Work?, Wednesday @ 15:00, LG26
 - Annual Table Quiz, April 11th @ 19:00 in NuBar
 - HackerClub, Tuesday L101 @ 16:00
 - B.Y.O.P, Thursday LG125 @ 16:00
 
-
-
+ 
 
 ## Containers: How Do They Work?
-Don't know your Dockers from your Rkts? Ever wondered what these 'container' things everyone's talking about are?
-Join us in LG26, where we'll have Cormac (~pints) from Demonware coming to demystify the wonderful world of process isolation.
-Absolute beginners welcome! This talk assumes no prior container or virtualisation experience, though a little Linux knowledge would help!
+
+Don't know your Dockers from your Rkts? Ever wondered what these 'container'
+things everyone's talking about are? Join us in LG26, where we'll have Cormac
+(~pints) from Demonware coming to demystify the wonderful world of process
+isolation. Absolute beginners welcome! This talk assumes no prior container or
+virtualisation experience, though a little Linux knowledge would help!
 
 https://www.facebook.com/events/396641470808835/
 
 ## Annual Table Quiz
+
 The annual wrap up event for the year is our famous table quiz!
 
-We've got some cool prizes to give away this year and we're deciding on the ever coveted raffle prize at the moment
+We've got some cool prizes to give away this year and we're deciding on the ever
+coveted raffle prize at the moment
 
-There’s no doubt the Redbrick Table Quiz will be as fantastic as ever this year! We hope to see you all there!
+There’s no doubt the Redbrick Table Quiz will be as fantastic as ever this year!
+We hope to see you all there!
 
 Entry per person: €3 ( that’s €12 for a table of 4)
 
@@ -44,17 +54,28 @@ Raffle Tickets: €1 or a strip for €3
 https://www.facebook.com/events/200564633877050/
 
 ## AGM Results
-The passing of torches has happened and a big welcome to our new committee members! Also a sad goodbye to our previous committee members. The committee is dead, long live the committee!
 
-Chair: James McDermott (~mctastic) Secretary: Nevan Oman Crowe (~branch) Treasurer: Ciara Godwin (~hexagon) P. R. O. : Josh Malone (~sangreal) Events Officer: Clíodhna Harrison (~thegirl) Admins: Tom Doyle (~greenday), Ben McMahon (~mcmahon), Lucas Savva (~m1cr0man) Webmaster: Seán Fradl (~fraz) Helpdesk: Conor Berns (~berns)
+The passing of torches has happened and a big welcome to our new committee
+members! Also a sad goodbye to our previous committee members. The committee is
+dead, long live the committee!
+
+Chair: James McDermott (~mctastic) Secretary: Nevan Oman Crowe (~branch)
+Treasurer: Ciara Godwin (~hexagon) P. R. O. : Josh Malone (~sangreal) Events
+Officer: Clíodhna Harrison (~thegirl) Admins: Tom Doyle (~greenday), Ben McMahon
+(~mcmahon), Lucas Savva (~m1cr0man) Webmaster: Seán Fradl (~fraz) Helpdesk:
+Conor Berns (~berns)
 
 ## HackerClub
-Come along to L101 on Tuesdays at 16:00 to improve your programming skills by solving competitive programming problems. Practice makes perfect, right?
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills by
+solving competitive programming problems. Practice makes perfect, right?
 
 https://www.facebook.com/events/219722591921142/
 
 ## B.Y.O.P
-Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128 on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on project-based learning, i.e applying what you already know to projects.
 
-https://www.facebook.com/events/410559502725777/
+Redbrick's weekly workshop, Build Your Own Projects is on again! Running in L128
+on Thursday from 16:00 to 18:00 this week, BYOP is a workshop focused on
+project-based learning, i.e applying what you already know to projects.
 
+https://www.facebook.com/events/410559502725777/
diff --git a/source/_posts/2018-week-3-announce/2018-week-3-announce.jpg b/content/post/2018-week-3-announce/2018-week-3-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-3-announce/2018-week-3-announce.jpg
rename to content/post/2018-week-3-announce/2018-week-3-announce.jpg
diff --git a/content/post/2018-week-3-announce/index.md b/content/post/2018-week-3-announce/index.md
new file mode 100644
index 0000000..1dfb0a3
--- /dev/null
+++ b/content/post/2018-week-3-announce/index.md
@@ -0,0 +1,92 @@
+---
+author: branch
+banner: 2018-week-3-announce.jpg
+date: '2018-10-07'
+tags:
+  - Microsoft
+  - HackerClub
+  - EGM
+  - UKIEPC
+title: Week 3 | Microsoft Talk | Hackerclub | EGM | UKIEPC
+---
+
+Hello again everyone, especially all our new brickies. It's branch your
+secretary here.
+
+Hope you all enjoyed our introduction last week and also hope that all your
+classes are going well.This week there's lots more in store for everyone! Come
+along to everything if you can and see what we have to offer, especially our EGM
+where we'll be electing new committee members!
+
+TL;DR
+
+- Microsoft Talk - Why (almost) everything is worse at Scale. And why that’s
+  Good. Wednesday @3pm LG25
+- Hackerclub Thursday @4pm L101
+- EGM Thursday @6:30pm L101
+- UKIEPC
+
+ 
+
+## Microsoft Talk - Why (almost) everything is worse at Scale. And why that’s Good
+
+To solve problems that affect billions of people, you need to think about them
+in a different way. This talk will follow how we use the scale of Microsoft to
+empower the lives of all of our users, including how the scale affects how we go
+about solving issues, testing for it and how we monitor for issues.
+
+Eoin O'Brien has been a software engineer in Microsoft Office for over 2 years
+currently driving knowledge from insights on the One Microsoft Enterprise
+Acceleration team. Eoin has worked on services, data processing and publicly
+facing websites, including working on both the consumer and enterprise side of
+Office, driving growth and adoption. Come along and see what this great talk has
+to offer, meet some great industry professionals and maybe learn something new!
+
+https://www.facebook.com/events/329208467843184/
+
+## Hackerclub
+
+Are you finding programming hard? Little bit stuck or at a point where you’re
+too afraid to ask questions? Never fear! Hackerclub is back and better than
+ever!
+
+Come along down to L101 Thursday at 4pm to find out what it’s all about and
+maybe learn a few new things about tackling those pesky programming problems!
+
+https://www.facebook.com/events/442473026277313/
+
+## EGM
+
+This is one of our huge events this week, It's our EGM. It's coming up this
+Thursday @6:30 in L101 just after hackerclub. Please come along and maybe run
+for a position, vote or have just have some craic!
+
+Here are all the positions available:
+
+- First-year rep
+- Graphics Officer
+- Vice Chair
+- Second Events Officer
+- Second Helpdesk Officer
+- Two Ordinary Members Talk to any of the committee members beforehand if you
+  have any questions!
+
+https://www.facebook.com/events/1798124463599298/
+
+## UKIEPC
+
+This year Redbrick will be hosting a Hub in DCU for UKIEPC, at the moment it's
+all getting set up and we will have further emails and more information about it
+during the week. Just keep watching those emails!
+
+Nevan Oman Crowe (branch) Redbrick Secretary 2018-2019
+
+## s o c i a l m e d i a
+
+Twitter: @RedbrickDCU
+
+Facebook: https://www.facebook.com/dcuredbrick
+
+Instagram: RedbrickDCU
+
+Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/2018-week-30-announce/2018-week-30-announce.jpg b/content/post/2018-week-30-announce/2018-week-30-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-30-announce/2018-week-30-announce.jpg
rename to content/post/2018-week-30-announce/2018-week-30-announce.jpg
diff --git a/content/post/2018-week-30-announce/index.md b/content/post/2018-week-30-announce/index.md
new file mode 100644
index 0000000..c22e490
--- /dev/null
+++ b/content/post/2018-week-30-announce/index.md
@@ -0,0 +1,78 @@
+---
+author: branch
+banner: 2018-week-30-announce.jpg
+date: '2018-04-08'
+tags:
+  - Summer Upskilling
+  - Redbrick Table Quiz
+  - HackerClub
+  - B.Y.O.P
+title: Week 11 | Talk | Table Quiz | Hacker Club | B.Y.O.P
+---
+
+Hi everyone, my name is Nevan Oman Crowe (branch) and I'm the new Redbrick
+Secretary, I'm here to bring to you all the Redbrick info your minds desire. The
+first thing I'd like to say at the start of my magical adventure as the Redbrick
+Secretary is to give out my biggest thanks to our outgoing Secretary Chris
+Dowling (winesnob) for her amazing work throughout my first year in the Redbrick
+circus. `<3`
+
+Now onto the rest of the info for the coming week, hope you guys come along to
+as many things we have on as possible and enjoy them all!
+
+TL;DR
+
+- "Summer: A Redbrick Guide to Upskilling" , Wednesday LG26 @ 15:00
+- Redbrick Table Quiz Thursday Nubar @ 19:00
+- HackerClub, Tuesday L101 @ 16:00
+- B.Y.O.P Thursday L128 @ 16:00
+
+ 
+
+## "Summer: A Redbrick Guide to Upskilling"
+
+There's 104 days of summer vacation And school comes along just to end it So the
+annual problem for our generation Is finding a good way to spend it...
+
+Redbrick is here with a guide for what you need to do over summer to both get a
+head start on your next year in college, and learn some new stuff along the way!
+Want to pick up a new programming language but not sure where to start? Looking
+for some project ideas? Looking for some free pizza?
+
+Come along to LG26 on Wednesday the 11th at 3:00pm, we'll be there with some
+tips for all those looking to upskill this summer!
+
+https://www.facebook.com/events/169276297224990/
+
+## Redbrick Table Quiz
+
+So we're running our annual table quiz this Thursday!, Its going to be our wrap
+up event for the year and will be a great time to test out your metal abilities
+and knowledge and maybe in some prizes. We are also running a huge raffle with a
+great prize to be decided soon, will you be the lucky one?
+
+Entry per person: €3 ( that’s €12 for a table of 4)
+
+Raffle Tickets: €1 or a strip for €3
+
+There’s no doubt the Redbrick Table Quiz will be as fantastic as ever this year!
+We hope to see you all there! https://www.facebook.com/events/200564633877050/
+
+## HackerClub
+
+Were running our weekly event to help you all with your programming coming up to
+the final weeks it can only help right?
+
+Come along to L101 on Tuesdays at 16:00 to improve your programming skills.
+Practice makes perfect.
+
+https://www.facebook.com/events/219722591921142/
+
+## B.Y.O.P
+
+Redbrick's weekly workshop, Build Your Own Projects / Bring Your Own Pizza (Not
+really) is on again! Running in L128 on Thursday from 16:00 to 18:00 this week,
+It's a workshop focused on project-based learning, i.e applying what you already
+know to create amazing new projects.
+
+https://www.facebook.com/events/410559502725777/
diff --git a/source/_posts/2018-week-4-announce/2018-week-4-announce.jpg b/content/post/2018-week-4-announce/2018-week-4-announce.jpg
similarity index 100%
rename from source/_posts/2018-week-4-announce/2018-week-4-announce.jpg
rename to content/post/2018-week-4-announce/2018-week-4-announce.jpg
diff --git a/content/post/2018-week-4-announce/index.md b/content/post/2018-week-4-announce/index.md
new file mode 100644
index 0000000..528f951
--- /dev/null
+++ b/content/post/2018-week-4-announce/index.md
@@ -0,0 +1,123 @@
+---
+author: mctastic
+banner: 2018-week-4-announce.jpg
+date: '2018-10-15'
+tags:
+  - Accenture
+  - Linux
+  - Redbrick
+  - HackerClub
+  - UKIEPC
+  - FOSDEM
+title: Week 4 | Accenture Talk | Intro To Linux | HackerClub | UKIEPC | FOSDEM
+---
+
+Hi there brickies,
+
+Redbrick Chair mctastic here! Your ever busy Secretary and usual writer of the
+weekly announce, branch is off in Germany for the weekend! So I'm afraid your
+stuck with me to tell you all about what Redbrick is getting up to this week!
+
+Before that, however, I want to extend my congratulations to those who were
+elected onto the Redbrick committee at our EGM last Thursday! Your brand new
+committee members are:
+
+- Eamon Crawford (eamon_c)
+- Vice Chair Theo Coyne Morgan (depp)
+- GDO Jack Liston (chill)
+- Second Events Officer Maciej Swierad (wolfer)
+- First Year Rep Daniel Christie (sun) & Cian Kehoe (cianky)
+- Ordinary Members Connor Mulready (mulreac) - Helpdesk
+
+Congratulations to all our new committee members! I'm looking forward to an
+undoubtedly successful and great year with you guys!
+
+So... what do we have in store for you this week?
+
+TL;DR
+
+- Accenture Analytics Graduate Programme Talk - Monday @ 5pm CG86
+- Intro To Linux - Wednesday @ 3pm LG25
+- Hackerclub - Thursday @ 4pm L101
+- UKIEPC - Register your team now before Thursday 18th October:
+  https://icpc.baylor.edu/regionals/finder/ukiepc-2018
+- FOSDEM - Signup link: https://fosdem.redbrick.dcu.ie
+
+  
+
+## Accenture Analytics Graduate Programme Talk
+
+Are you a logical thinker with an aptitude for problem solving? Do you want to
+use Advanced Analytics, Machine Learning & Applied Intelligence to deliver value
+realization for clients?
+
+If you are interested in finding out more about the Accenture Analytics graduate
+programme then come along to our Analytics evening in DCU.
+
+Sign up here:
+https://www.eventbrite.ie/e/accenture-analytics-graduate-programme-talk-tickets-51016658198
+
+https://www.facebook.com/events/710213876003101/
+
+## Intro To Linux
+
+Meet your new home! The surroundings of Linux can be quite intimidating at
+first, once you open up a terminal like your lecturer told you to, it feels as
+if you're abstracted away form this new environment! Sure, you can `cd` & `ls`
+your way around the terminal for the next while, but eventually, you're going to
+need a bit more than that.
+
+On Wednesday you'll receive a brief Intro to Linux courtesy of Redbrick's very
+own Helpdesk! We will be (hopefully) covering something new for everyone here!!
+Make sure you come along to LG25 on Wednesday at 15:00 to learn you some Linux
+and eat you some pizza !
+
+https://www.facebook.com/events/2196757460598738/
+
+## HackerClub
+
+Are you finding programming hard? Little bit stuck or at a point where you’re
+too afraid to ask questions? Never fear! HackerClub is back and better than
+ever!
+
+Come along down to L101 Thursday at 4pm to find out what it’s all about and
+maybe learn a few new things about tackling those pesky programming problems!
+
+https://www.facebook.com/events/252014042065001/
+
+## UKIEPC
+
+This year Redbrick will be hosting a Hub in DCU for UKIEPC. Prizes and food on
+the day will be graciously sponsored by Mastercard, and trust us, you won't want
+to miss out on what's on offer!
+
+If you want to compete on the day, make sure to register for the competition at
+https://icpc.baylor.edu/regionals/finder/ukiepc-2018 before this coming
+Thursday! For more information on Redbrick's UKIEPC Hub or UKIEPC in general,
+check out https://ukiepc.redbrick.dcu.ie
+
+## FOSDEM
+
+Redbrick are bound for Brussels once again this February! FOSDEM is taking place
+on the 2nd & 3rd of February, 2019. For those not in the know, FOSDEM is the
+Free and Open source Software Developers' European Meeting. Basically, it's a
+huge meetup of developer's from across the world, taking place on the ULB
+Solbosch campus in Brussels.
+
+Redbrick have made it tradition to fly out each year for some time now. If
+you're at all interested in coming along in 2019, please make your interest know
+at https://fosdem.redbrick.dcu.ie
+
+Have a good week peoples,
+
+James McDermott (~mctastic). Redbrick Chair 2018-19.
+
+## s o c i a l m e d i a
+
+Twitter: @RedbrickDCU
+
+Facebook: https://www.facebook.com/dcuredbrick
+
+Instagram: RedbrickDCU
+
+Events: https://events.redbrick.dcu.ie
diff --git a/source/_posts/digital-discovery-week/ddw.png b/content/post/digital-discovery-week/ddw.png
similarity index 100%
rename from source/_posts/digital-discovery-week/ddw.png
rename to content/post/digital-discovery-week/ddw.png
diff --git a/content/post/digital-discovery-week/index.md b/content/post/digital-discovery-week/index.md
new file mode 100644
index 0000000..1d19f1e
--- /dev/null
+++ b/content/post/digital-discovery-week/index.md
@@ -0,0 +1,102 @@
+---
+author: tziegler
+banner: ddw.png
+date: '2011-11-13 02:32:50'
+tags:
+  - web design
+  - Digital Discovery Week
+title: Digital Discovery Week
+---
+
+Redbrick in association with the [Student's Union](http://www.dcusu.ie/) are
+extremely proud to host the first annual Digital Discovery Week in DCU. The idea
+of Digital Discovery Week is to show how computing is everywhere in our day to
+day lives and to engage those of us that are quite technical as well as those
+that may not be studying computing.
+
+We have a whole week jam packed full of events that are aimed at everybody in
+DCU and we encourage everyone, not just Redbrick members, to come along to any
+event and learn something new.
+
+ 
+
+**Visit [DigitalDiscovery.dcu.ie](http://digitaldiscovery.dcu.ie) for updated
+event info.**
+
+Here's a rundown of what's happening:
+
+## Monday 14th
+
+#### Designing For The Mobile Web - 5pm to 6pm
+
+_LG26 - Computing Building_
+
+How do you approach creating a website for a mobile device? What do you need to
+be aware of? Are there technical limitations? On Monday we'll be showing you how
+to approach designing websites for mobile devices like iPhones and Android
+smartphones.
+
+#### Kickoff Drinks in Nubar - 6pm to late
+
+_Nubar in the Hub_
+
+We'll be starting off the week with a few drinks in Nubar. Come along and get to
+meet a few new people. There'll also be a special cocktail available for this
+week and this week only. What's in it? You'll have to try one and find out.
+
+## Tuesday 15th
+
+#### Workday Seminar - 6pm to 8pm
+
+_QG13 - Business School_
+
+Workday have very kindly agreed to come to DCU to do a few quickfire talks.
+They'll also be doing a quick Q&A on interview techniques. To top it all off
+they've kindly agreed to put some money behind the bar as well.
+
+What are they talking about?
+
+1.  Cloud Computing
+2.  Continuous 3Ds
+3.  You and The Software Industry
+
+## Wednesday 16th
+
+#### 3D Modelling Workshop - 2pm to 4pm
+
+_LG26 - Computing Building_
+
+We'll be holding a workshop where you'll learn what goes into creating movies in
+3D software. Ever wanted to make movies like Toy Story? Come see the basics of
+what that takes. We'll be doing some basic 3D Modelling and showing you how to
+animate a camera to create some great movies of your own.
+
+#### Techspectations - LinkedIn Marketing - 6pm to 8pm
+
+_QG13 - Business School_
+
+Workshop presented by Dr. Theo Lynn - DCU Director of Leadership and Innovation.
+More details to follow.
+
+## Thursday 17th
+
+#### What's inside your Computer? - 5pm to 7pm
+
+_L101 - Computing Building_
+
+Ever wondered what is actually inside your computer and what makes it tick?
+We'll be doing a hands on workshop on what goes on inside your computer. You'll
+be taking apart a computer and learning what components do what. You may just
+find out it's not as scary as you think it is.
+
+## Friday 18th
+
+#### #GetSocial - 5pm to 7pm
+
+_Mahony Hall in the Helix_
+
+To finish off the week we'll have some world leaders in social media speak in
+the Helix. More details to follow.
+
+**Visit [DigitalDiscovery.dcu.ie](http://digitaldiscovery.dcu.ie) for updated
+event info.**
diff --git a/source/_posts/egm/egm.png b/content/post/egm/egm.png
similarity index 100%
rename from source/_posts/egm/egm.png
rename to content/post/egm/egm.png
diff --git a/content/post/egm/index.md b/content/post/egm/index.md
new file mode 100644
index 0000000..2ee2b62
--- /dev/null
+++ b/content/post/egm/index.md
@@ -0,0 +1,32 @@
+---
+author: teapott
+banner: egm.png
+date: '2013-10-21 00:06:14'
+tags:
+  - EGM
+title: EGM
+---
+
+This year Redbrick's EGM is taking place on Wednesday October 23rd in
+QG21. During this meeting we will hold elections for the following positions:
+
+ 
+
+- System Administrator
+- Webmaster
+- Treasurer
+- Public Relations Officer
+- First Year Rep
+
+If you are interested in running for either Webmaster or Systems Administrator
+you will have to sit an exam.
+
+Previous exams can be found [here](http://www.redbrick.dcu.ie/help/exams).
+
+The dates for these exams will be advertised shortly, please
+[get in touch with us](mailto:committee@redbrick.dcu.ie) by Monday night (21st
+October) if you would like to sit either exam.
+
+Any questions on individual exams can be directed to
+[admins](mailto:admins@redbrick.dcu.ie) or
+[webmaster](mailto:webmaster@redbrick.dcu.ie).
diff --git a/source/_posts/installfest.md b/content/post/installfest/index.md
similarity index 75%
rename from source/_posts/installfest.md
rename to content/post/installfest/index.md
index eb0e3d2..994e1b1 100644
--- a/source/_posts/installfest.md
+++ b/content/post/installfest/index.md
@@ -1,11 +1,11 @@
 ---
-title: Redbrick Linux Installfest
-date: 2013-11-18 19:05:15
 author: polka
 banner: linux.png
+date: '2013-11-18 19:05:15'
 tags:
-- Linux
-- installfest
+  - Linux
+  - installfest
+title: Redbrick Linux Installfest
 ---
 
 This year we were able to host our annual Installfest, thanks to the support of
@@ -14,10 +14,11 @@ Ubuntu Ireland. We offered three options for attendees, Ubuntu 12.04, OpenSuse
 boot, it was simple business from there, except for some pesky Windows 8
 machines.
 
-
-We were lucky enough to have CD's already from Ubuntu, along with some
-stickers for people to decorate their machines should they wish. We also had
-UBS's of all distros on hold on our Ubuntu lanyards.
+ 
+
+We were lucky enough to have CD's already from Ubuntu, along with some stickers
+for people to decorate their machines should they wish. We also had UBS's of all
+distros on hold on our Ubuntu lanyards.
 
 Overall it was a great Installfest! Special thanks go to Ubuntu Ireland for
 their kind donations, and Firehouse for tasty pizza.
diff --git a/source/_posts/installfest/linux.png b/content/post/installfest/linux.png
similarity index 100%
rename from source/_posts/installfest/linux.png
rename to content/post/installfest/linux.png
diff --git a/source/_posts/intersocs-beers/hanginthere.png b/content/post/intersocs-beers/hanginthere.png
similarity index 100%
rename from source/_posts/intersocs-beers/hanginthere.png
rename to content/post/intersocs-beers/hanginthere.png
diff --git a/source/_posts/intersocs-beers.md b/content/post/intersocs-beers/index.md
similarity index 73%
rename from source/_posts/intersocs-beers.md
rename to content/post/intersocs-beers/index.md
index 0ed45f7..dee2636 100644
--- a/source/_posts/intersocs-beers.md
+++ b/content/post/intersocs-beers/index.md
@@ -1,14 +1,16 @@
 ---
-title: 'Intersocs Beers'
 author: vadimck
-date: '2011-06-29 17:49:08'
 banner: hanginthere.png
+date: '2011-06-29 17:49:08'
 tags:
   - Intersocs
+title: Intersocs Beers
 ---
-This Friday, redbrick will be joined by other networking societies across Ireland and the UK for some drinks.
+
+This Friday, redbrick will be joined by other networking societies across
+Ireland and the UK for some drinks.
 
 Be sure to come along and get to know the faces of other socs.
 
-It takes place this Friday 1st July at 7:30pm in TGI Fridays, St. Stephens Green.
-
+It takes place this Friday 1st July at 7:30pm in TGI Fridays, St. Stephens
+Green.
diff --git a/source/_posts/iss-network-outage/downtime.png b/content/post/iss-network-outage/downtime.png
similarity index 100%
rename from source/_posts/iss-network-outage/downtime.png
rename to content/post/iss-network-outage/downtime.png
diff --git a/source/_posts/iss-network-outage.md b/content/post/iss-network-outage/index.md
similarity index 60%
rename from source/_posts/iss-network-outage.md
rename to content/post/iss-network-outage/index.md
index e35a92a..2a6ff1b 100644
--- a/source/_posts/iss-network-outage.md
+++ b/content/post/iss-network-outage/index.md
@@ -1,13 +1,15 @@
 ---
-title: 'ISS Network Outage'
 author: polka
-date: '2011-12-19 21:00:00'
 banner: downtime.png
+date: '2011-12-19 21:00:00'
 tags:
   - ISS
   - Network Outage
+title: ISS Network Outage
 ---
-Due to ISS network outages, Redbrick is going to experience some downtime on Wednesday the 21st and Thursday the 29th of December.  
 
-Services will continue as normal apart from these two days, and we apologise for any inconvenience caused.
-
+Due to ISS network outages, Redbrick is going to experience some downtime on
+Wednesday the 21st and Thursday the 29th of December.
+
+Services will continue as normal apart from these two days, and we apologise for
+any inconvenience caused.
diff --git a/source/_posts/missing-member/bunbun.jpg b/content/post/missing-member/bunbun.jpg
similarity index 100%
rename from source/_posts/missing-member/bunbun.jpg
rename to content/post/missing-member/bunbun.jpg
diff --git a/source/_posts/missing-member/bunbun_small.jpg b/content/post/missing-member/bunbun_small.jpg
similarity index 100%
rename from source/_posts/missing-member/bunbun_small.jpg
rename to content/post/missing-member/bunbun_small.jpg
diff --git a/content/post/missing-member/index.md b/content/post/missing-member/index.md
new file mode 100644
index 0000000..66dee09
--- /dev/null
+++ b/content/post/missing-member/index.md
@@ -0,0 +1,42 @@
+---
+author: Haus
+banner: bunbun.jpg
+date: '2012-02-04 14:48:24'
+tags:
+  - missing member
+  - bunbun
+title: Missing Member
+---
+
+One of our members has been reported as missing to the Gardai.
+
+If anyone has seen Paul Bunbury(bunbun) since Thursday the 2nd of February at
+approx. 4pm can they please either contact Whitehall Garda Station on 01 666
+4500 or get in touch with us.
+
+ 
+
+**Update**: A poster has been made. Please print it off and put it up in your
+local area, no matter where you are.  
+![bunbun_small](bunbun_small.jpg)
+
+[Email Us](mailto:committee@redbrick.dcu.ie)
+
+Here's the post made on boards.ie about him, it includes a picture of him:
+[http://tinyurl.com/75bhc5j](http://tinyurl.com/75bhc5j) ![bunbun](bunbun.jpg)
+
+Please retweet this post or make another post to twitter with the hashtag
+#FindPaulB [http://tinyurl.com/FindPaulB](http://tinyurl.com/FindPaulB)
+
+He was last seen in the Redbrick/Engsoc Common Room (N109A) but nobody has been
+able to contact him since. His family are very worried about him.
+
+Any information about his whereabouts since Thursday the 2nd of February at 4pm
+will be greatly appreciated.
+
+There have also been posts made to the Redbrick Facebook group about him:
+[https://www.facebook.com/groups/167418566612957/](https://www.facebook.com/groups/167418566612957/)
+
+Please keep an eye out for him and spread the word.
+
+Thanks from all of the redbrick committee members.
diff --git a/content/post/new-redbrick-site-launched/index.md b/content/post/new-redbrick-site-launched/index.md
new file mode 100644
index 0000000..c7ba80b
--- /dev/null
+++ b/content/post/new-redbrick-site-launched/index.md
@@ -0,0 +1,20 @@
+---
+author: tziegler
+banner: site.png
+date: '2011-09-26 00:00:00'
+title: New Redbrick Site Launched
+---
+
+Well here it is. Just a few hours later than scheduled the new Redbrick site is
+up and ready for you to explore. And we need you to do just that.
+
+ 
+
+We're delighted with the new site as we hope you are too, but it's not finished
+yet. We have big plans to integrate a new events system as well as some other
+cool new features which we'll be talking about over the next few weeks. In the
+mean time, please explore the new site and
+[report anything that seems a bit borked](mailto:vadimck@redbrick.dcu.ie) to our
+webmaster VadimCK.
+
+Bye for now!
diff --git a/source/_posts/new-redbrick-site-launched/site.png b/content/post/new-redbrick-site-launched/site.png
similarity index 100%
rename from source/_posts/new-redbrick-site-launched/site.png
rename to content/post/new-redbrick-site-launched/site.png
diff --git a/content/post/newyear-bigplans/index.md b/content/post/newyear-bigplans/index.md
new file mode 100644
index 0000000..41e5a94
--- /dev/null
+++ b/content/post/newyear-bigplans/index.md
@@ -0,0 +1,22 @@
+---
+author: tziegler
+banner: reggie.jpg
+date: '2011-09-23 19:37:49'
+tag:
+  - new year
+title: New Year. Big Plans.
+---
+
+So it's the beginning of another year and we've got an awful lot going on. We
+have the new website and branding completed over the summer and we have some
+great things lined up for the next few months.
+
+ 
+
+![reggie](reggie.jpg) There are 2 main goals of the year. The first is to keep
+doing what we do best but make that even better. The second is to do some events
+and talks to try and gain as many new members as possible. We've got some great
+talks lined up from some good speakers and we have some ideas for some new and
+improved services over the next few months.
+
+Watch this space.
diff --git a/source/_posts/newyear-bigplans/reggie.jpg b/content/post/newyear-bigplans/reggie.jpg
similarity index 100%
rename from source/_posts/newyear-bigplans/reggie.jpg
rename to content/post/newyear-bigplans/reggie.jpg
diff --git a/source/_posts/paul-bunbury/bunbunupdate.png b/content/post/paul-bunbury/bunbunupdate.png
similarity index 100%
rename from source/_posts/paul-bunbury/bunbunupdate.png
rename to content/post/paul-bunbury/bunbunupdate.png
diff --git a/content/post/paul-bunbury/index.md b/content/post/paul-bunbury/index.md
new file mode 100644
index 0000000..4a19066
--- /dev/null
+++ b/content/post/paul-bunbury/index.md
@@ -0,0 +1,29 @@
+---
+author: polka
+banner: bunbunupdate.png
+date: '2012-03-13 19:30:00'
+title: Paul Bunbury
+---
+
+Hi all,
+
+As you know, one of our members went missing on the 2nd of February. Paul
+Bunbury, Redbrick username of "bunbun" was a third year Computer Applications
+student.
+
+We are sorry to say that on the 13th of March, remains removed from the Liffey
+were identified as Paul's.
+
+ 
+
+We offer the sincerest condolences to the Bunbury family at this time, as well
+as Paul's friends. There are many of his friends in Redbrick, and Paul was one
+of our greatest personalities.
+
+We will all miss Paul sorely, and we would like to thank everyone who shared
+Paul's picture and information, and those who dedicated their time to putting up
+posters and searching for him.
+
+"Good-night, sweet prince; And flights of angels sing thee to thy rest."
+
+Rest in peace Paul.
diff --git a/content/post/programming-talks-workshops/index.md b/content/post/programming-talks-workshops/index.md
new file mode 100644
index 0000000..9762a04
--- /dev/null
+++ b/content/post/programming-talks-workshops/index.md
@@ -0,0 +1,36 @@
+---
+author: tziegler
+banner: programming.png
+date: '2011-10-10 00:30:00'
+tags:
+  - talks
+title: Programming Talks and Workshops
+---
+
+Well here we are in Week 3 already. How the hell did that happen? It has been a
+hectic week signing up all our new members and getting the Freshers ball sorted.
+But now I'd like to talk about what we're doing with the feedback we've received
+from members so far.
+
+ 
+
+As most of you know, we've asked members to fill out a survey with some
+questions about Redbrick and the direction they want to see it go. I personally
+have been pretty surprised with how much effort some members have gone to to
+give their opinions and criticisms. All are greatly appreciated. So this year,
+as well as admin training, we will also be running programming workshops every
+other week. These will either be run by our own admin team or by guest speakers.
+An awful lot of people asked us for more programming related talks and a lot of
+people specifically asked for extra help in programming. Well we heard you and
+we're making it happen. Keep your eyes on the weekly announce for more
+information on that.
+
+Finally, we've been getting tonnes of feedback for the new site which has been
+extremely helpful. We know there are a few little things here and there that
+need to be done but we're working hard on getting it all sorted. As some of you
+may have noticed, Webmail has received a makeover. We are now back to running
+Roundcube. The boards are being themed in the coming weeks and you may notice a
+few little UI tweaks around the site as well.
+
+If you have any feedback at all please
+[contact the committee](mailto:committee@redbrick.dcu.ie) and let us know.
diff --git a/source/_posts/programming-talks-workshops/programming.png b/content/post/programming-talks-workshops/programming.png
similarity index 100%
rename from source/_posts/programming-talks-workshops/programming.png
rename to content/post/programming-talks-workshops/programming.png
diff --git a/content/post/techweek/index.md b/content/post/techweek/index.md
new file mode 100644
index 0000000..8c5d61d
--- /dev/null
+++ b/content/post/techweek/index.md
@@ -0,0 +1,49 @@
+---
+author: Twister
+banner: techweek.png
+date: '2014-02-28 21:55:00'
+tags:
+  - TechWeekDCU
+  - Amazon
+  - Raspberry Pi
+  - Opennet
+  - Symantec
+title: Techweek
+---
+
+Tech Week is back again this year with lots of techy goodness planned.
+
+We have something tech for everyone with topics such as 3D Modelling, Web
+Development, Top Raspberry Pi Projects, Web Security, Coding Competition all
+making an appearance throughout the week!
+
+[techweek.dcu.ie](http://techweek.dcu.ie/) for more info!
+
+ 
+
+DCU President Brian MacCraith will be powering on this exciting week as DCU
+embraces a celebration of all things Technology.
+
+There will be inspiring talks covering a world wide web of topics delivered by
+the best in the Tech Industry. Companies such as Amazon, Openet and Symantec
+will be providing an excellent opportunity for students to get a real feel for
+the places they can go in the tech field.
+
+We have a coding competition run by Openet with uber prizes up to 1000 euros.
+Last year 5 students also got job offers as a result this event, it's not to be
+missed!
+
+Amazon will be blessing us with their expert insightful talks and will also be
+providing an opportunity to meet and greet with the experts in an informal
+environment, were students can ask questions and exchange their CVs :)
+
+Symantec will be delivering some very high-caliber talks, giving students an
+insider view of what its like to work on a Malware threat response team within
+Symantec.
+
+We have a large array of other inspirational talks spanning 3D Modelling,
+Web/Mobile Development, Security and Raspberry pi projects. Hopefully covering
+all the bases and filling you with technical lust for the hacker culture within
+which we live. I hope you are as excited as we are!
+
+Full timetable here: [techweek.dcu.ie](http://techweek.dcu.ie/)
diff --git a/source/_posts/techweek/techweek.png b/content/post/techweek/techweek.png
similarity index 100%
rename from source/_posts/techweek/techweek.png
rename to content/post/techweek/techweek.png
diff --git a/source/_posts/week-10-news-events-1/fbwebupdate.png b/content/post/week-10-news-events-1/fbwebupdate.png
similarity index 100%
rename from source/_posts/week-10-news-events-1/fbwebupdate.png
rename to content/post/week-10-news-events-1/fbwebupdate.png
diff --git a/content/post/week-10-news-events-1/index.md b/content/post/week-10-news-events-1/index.md
new file mode 100644
index 0000000..76b6f26
--- /dev/null
+++ b/content/post/week-10-news-events-1/index.md
@@ -0,0 +1,81 @@
+---
+author: polka
+banner: fbwebupdate.png
+date: '2011-11-27 16:00:00'
+tags:
+  - committee
+  - FOSDEM
+  - Intersocs
+  - Christmas
+thumbnail: fbwebupdate.png
+title: Week 10 News & Events
+---
+
+Week 10 has arrived and Christmas is coming ever closer, but the semester isn’t
+over yet! While the rest of college is winding down, Redbrick is planning a few
+events to keep you occupied.
+
+- Committee Changes
+- “What's the Bright Idea?” Undergraduate Awards
+- Movie Night
+- Christmas Party
+- FOSDEM Trip
+- Intersocs LAN
+
+ 
+
+![](fbwebupdate.png)
+
+## Committee Changes
+
+At our EGM last week, we elected new members to our committee to fill the roles
+of Secretary, Helpdesk and System Administrator. We’d like to welcome Niall
+Gaffney (gamma) and Craig Duff (duff) to the committee, and welcome back Shane
+Stacey (isaac702). The committee would also like to thank Lotta Mikkonen (attol)
+and Paul Bunbury (bunbun) for all their work and dedication while involved with
+the committee! The position of Public Relations Officer has also become
+available as Meabh Landers (timelady) has decided to step down. Please contact
+[committee](mailto:committee@redbrick.dcu.ie) for more information about the
+position if you’re interested in running!
+
+## “What's the Bright Idea?” Undergraduate Awards
+
+“What’s the Bright Idea” is an event organised by the non-profit awards
+organisation, The Undergraduate Awards. This event is going to be a celebration
+of bright, young individuals and their bright ideas. Students can register their
+Bright Idea online for the chance to win prizes from Ticketmaster before the
+30th of November. Entry to the event is free, with guest speakers, food and live
+music (provided by The Dying Seconds) at the event. The guest speakers are
+Caroline Casey (founder of Kanchi), Maria Parodi (Deputy Lord Mayor), James
+Whelton (web'prenure' & social media connoiseur) and David & Stephen Flynn
+(founders of The Happy Pear). The event will begin at 6:30pm on the 5th of
+December at the Odessa, and we encourage our members to take part and attend!
+Check out
+[http://www.undergraduateawards.com/](http://www.undergraduateawards.com/) for
+more information.
+
+## Movie Night
+
+This Tuesday, Redbrick in association with Strange Things will be hosting a
+movie night! Turn up on Tuesday evening for a showing of the two Tron films,
+Tron and Tron: Legacy. Come along to Q120 at 6pm for the viewings. Refreshments
+will be provided!
+
+## Christmas Party
+
+Coming up, the event we’ve all been waiting for! The Christmas party will be an
+opportunity for members to relax and mingle with Redbrick members and students
+from other societies. We’ll be telling you more next week, so keep an eye out!
+
+## FOSDEM Trip
+
+There are still places available for the trip to Brussels in February, so if
+you’re interested in attending FOSDEM, let us know! Email
+[mak](mailto:mak@redbrick.dcu.ie) to register your interest. Deadline is Tuesday
+the 29th of November, which means you must have paid the €90 in full and
+provided us with passport details by then. This is a trip not to be missed!
+
+## Intersocs LAN
+
+On the 10th of December, there will be a LAN hosted in Trinity College. More
+information to follow, so get your computers ready!
diff --git a/content/post/week-10-news-events-2/index.md b/content/post/week-10-news-events-2/index.md
new file mode 100644
index 0000000..b0fa97c
--- /dev/null
+++ b/content/post/week-10-news-events-2/index.md
@@ -0,0 +1,76 @@
+---
+author: polka
+banner: week10.png
+date: '2013-12-01 18:47:05'
+tags:
+  - Christmas
+  - EGM
+  - pints
+thumbnail: week10.png
+title: Week 10 News & Events
+---
+
+It's beginning to sound a lot like Christmas... With the end of the semester
+looming, here's what's happening with Redbrick this week!
+
+- Monday Social Pints
+- Christmas Party
+- Facebook Page
+- Exams
+- EGM
+- Project Services
+
+ 
+
+## Monday Social Pints
+
+We're having a small get together this week, from 6pm on wards on Monday we'll
+be having a few pints together in the NuBar. It's a good opportunity to sit
+down, chill out, and escape assignments and exams for a short while! Keep an eye
+out for the Redbrick hoodies if you don't recognise anyone!
+
+## Christmas Party
+
+![Christmas Party](xmas-party.png) We will be hosting our annual Christmas party
+in week 11 this year, with a number of wonderful societies! Get your Santa hats,
+Christmas jumpers and tinsel at the ready, we'll have drink specials, and a very
+special visit from a man in a red suit... With presents of course! Refreshments
+will be available on the night, we'll have more information for you all before
+then!  
+Facebook event:
+[https://www.facebook.com/events/1381206022127635/](https://www.facebook.com/events/1381206022127635/)
+
+## Exams
+
+Interested in running for one of our open positions as System Administrator,
+Webmaster, or Helpdesk? Let us know! You must register to sit an exam before
+running for these positions. Email [committee](mailto:committee@redbrick.dcu.ie)
+to register to sit one of these exams as soon as possible, if you are
+interested.
+
+## EGM
+
+We have a number of open positions on our committee, so we're looking for
+interested people to get involved. We currently have the following positions
+open: System Administrator, Helpdesk, Webmaster, Secretary and Events Officer.
+Be sure to come along to the EGM, even if you don't want to run for anything, we
+will have loads of pizza and little something for our Christmas Party... Time
+and date yet to be confirmed, but once we know - you'll know!  
+Facebook event:
+[https://www.facebook.com/events/454988594620806/](https://www.facebook.com/events/454988594620806/)
+
+## Project Services
+
+Making a web application for your third or fourth year project and need
+somewhere to host it? Redbrick provide free Virtual Private Servers (VPS) with
+port 80 and 443 publicly accessible from the internet for all members. More info
+can be found on our wiki at
+[http://wiki.redbrick.dcu.ie/mw/Rbvm](http://wiki.redbrick.dcu.ie/mw/Rbvm), or
+by contacting [admins](mailto:admins@redbrick.dcu.ie)
+
+## Facebook Page
+
+Our new Facebook like page is fully set up, and we'll be holding a competition
+before the end of the semester, so give the page a cheeky like and keep an eye
+our, just so you don't miss it
+[https://www.facebook.com/dcuredbrick](https://www.facebook.com/dcuredbrick)
diff --git a/source/_posts/week-10-news-events-2/week10.png b/content/post/week-10-news-events-2/week10.png
similarity index 100%
rename from source/_posts/week-10-news-events-2/week10.png
rename to content/post/week-10-news-events-2/week10.png
diff --git a/source/_posts/week-10-news-events-2/xmas-party.png b/content/post/week-10-news-events-2/xmas-party.png
similarity index 100%
rename from source/_posts/week-10-news-events-2/xmas-party.png
rename to content/post/week-10-news-events-2/xmas-party.png
diff --git a/source/_posts/week-10-news-events/brightidea.png b/content/post/week-10-news-events/brightidea.png
similarity index 100%
rename from source/_posts/week-10-news-events/brightidea.png
rename to content/post/week-10-news-events/brightidea.png
diff --git a/content/post/week-10-news-events/index.md b/content/post/week-10-news-events/index.md
new file mode 100644
index 0000000..1b6cbb4
--- /dev/null
+++ b/content/post/week-10-news-events/index.md
@@ -0,0 +1,53 @@
+---
+author: polka
+banner: brightidea.png
+date: '2012-04-08 17:29:50'
+thumbnail: brightidea.png
+title: Week 10  News & Events
+---
+
+Hey guys, semester two is nearly over and done with already! However, as always,
+Redbrick have a few events to keep you going!
+
+- Society Awards
+- Facebook Talk
+- Annual Redbrick Quiz
+
+ 
+
+## Society Awards
+
+![brightidea](brightidea.png)
+
+Just a quick update on the society awards! Redbrick were nominated for a number
+of awards, and came on the shortlist for most of the awards we applied for this
+year. In the end, we came in a very close second for Society of the Year. While
+we didn't get it this year, we hope to bring Redbrick to the top and bring home
+an award next year!
+
+## Facebook Talk
+
+This week, Senior Engineer Ryan Mack is coming in on Wednesday the 11th of April
+to speak about Facebook. Hosted in association with the School of Computing, it
+will no doubt be incredibly interesting, as Ryan has been involved in the
+implementation of Time-line and the recent changes in Photos on Facebook. The
+talk begins at 5pm, and will be hosted in HG23\. Ruth McIntyre from Facebook
+Ireland will also be there, as a representative of the university hiring team.
+
+## Annual Redbrick Quiz
+
+Our annual quiz will be held during week 11, due to some unforeseen
+circumstances! However, your committee is working behind the scenes to make it
+as awesome as ever! We will have a few rounds of general knowledge questions, as
+well as some techy style questions, so be sure to swot up on these areas. We'll
+confirm the venue with you next week, but we will let you in on what prizes are
+available on the night! Teams will be made up of four people apiece.
+
+For the quiz, the prizes are as follows:  
+1st Prize - Hard Drives  
+2nd Prize - Nerf Guns  
+3rd Prize - Bacon Popcorn
+
+We will also be holding a raffle on the night, where you can win an Asus
+netbook! We'll have a few other spot prizes on the night, a full update to
+follow next week.
diff --git a/content/post/week-11-news-events-1/index.md b/content/post/week-11-news-events-1/index.md
new file mode 100644
index 0000000..c337eda
--- /dev/null
+++ b/content/post/week-11-news-events-1/index.md
@@ -0,0 +1,67 @@
+---
+author: polka
+banner: pubquiz.png
+date: '2011-12-03 14:30:52'
+tags:
+  - ideas
+  - Intersocs
+  - clubs and socs
+  - Christmas
+thumbnail: pubquiz.png
+title: Week 11  News & Events
+---
+
+It's nearly Christmas time, and with the season to be jolly stepping into gear
+and DCU quieting down for the end of semester, Redbrick has a few choice events
+to keep you going! Events this week include;
+
+- "What's the Bright Idea"
+- Netsoc Intersocs LAN
+- Clubs & Societies Ball
+- Inter-society Christmas Party
+
+ 
+
+## "What's the Bright Idea" Undergraduate Awards
+
+"What’s the Bright Idea" is an event organised by the non-profit awards
+organisation, The Undergraduate Awards. This event is going to be a celebration
+of bright, young individuals and their bright ideas. The event is on this
+Monday, the 5th of December in the Odessa.
+
+Doors open at 6.30pm, and first seventy students in get two free drinks!
+Speakers on the night include: Caroline Casey, Founder of Kanchi & the O2
+Ability Awards; James Whelton, Webpreneur and Hacker; David & Stephen Flynn,
+Organic Ambassadors and founders of the Happy Pear; and Maria Parodi, Deputy
+Lord Mayor of Dublin. Entry is free, and prizes from Ticketmaster, food, and
+live music from The Dying Seconds will be available on the night!
+
+Check out
+[http://www.undergraduateawards.com/](http://www.undergraduateawards.com/) for
+more information.
+
+## NetSoc LAN
+
+NetSoc (Dublin University Internet Society) will be hosting an Intersocs BYOPC
+LAN on the 10th of December in
+[Trinity Halls](http://www.tcd.ie/Maps/map.php?q=Trinity%20Hall). Be ready to
+start gaming from 6pm until 10am the following morning! You will need to bring
+your PC, an Ethernet cable (if possible), power adapters, cables and the like.  
+Thinking of getting lost? Here is a
+[Map](http://www.tcd.ie/Maps/map.php?q=Trinity%20Hall) anyway.
+
+## Clubs & Societies Ball
+
+The C&S Ball is on Tuesday of this week in the Crowne Plaza Hotel. Tickets are
+no longer available, but for those who got their hands on some, we'll be seeing
+you there! Don't forget, event starts at 7pm with a mulled wine reception, and
+is sure to be a night to remember.
+
+## Inter-society Christmas Party
+
+And finally, the event everyone's been waiting for! Redbrick, in association
+with ArtSoc, Games Soc, Airsoft, Strange Things, Paranormal Soc and Eng Soc, is
+hosting the Inter-society Christmas Party! Head to The Slipper (Matt Weldon's)
+on the Ballymun Road at 8pm on the 8th of December. Highlights of the night to
+include a visit from Santa Claus, presents and much, much more. No doubt this
+will be a night to remember, so come along and party hard!
diff --git a/source/_posts/week-11-news-events-1/pubquiz.png b/content/post/week-11-news-events-1/pubquiz.png
similarity index 100%
rename from source/_posts/week-11-news-events-1/pubquiz.png
rename to content/post/week-11-news-events-1/pubquiz.png
diff --git a/source/_posts/week-11-news-events/Week11a.jpg b/content/post/week-11-news-events/Week11a.jpg
similarity index 100%
rename from source/_posts/week-11-news-events/Week11a.jpg
rename to content/post/week-11-news-events/Week11a.jpg
diff --git a/content/post/week-11-news-events/index.md b/content/post/week-11-news-events/index.md
new file mode 100644
index 0000000..0ae7c9b
--- /dev/null
+++ b/content/post/week-11-news-events/index.md
@@ -0,0 +1,32 @@
+---
+author: fructus
+banner: Week11a.jpg
+date: '2012-04-16 19:00:27'
+tags:
+  - table quiz
+thumbnail: Week11a.jpg
+title: Week 11  News & Events
+---
+
+There's not a lot happening this week, but we do have the Annual Redbrick Table
+Quiz and Raffle!
+
+ 
+
+## Annual Redbrick Table Quiz
+
+The quiz will take place on Tuesday the 17th in the Nubar. Sign up
+for the quiz is from 6:30PM and we plan to kick off at 7:00PM sharp. Teams will
+consist of 4 people at €3 per person, €12 in total per team. This is also open
+to non Redbrick members, so bring your friends! There are some cool prizes to be
+won.
+
+The prizes are for each member of the winning teams:  
+1st Place: 1 TB External Hard Drives  
+2nd Place: Nerf Disc Guns  
+3rd Place: Bacon Popcorn
+
+The Raffle prize this year is an Asus 11.6" netbook. It has a 320GB hard drive,
+4GB of RAM and a dual core processor with HDMI out. In total, worth over 350
+euro. If you still don't want to come there will also be small spot prizes on
+the night!
diff --git a/source/_posts/week-12-news-events-1/W12.jpg b/content/post/week-12-news-events-1/W12.jpg
similarity index 100%
rename from source/_posts/week-12-news-events-1/W12.jpg
rename to content/post/week-12-news-events-1/W12.jpg
diff --git a/content/post/week-12-news-events-1/index.md b/content/post/week-12-news-events-1/index.md
new file mode 100644
index 0000000..ce0d5b3
--- /dev/null
+++ b/content/post/week-12-news-events-1/index.md
@@ -0,0 +1,41 @@
+---
+author: polka
+banner: W12.jpg
+date: '2011-12-11 12:00:00'
+tags:
+  - Christmas
+  - downtime
+  - movie night
+thumbnail: W12.jpg
+title: Week 12  News & Events
+---
+
+The Christmas season is upon us, and with the final week of this semester
+beginning, Redbrick are taking it easy in preparation for the holidays. As
+always though, there's something happening!
+
+- Movie Night
+- Downtime
+- Merry Christmas
+
+ 
+
+## Movie Night
+
+This Tuesday, the 13th of December, Redbrick in association with Strange Things
+will be hosting a movie night! Come along at 6pm to Q120 to see "Rare Exports -
+A Christmas Tale". Refreshments will be provided, and it's the perfect excuse
+for taking a break from all those assignments and study!
+
+## Downtime
+
+We regret to inform you Redbrick will be experiencing downtime on December 21st
+and December 29th due to ISS network outages. Services will be unavailable all
+day both days, but should be as normal for most of the holidays!
+
+## Merry Christmas
+
+Finally, the committee of Redbrick would like to wish our members all the best
+for the Christmas season. This last semester flew, and we have you, the members,
+to thank for making it so awesome. Thank you guys - Merry Christmas, Happy New
+Year, and we'll see you next semester!
diff --git a/source/_posts/week-12-news-events-2/BarsPints.jpg b/content/post/week-12-news-events-2/BarsPints.jpg
similarity index 100%
rename from source/_posts/week-12-news-events-2/BarsPints.jpg
rename to content/post/week-12-news-events-2/BarsPints.jpg
diff --git a/content/post/week-12-news-events-2/index.md b/content/post/week-12-news-events-2/index.md
new file mode 100644
index 0000000..2991c61
--- /dev/null
+++ b/content/post/week-12-news-events-2/index.md
@@ -0,0 +1,52 @@
+---
+author: fructus
+banner: BarsPints.jpg
+date: '2012-04-23 14:46:39'
+tags:
+  - pints
+  - downtime
+thumbnail: BarsPints.jpg
+title: Week 12  News & Events
+---
+
+It may be the last week, but the Redbrick committee still have a few things to
+say. Firstly, we would like to wish good luck to everyone taking exams in the
+coming weeks, and best of luck for the future to all the fourth years, we hope
+to see them return as associate members next year.
+
+Here's what's happening this week.
+
+- Pre-Exam Pints
+- Daniel Downtime
+- Moving Murphy
+
+ 
+
+## Pre-Exam Pints
+
+![](BarsPints.jpg)
+
+As it's the end of the year, we think that we should all reflect on the past
+year, and what better way than with a few pints? We plan to head to the NuBar
+for around 6:30pm on Tuesday the 24th. It'll be a great chance to chill out and
+catch up before the exams begin.
+
+## Daniel Downtime
+
+On Friday the 27th of April at around 3pm the admins will be applying security
+updates to Daniel, our virtual machine server. We recommend that you shut-down
+your VMs before this, to prevent any loss of your work.
+
+The Admins apologies for any inconvenience caused.
+
+## Moving Murphy
+
+Murphy, our former web server, is being moved from the server room in the Hub to
+the basement of the Library. We intend to use Murphy as a back-up server, in the
+case of loss of power to the Hub (affecting the servers in the server room
+there). Murphy will be taken off-line this Friday during Daniels updates so it
+can be prepared for the move to the basement. We recommend moving any scripts
+and programs you may be running to Morpheus or Azazel by this time.
+
+Once again, the admin team would like to apologise for any inconveniences
+caused.
diff --git a/content/post/week-2-news-events/index.md b/content/post/week-2-news-events/index.md
new file mode 100644
index 0000000..db7bf92
--- /dev/null
+++ b/content/post/week-2-news-events/index.md
@@ -0,0 +1,83 @@
+---
+author: polka
+banner: wbdate2.png
+date: '2012-02-12 00:00:00'
+tags:
+  - DCUfm
+  - TechWeekDCU
+  - science heckday
+  - LAN
+thumbnail: wbdate2.png
+title: Week 2  News & Events
+---
+
+One of our members, Paul Bunbury, is still missing. If you have seen him anytime
+since February the 2nd, please let us know! (more information below).
+
+Welcome back to a new semester! We're starting things off quiet, but don't
+worry, there'll be more than enough to keep you guys occupied soon!
+
+This weeks web update includes:
+
+- Message from the Chair
+- Science Hackday
+- BYOPC LAN
+- Android Application for DCUfm
+- Tech Week
+
+ 
+
+## Message from the Chair
+
+![](wbdate2.png)
+
+When the news that our close friend Paul was missing I was in Brussels as part
+of a Redbrick trip and, like many others I have spoken to, couldn't believe it
+was true. It was incredible to watch as our members, without being prompted or
+asked or pushed, dropped everything and worked together to help and find him.
+From getting people to retweet to getting the article to page 2 on Reddit, it
+was all so amazing to watch. It was a deeply humbling experience. I feel
+incredibly proud of the members of Redbrick for all the continued work in
+searching for bunbun. As most of you are aware he was last seen on Thursday the
+2nd of February and has not been seen since.
+
+Myself and the whole committee would like to thank all of Redbrick's members
+wholeheartedly for pulling together the way you are. Let's keep looking and
+raising awareness as much as possible.
+
+Thanks again,  
+tziegler
+
+Please, keep spreading the word about bunbun, we all want him back safe and
+sound as soon as possible. Check out the Facebook page for all up to date
+information at
+[http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990](http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990).
+
+## Science Hackday
+
+On Saturday and Sunday, the 3rd and 4th of March, DCU will hold host to a
+Science Hackday. The event starts at 9am on Saturday, and ends at 6pm on Sunday.
+For more information, and to register, check out
+http://www.sciencehackdaydublin.com/ .
+
+## BYOPC LAN
+
+TCD's NetSoc (Internet Society) will be hosting an Intersocs LAN on Saturday the
+18th of February, in association with DUCSS (TCD's Computer Science Society),
+UCD NetSoc, and Redbrick. Be ready to start gaming from 6pm until 10am the
+following morning! All you need to bring is yourself, a computer, and if
+possible, some extra Ethernet cables and extension leads as supplies may be
+limited.
+
+## Android Application for DCUfm
+
+Familiar with how to build mobile apps for Android? DCUfm are looking for
+developers to help them build an Android version of their app. There is no
+payment, but it will no doubt add greatly to your experience, and will look
+great on your CV. For more information, contact cian@dcufm.ie .
+
+## Tech Week
+
+Tech Week will be coming up soon! The week will begin on the 5th of March, and
+will be full of interesting talks. More information to follow in the coming
+weeks, so keep your eyes peeled!
diff --git a/source/_posts/week-2-news-events/wbdate2.png b/content/post/week-2-news-events/wbdate2.png
similarity index 100%
rename from source/_posts/week-2-news-events/wbdate2.png
rename to content/post/week-2-news-events/wbdate2.png
diff --git a/source/_posts/week-22/cake.jpg b/content/post/week-22/cake.jpg
similarity index 100%
rename from source/_posts/week-22/cake.jpg
rename to content/post/week-22/cake.jpg
diff --git a/source/_posts/week-22.md b/content/post/week-22/index.md
similarity index 64%
rename from source/_posts/week-22.md
rename to content/post/week-22/index.md
index fcc6719..752df60 100644
--- a/source/_posts/week-22.md
+++ b/content/post/week-22/index.md
@@ -1,25 +1,28 @@
 ---
-title: Week 22 - New Committee | Birthday
 author: butlerx
-date: 2016-04-04
-thumbnail: cake.jpg
 banner: cake.jpg
+date: '2016-04-04'
 tags:
   - announce
   - birthday
   - AGM
+thumbnail: cake.jpg
+title: Week 22 - New Committee | Birthday
 ---
 
 Hi all:
 
-We’ve had a busy week with a talk, quiz and the AGM. Last week was the AGM or the shuffling of Committee, when we say good bye to some old faces and hello to some new ones. As those of you who attended the AGM know, I was appointed as Redbrick’s new and shiny secretary, I look forward to a year writing badly worded but informing announces for my adoring public.
-Now down to business…
+We’ve had a busy week with a talk, quiz and the AGM. Last week was the AGM or
+the shuffling of Committee, when we say good bye to some old faces and hello to
+some new ones. As those of you who attended the AGM know, I was appointed as
+Redbrick’s new and shiny secretary, I look forward to a year writing badly
+worded but informing announces for my adoring public. Now down to business…
+
+ 
 
-
 - Redbrick 20th Birthday - Saturday 09/04 - Opium Cafe - 19:00
 
-AGM Results
-===========================================================
+# AGM Results
 
 The results of the AGM election on Thursday are as follows:
 
@@ -32,9 +35,10 @@ The results of the AGM election on Thursday are as follows:
 - Lorcan Boyle (zergless) - Admin
 - Richie Walsh (koffee) - Admin
 
-Redbrick 20th Birthday
-===========================================================
-![Birthday Cake](cake.jpg "")
+# Redbrick 20th Birthday
+
+![Birthday Cake](cake.jpg)
+
 - Date: Saturday 09/04
 - Time: 19:00
 - Location: Opium Cafe, Wexford Street, Dublin
@@ -50,13 +54,11 @@ shout...
 
 We are all looking forward to seeing you.
 
-
 As always, keep your eyes peeled on the lovely calendar and social media pages:
-  - Twitter: @RedbrickDCU
-  - Facebook: https://www.facebook.com/dcuredbrick
-  - Snapchat: RedbrickDCU
-  - Calendar: http://tinyurl.com/redbrickCalendar
 
-Hoping you have a good week from all of the Redbrick Committee.
-Bye for now.
+- Twitter: @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
+- Snapchat: RedbrickDCU
+- Calendar: http://tinyurl.com/redbrickCalendar
 
+Hoping you have a good week from all of the Redbrick Committee. Bye for now.
diff --git a/source/_posts/week-3-google-week/googleAtDcu2.jpg b/content/post/week-3-google-week/googleAtDcu2.jpg
similarity index 100%
rename from source/_posts/week-3-google-week/googleAtDcu2.jpg
rename to content/post/week-3-google-week/googleAtDcu2.jpg
diff --git a/content/post/week-3-google-week/index.md b/content/post/week-3-google-week/index.md
new file mode 100644
index 0000000..65e73fe
--- /dev/null
+++ b/content/post/week-3-google-week/index.md
@@ -0,0 +1,70 @@
+---
+author: kylar
+banner: googleAtDcu2.jpg
+date: '2014-10-07 21:15:00'
+tags:
+  - google
+  - associates
+thumbnail: googleAtDcu2.jpg
+title: Week 3 Google Week
+---
+
+It's week 3 and Redbrick our kicking off our events for the year with a bang!
+
+It's Google Week! A week filled with talks from Googlers, DCU graduates and
+associate Redbrick members on things like Site Reliability Engineering, and
+Systems at Scale.
+
+Firstly we'd like to thank everyone who came along to the Tech University Open
+House in Google HQ last Friday, we hope you ad a great day!
+
+Now on to the good stuff, what's coming up this week you say?
+
+ 
+
+**Hangout on Air - Perspectives on Engineering at Google**  
+When: Tuesday October 7th from 5 -6pm  
+Where: HG10  
+Hear from Google Engineers, from Dublin and Mountain View. They'll be talking
+about their path to Google and their career experiences to date.
+
+**Google @ DCU  
+When: Wednesday 8th October  
+Where: QG22**  
+We'll have 3 talks as follows. We can guarantee you these talks are fantastic
+having heard from two of the speakers on Friday!
+
+**Time 1.00 - 2.00** A talk given by DCU alum and Redbrick member John Looney.
+John is a member of the SRE team responsible for Google's Data centre and he'll
+be giving us a talk called: "Perspectives on studying Computer Science"
+
+**Time 2.00 - 3.00** "Systems at Scale: Tales from Google Site Reliability
+Engineering" This talk will be given by Andrew Widdowson, a Mountain View SRE.
+Andrew will be talking about how the smallest keystroke can make the biggest
+impact when dealing with systems at scale.
+
+**Time: 3.00 - 3.30** Last but certainly not least we will hear from STEP intern
+Conor Flynn, who is in second year of PSSD here in DCU. He will be discussing
+his experience at Google and will be happy to answer all your questions!
+
+We'd recommend coming along and bringing anyone even a little bit curious as to
+how Google goes about its daily routine. Bring your friends, bring your mum,
+heck... even bring your cat!! We've been looking forward to these talks for
+quite some time and we hope you enjoy them!
+
+Last of the talks for this week is one of our annual talks the annual:  
+**Introduction to Redbrick**  
+**When: Wednesday 8th at 4pm  
+Where: QG22  
+\*\***What:\*\* This is a great chance for everyone to get to know the
+committee. In this talk we'll cover a little history of the society, our
+services and our plans for the year. We will cover: Who's who in the committee.
+What each committee member does. What Redbrick has to offer - an intro by our
+Education Officer. What's planned for the rest of the year.
+
+There will also be a Q&A session where you can ask about anything you need help
+or advice on! And, as if that wasn't enough, there will be pizza!
+
+For more info keep an eye on your emails and our Facebook page!
+
+[https://www.facebook.com/dcuredbrick](https://www.facebook.com/dcuredbrick)
diff --git a/source/_posts/week-3-news-events/code.png b/content/post/week-3-news-events/code.png
similarity index 100%
rename from source/_posts/week-3-news-events/code.png
rename to content/post/week-3-news-events/code.png
diff --git a/content/post/week-3-news-events/index.md b/content/post/week-3-news-events/index.md
new file mode 100644
index 0000000..2f61607
--- /dev/null
+++ b/content/post/week-3-news-events/index.md
@@ -0,0 +1,60 @@
+---
+author: polka
+banner: code.png
+date: '2012-02-20 00:18:34'
+tags:
+  - science hackday
+  - admin
+  - irlcpc
+thumbnail: code.png
+title: Week 3 News & Events
+---
+
+With exam results out, and RAG week looming, here's what's happening with
+Redbrick this week.
+
+- Science Hackday
+- Irish Collegiate Programming Contest (IrlCPC)
+- Admin Training
+- AMS Brony Panel
+- Missing Member
+
+ 
+
+## Science Hackday
+
+Science Hackday Dublin will be hosted in The Hub on the 3rd and
+4th of March. The event starts at 9am on the Saturday, and ends at
+6pm on the Sunday. This is looking to be a great event and there are only a few
+places left, so check out
+[http://www.sciencehackdaydublin.com/](http://www.sciencehackdaydublin.com/) if
+you're interested.
+
+## Irish Collegiate Programming Contest (IrlCPC)
+
+University College Cork (UCC) will be hosting the annual Irish Collegiate
+Programming Contest on Saturday the 24th of March. There will be a practice
+session this Thursday at 6pm in LG25\. If you're interested in attending, come
+along!
+
+Check out [http://acm.ucc.ie/irlcpc](http://acm.ucc.ie/irlcpc) for more
+information.
+
+## Admin Training
+
+Admin training will be starting up soon for the coming semester. Keep an eye out
+for updates.
+
+## AMS Brony Panel
+
+As part of RAG week, AMS has contacted the Irish Brony Society to come and have
+some showings in DCU, give a panel and sell cakes for charity on Wednesday 22nd.
+For more information, check out the Facebook event at
+[http://www.facebook.com/events/158990590885638/](http://www.facebook.com/events/158990590885638/)
+
+## Missing Member
+
+Paul Bunbury is still missing. Please like the Facebook page for updates, and
+share with friends.
+
+[http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990](http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990)
diff --git a/content/post/week-4-news-events/index.md b/content/post/week-4-news-events/index.md
new file mode 100644
index 0000000..f1b8931
--- /dev/null
+++ b/content/post/week-4-news-events/index.md
@@ -0,0 +1,74 @@
+---
+author: polka
+banner: shdd-rb.jpg
+date: '2012-02-26 00:15:51'
+tags:
+  - admin
+  - TechWeekDCU
+  - science hackday
+  - chromebook
+thumbnail: shdd-rb.jpg
+title: Week 4 News & Events
+---
+
+Both the second semester and Redbrick are in full swing, and here's what we feel
+you should be keeping an eye on for this week!
+
+- Admin Training
+- Science Hackday Dublin
+- Techweek 2012
+- Chromebook Testing
+- Missing Member
+
+ 
+
+## Admin Training
+
+![science hackday](shdd-rb.jpg)
+
+This week sees the return of admin training! For those that attended, we'll be
+continuing from the topics we covered last semester.
+
+This weeks topic will be on Installing an Ubuntu server, so be sure to come
+along, even just for a nose about. We'll be starting at 6pm in LG25 on Tuesday
+the 28th.
+
+## Science Hackday Dublin
+
+Science Hackday Dublin will the held on the weekend of the 3rd and 4th of March.
+The event starts at 9am on the Saturday, and ends at 6pm on the Sunday.
+
+This is looking to be a great event, so check out
+[http://www.sciencehackdaydublin.com/](http://www.sciencehackdaydublin.com/) if
+you're interested.
+
+Want to learn about the event as it unfolds? Check out their Twitter feed at
+[https://twitter.com/#!/scihackday_dub](https://twitter.com/#!/scihackday_dub).
+This is an event you don't want to miss!
+
+## Techweek 2012
+
+Techweek makes its return for 2012! Starting on the 5th of March, it's sure to
+be a week full of fun, techy events. We'll fill you in on what's happening next
+weekend.
+
+## Chromebook Testing
+
+Redbrick and Engineering Soc have received 30 Chromebooks to distribute to its
+members for testing. This is only open to members of either society, but is a
+fantastic opportunity to try out this brand new, top of the range technology -
+and to give your feedback on it!
+
+You will be responsible for the Chromebook for the remainder of the semester and
+will be required to fill out a 5 minute survey at the end of the trial, with the
+possibility of winning a prize.
+
+If this sounds good to you, email either the
+[redbrick committee](mailto:committee@redbrick.dcu.ie) or
+dcuengineeringsoc@gmail.com for a form. Closing date is Friday the 2nd of March.
+
+## Missing Member
+
+Paul Bunbury (bunbun) is still missing. Like the Facebook page for updates, and
+keep sharing his details. Come back soon Paul!
+[http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990](http://www.facebook.com/pages/Find-Paul-Bunbury/344019265618990)
diff --git a/source/_posts/week-4-news-events/shdd-rb.jpg b/content/post/week-4-news-events/shdd-rb.jpg
similarity index 100%
rename from source/_posts/week-4-news-events/shdd-rb.jpg
rename to content/post/week-4-news-events/shdd-rb.jpg
diff --git a/content/post/week-4/index.md b/content/post/week-4/index.md
new file mode 100644
index 0000000..1c3a182
--- /dev/null
+++ b/content/post/week-4/index.md
@@ -0,0 +1,77 @@
+---
+author: kylar
+banner: intercom.png
+date: '2014-10-13'
+tags:
+  - announce
+  - intercom
+  - screen
+  - associates
+thumbnail: logo.png
+title: Week 4
+---
+
+This week we're filling this shortening evenings with some great events. It's
+all about quality, not quantity.
+
+Without further ado the agenda for the week is as follows:
+
+- Screen@Redbrick
+- Associate Talks
+- Helpdesk Talks
+- Intercom@Redbrick
+
+Interested?? OF COURSE YOU ARE for more info, click below or check our
+[Facebook page](https://www.facebook.com/dcuredbrick).
+
+ 
+
+# = Screen@Redbrick =
+
+We've had to postpone this as we have admin exams at 6pm. So we're going to
+reschedule for next week and change up the movie to the cheesy 1995 classic
+"Hackers" Sorry for the inconvenience, we'll make sure you guys get all of next
+week's details sooner. We're still ironing out a few bugs on this end.
+
+# = Associate Talks: elephant =
+
+Topic: "Spammers Hate Him! One weird trick for staying secure online" When:
+Tuesday 14th October at 18:00 Where: C115
+
+Social media accounts are valuable to scammers and spammers, who want to make a
+quick buck off your reputation. Here's a few tips to help make your accounts
+harder to abuse so hold on to your tinfoil hats kids Diarmaid MacManus will be
+talking to us about how to stay secure online, some of the tips and tricks he's
+learned from his time in application security with various multinationals. If
+you don't leave this talk paranoid we'll be surprised!
+
+# = Helpdesk Talks =
+
+Topic: How to get up and running with Redbrick. Where: LG25 When: Wednesday 15th
+October 15:00 Cian Butler will be guiding you through your first steps using
+Redbrick services. He'll be walking through how to use your web space, logging
+into IRC and how to run programmes on our development servers. With the rest of
+the committee on hand to help out we should have you up and running in no time.
+
+# = Intercom@Redbrick =
+
+![intercom](intercom.png) This week we see another company come to pay us a
+visit; this week it's Intercom. Intercom has only recently had its 3rd birthday,
+yet it's making huge a serious impact on how companies deal with their
+customers. Intercom have had developers, engineers and business join them from
+companies as big as Amazon and Google. Come along on Thursday and see how
+Intercom do what they do, and what it's like to work for them.
+
+We've got: Brian White and Brian Long (make sure to call him Robin) coming to
+talk about running Intercom. Matthew Barrington will be fanboying to the extreme
+about his time with Intercom.
+
+This should be a great evening, for anyone that may have been at the inside
+intercom meetings throughout the year you know how interesting and enthusiastic
+the Intercomrades are; for those who haven't you should definitely come along
+and witness it first hand.
+
+Don't forget to keep an eye on our various social media soapboxes:
+
+- Twitter @RedbrickDCU
+- Facebook: https://www.facebook.com/dcuredbrick
diff --git a/source/_posts/week-4/intercom.png b/content/post/week-4/intercom.png
similarity index 100%
rename from source/_posts/week-4/intercom.png
rename to content/post/week-4/intercom.png
diff --git a/source/_posts/week-4/logo.png b/content/post/week-4/logo.png
similarity index 100%
rename from source/_posts/week-4/logo.png
rename to content/post/week-4/logo.png
diff --git a/source/_posts/week-6-news-events.md b/content/post/week-6-news-events/index.md
similarity index 53%
rename from source/_posts/week-6-news-events.md
rename to content/post/week-6-news-events/index.md
index 50160b4..dd12e24 100644
--- a/source/_posts/week-6-news-events.md
+++ b/content/post/week-6-news-events/index.md
@@ -1,9 +1,7 @@
 ---
-title: 'Week 6 News & Events'
 author: polka
-date: '2012-03-11 21:16:00'
-thumbnail: wbdateexm.png
 banner: wbdateexm.png
+date: '2012-03-11 21:16:00'
 tags:
   - irlcpc
   - pints
@@ -11,55 +9,76 @@ tags:
   - admin
   - webmaster
   - helpdesk
+thumbnail: wbdateexm.png
+title: Week 6 News & Events
 ---
 
-Reading week is here, though not all of us get a break! There's still a few things happening this week.
+Reading week is here, though not all of us get a break! There's still a few
+things happening this week.
+
+- IrlCPC Practice
+- Social Beers
+- Admin Training
+- AGM
+- Webmaster Exam
+- System Administrator Exam
+- Helpdesk Exam
 
-*   IrlCPC Practice
-*   Social Beers
-*   Admin Training
-*   AGM
-*   Webmaster Exam
-*   System Administrator Exam
-*   Helpdesk Exam
+ 
 
-
 ## IrlCPC Practice
 
-For those of you that have registered for the IrlCPC programming contest in Cork, we're continuing our practice sessions! The contest is only two weeks away, so come along to try out some problems.
+For those of you that have registered for the IrlCPC programming contest in
+Cork, we're continuing our practice sessions! The contest is only two weeks
+away, so come along to try out some problems.
 
 This week's session will be held in LG25 at 6pm on Tuesday the 13th.
 
 ## Social Beers
 
-Time for some pints! We're organising a small meet up in NuBar on Tuesday, after our programming practice for our members to get together and chill out for a little while.
+Time for some pints! We're organising a small meet up in NuBar on Tuesday, after
+our programming practice for our members to get together and chill out for a
+little while.
 
-We'll be in the bar from 8pm to late, so feel free to come along and bring a few friends.
+We'll be in the bar from 8pm to late, so feel free to come along and bring a few
+friends.
 
 ## Admin Training
 
-Admin training continues this week with Setting Up Basic Services. We're in our usual slot of Thursday the 15th at 6pm in LG25.
+Admin training continues this week with Setting Up Basic Services. We're in our
+usual slot of Thursday the 15th at 6pm in LG25.
 
-The AGM is looming, so if you're interested in running for a System Administrator position, be sure to come along!
+The AGM is looming, so if you're interested in running for a System
+Administrator position, be sure to come along!
 
 ## AGM
 
-Our AGM will be held on the 27th of March at 6pm. Venue to be confirmed, but be sure to attend if you want to run for a position, or even just to heckle the candidates!
+Our AGM will be held on the 27th of March at 6pm. Venue to be confirmed, but be
+sure to attend if you want to run for a position, or even just to heckle the
+candidates!
 
 ## Webmaster Exam
 
-If you want to run for the Webmaster position at this year's AGM, contact [webmaster](mailto:webmaster@redbrick.dcu.ie) to register your interest for the exam.
+If you want to run for the Webmaster position at this year's AGM, contact
+[webmaster](mailto:webmaster@redbrick.dcu.ie) to register your interest for the
+exam.
 
-We will be holding the exam the week before the AGM, so please do this as soon as possible!
+We will be holding the exam the week before the AGM, so please do this as soon
+as possible!
 
 ## System Administrator Exam
 
-If you want to run for one of the System Administrator positions at this year's AGM, contact [admins](mailto:admins@redbrick.dcu.ie) to register your interest for the exam.
+If you want to run for one of the System Administrator positions at this year's
+AGM, contact [admins](mailto:admins@redbrick.dcu.ie) to register your interest
+for the exam.
 
 We will be holding the exam the week before the AGM, so please do this soon!
 
 ## Helpdesk Exam
 
-If you want to run for one of the Helpdesk positions at this year's AGM, contact [helpdesk](mailto:helpdesk@redbrick.dcu.ie) to register your interest for the exam.
+If you want to run for one of the Helpdesk positions at this year's AGM, contact
+[helpdesk](mailto:helpdesk@redbrick.dcu.ie) to register your interest for the
+exam.
 
-We will be holding the exam the week before the AGM, so please do this as soon as possible.
+We will be holding the exam the week before the AGM, so please do this as soon
+as possible.
diff --git a/source/_posts/week-6-news-events/wbdateexm.png b/content/post/week-6-news-events/wbdateexm.png
similarity index 100%
rename from source/_posts/week-6-news-events/wbdateexm.png
rename to content/post/week-6-news-events/wbdateexm.png
diff --git a/content/post/week-7-news-events-1/index.md b/content/post/week-7-news-events-1/index.md
new file mode 100644
index 0000000..93b37f7
--- /dev/null
+++ b/content/post/week-7-news-events-1/index.md
@@ -0,0 +1,78 @@
+---
+author: polka
+banner: week7.png
+date: '2013-11-10 17:58:56'
+tags:
+  - web design
+  - installfest
+  - admin
+  - irsih cancer society
+thumbnail: week7.png
+title: Week 7 News & Events
+---
+
+This week is looking to be great! We have Web development 101 tutorial with
+Maximilian Hoffmann and our annual Linux Installfest. So if you want to learn
+some web or get Linux installed on your laptop, this is the week for you!
+
+- Web Development Talk
+- Linux Installfest
+- Admin Exam
+- Trip Away
+- Irish Cancer Society Fundraiser
+
+ 
+
+## Web Development Talk
+
+This week instead of our Helpdesk talk we will be having our very own Maximilian
+Hoffmann (tsov). Max is currently working for Terminal4 while finishing his
+final year, and he'll be showing us how to create a good looking website easily.
+We will be going from the very basics upwards, so if you have no experience
+don't worry! There may be a sneaky surprise as well at the talk, so bring along
+your friends! We will be covering a number of topics during the workshop,
+including:
+
+- HTML5 and CSS3
+- The box model
+- Cross browser compatibility
+- Introduction to Bootstrap
+
+## Linux Installfest
+
+This Thursday, we'll be hosting our annual Linux Installfest instead of admin
+training. Bring along your laptop and we will show you how to install a Linux
+partition on your hard drive, or if you prefer; a virtual machine for you to
+access and use as you wish. This is a great opportunity for you to ask questions
+about Linux, and learn more about the process of installing and using Linux
+operating systems. We'll have a choice of three distributions on the day -
+OpenSuse, Ubuntu or Mint. It is recommended that those attending take a full
+backup of their files; though it's very unlikely, it is possible to lose data
+during the installation it's always best to ensure your files are safe.
+
+## Admin Exam
+
+We're still looking for our third Sysadmin to elect to the committee, so within
+the next week or two we will be hosting our admin exam. You must sit and pass
+the exam to be considered for election as an admin, so if you are looking into
+running please email [admins](mailto:admins@redbrick.dcu.ie) to register your
+interest.
+
+## Trip Away
+
+We here on committee are busy planning a trip away for the inter-semester break;
+between exams and semester two. Two years ago we went to Brussels to attend the
+Free Open Source Developers European Meeting (FOSDEM), which members really
+enjoyed - however this year the first day or FOSDEM falls on the last day of the
+exam period (31st of January). So we're looking for something a bit more
+suitable and asking for your suggestions. Please email
+[committee](mailto:committee@redbrick.dcu.ie) if you have any ideas!
+
+## Irish Cancer Society Fundraiser
+
+Some of our members who have been affected by cancer are working together to
+raise funds for the Irish Cancer Society. The members will be dying their hair,
+getting their legs waxed (ouch!) and getting cancer related tattoos, all to
+reach their goal of €3,000\. If you would like to donate, you can contact
+lithium@redbrick.dcu.ie or check out their fundraising page at
+[http://www.mycharity.ie/event/katia_valadeaus_event/](http://www.mycharity.ie/event/katia_valadeaus_event/).
diff --git a/source/_posts/week-7-news-events-1/week7.png b/content/post/week-7-news-events-1/week7.png
similarity index 100%
rename from source/_posts/week-7-news-events-1/week7.png
rename to content/post/week-7-news-events-1/week7.png
diff --git a/source/_posts/week-7-news-events/bowling.jpg b/content/post/week-7-news-events/bowling.jpg
similarity index 100%
rename from source/_posts/week-7-news-events/bowling.jpg
rename to content/post/week-7-news-events/bowling.jpg
diff --git a/content/post/week-7-news-events/index.md b/content/post/week-7-news-events/index.md
new file mode 100644
index 0000000..b5feffe
--- /dev/null
+++ b/content/post/week-7-news-events/index.md
@@ -0,0 +1,101 @@
+---
+author: attol
+banner: bowling.jpg
+date: '2011-11-07 13:08:15'
+tags:
+  - boolette
+  - common room
+  - qzar
+  - bowling
+  - hoodies
+  - EGM
+  - Digital Dicovery Week
+  - bowling
+  - admin
+thumbnail: bowling.jpg
+title: Week 7  News & Events
+---
+
+It may be reading week for some but we've made sure to keep week 7 action
+packed.
+
+As we said at the start of the year, today is the final day of the grace periods
+for account renewal. If you haven't renewed your account by the end of the day
+our account will be suspended.
+
+- Monday, 6pm, C165 - Boolette with Gamessoc
+- Tuesday, 12- 4pm, N109 - Common Room Launch
+- Wednesday, 2pm, meet in Hub - Qzar and bowling
+- Thursday, 6pm, LG26 - Admin Training
+- Hoodies - Order in Hub from 3pm on Monday and at any of our events
+- EGM
+- Digital Discovery Week - Week 8
+
+ 
+
+### Boolette
+
+A boolette tournament will be held in conjunction with Gamessoc tomorrow
+(Monday) at 6pm in C165. Boolette is a card game which combines strategy card
+lay with the concepts of Boolean logic. For more information :
+[http://boolette.alamzy.com/](http://boolette.alamzy.com/)
+
+### Qzar
+
+A little delayed, but better late than never, right? We'll be meeting up in the
+Hub at 2 on Wednesday and then heading off to Leisureplex Coolock. We have 20
+pots available so if you're interested then send an email to
+[committee](mailto:committee@redbrick.dcu.ie) with "Qzar" in the title. First
+come first served! It will be just 4 euros per person for bowling and Qzar.
+Bring bus fare as we'll be getting the 17a there.
+
+### Admin Training
+
+This week's admin training topic will be "More Bash Scripting". It will take
+place on Thursday in LG26 at 6pm.
+
+### Common Room Launch Party
+
+We'll be showing off the Redbrick/Engineering soc common room(N109) on Tuesday
+from 12-4\. We'll be serving tea and coffee. We won't be able to give out
+keycards yet but it's a great chance to check out the room.
+
+### Resignations and EGM
+
+Shane Stacey (Isaac702) has resigned from his post as Helpdesk as he wishes to
+run for the open admin position. So the positions currently up for grabs are
+admin and Helpdesk. If you're interested in running for either position email
+[committee](mailto:committee@redbrick.dcu.ie). In order to be eligible for
+either position you will need to pass a test so please let us know ASAP if
+you're interested in applying. Previous tests are available online to give you a
+rough idea of what to expect
+([http://www.redbrick.dcu.ie/help/exams](http://www.redbrick.dcu.ie/help/exams)).
+
+The EGM will be held on Wednesday 21/11(week 9) at 2pm. Location TBC.
+
+### Hoodies
+
+Due to popular demanded hoodies can still be ordered this week. Be in the hub on
+Monday from 3, or pop in to any of our events to order one. Remember to bring 25
+euros to confirm your order.
+
+### Week 8 Overview - Digital Discovery
+
+Next week will see a variety of events around campus to promote technology on
+campus in conjunction with the SU (we will also have the traditional Techweek in
+semester 2).
+
+One of the highlights of the week will be on Tuesday 15/11 at 6pm in QG13 - a
+talk given by Workday on the following topics:
+
+- Cloud Computing
+- The Continuous 3Ds
+- You and the software industry
+
+There will also be a Q&A session after the talk on technical interviews.  
+The guys have very generously offered to quench not only our thirst  
+for knowledge but also our thirst for beer after the talk (too cheesy?).
+
+If you are interested in giving a talk or video talk please let us  
+know! If you'd like to request a talk on a certain topic don't be  
+afraid to ask.
diff --git a/content/post/week-8-news-events-1/index.md b/content/post/week-8-news-events-1/index.md
new file mode 100644
index 0000000..148d8c0
--- /dev/null
+++ b/content/post/week-8-news-events-1/index.md
@@ -0,0 +1,77 @@
+---
+author: polka
+banner: week8.png
+date: '2013-11-17 18:09:39'
+tags:
+  - helpdesk
+  - irish cancer society
+  - admin
+  - EGM
+thumbnail: week8.png
+title: Week 8 News & Events
+---
+
+A normal week here at Redbrick this week. Our Helpdesk talk is Developing on
+Redbrick and our Admins will be showing you how to setup a LAMP stack using the
+Redbrick VMs.
+
+- Helpdesk Talk
+- Admin Training
+- EGM
+- Irish Cancer Society Fundraiser
+- Trip Away
+
+ 
+
+## Helpdesk Talk
+
+This week our wonderful Helpdesk team will be introducing you to our development
+server - Pygmalion. They'll be talking you through the basics of logging in,
+writing your programs, and of course, compiling them. If you're a seasoned
+developer or new to programming, this should be a good talk for anyone.
+Naturally, there will be pizza! If you missed talks from previous weeks you can
+find the slides here:
+[http://www.redbrick.dcu.ie/~newb/slides/helpdesk/](http://www.redbrick.dcu.ie/~newb/slides/helpdesk/)
+
+## Admin Training
+
+This week the admin team will be continuing with Installing a LAMP STack on
+Redbrick by finishing the install. They will also be guiding you through setting
+up PHP and MYSQL, as well as a brief, beginners look at shell scripting. As
+always, there will be pizza.
+
+## EGM
+
+With a few available positions on the committee, we will be holding an EGM in
+the coming weeks. Date and time will be confirmed in the coming weeks, the
+positions available are:
+
+- Systems Administrator
+- Webmaster
+- Events Officer
+- Secretary
+
+If you think you would be interested in running for any of the above positions,
+you can contact us at [committee](mailto:committee@redbrick.dcu.ie) to learn
+more about the positions. If you are interested in running for our admin or
+webmaster, you must sit and pass an exam to run. Previous exams can be found at:
+[http://www.redbrick.dcu.ie/help/exams](http://www.redbrick.dcu.ie/help/exams).
+
+## Irish Cancer Society Fundraiser
+
+Some of our members who have been affected by cancer are working together to
+raise funds for the Irish Cancer Society. The members will be dying their hair,
+getting their legs waxed (ouch!) and getting cancer related tattoos, all to
+reach their goal of €3,000\. If you would like to donate, you can contact
+[lithium](mailto:lithium@redbrick.dcu.ie) or check out their fundraising page at
+[http://www.mycharity.ie/event/katia_valadeaus_event/](http://www.mycharity.ie/event/katia_valadeaus_event/).
+
+## Trip Away
+
+We here on committee are busy planning a trip away for the inter-semester break;
+between exams and semester two. Two years ago we went to Brussels to attend the
+Free Open Source Developers European Meeting (FOSDEM), which members really
+enjoyed - however this year the first day or FOSDEM falls on the last day of the
+exam period (31st of January). So we're looking for something a bit more
+suitable and asking for your suggestions. Please email
+[committee](mailto:committee@redbrick.dcu.ie) if you have any ideas!
diff --git a/source/_posts/week-8-news-events-1/week8.png b/content/post/week-8-news-events-1/week8.png
similarity index 100%
rename from source/_posts/week-8-news-events-1/week8.png
rename to content/post/week-8-news-events-1/week8.png
diff --git a/content/post/week-8-news-events/index.md b/content/post/week-8-news-events/index.md
new file mode 100644
index 0000000..7f8a02d
--- /dev/null
+++ b/content/post/week-8-news-events/index.md
@@ -0,0 +1,34 @@
+---
+author: polka
+banner: pizza.png
+date: '2012-03-25 23:02:57'
+tags:
+  - AGM
+  - exams
+thumbnail: pizza.png
+title: Week 8 News & Events
+---
+
+We're flying through semester two, and here's what's happening with Redbrick
+this week!
+
+- Technical Exams
+- AGM
+
+ 
+
+## Technical Exams
+
+We are holding a number of technical exams for our upcoming AGM. The Webmaster
+and System Administrator exams will be held on Monday, the 26th of March. If you
+wish to take the Admin exam, contact the
+[admins](mailto:admins@redbrick.dcu.ie), or meet with them at 6.30pm in the
+Computing building lobby for the exam. If you wish to take the Webmaster exam,
+contact the [webmaster](mailto:webmaster@redbrick.dcu.ie)
+
+## AGM
+
+It's that time of year again! Come along to vote for who you want to be on your
+committee for the coming year, or nominate yourself for one of the positions
+available. There will be pizza provided, so be sure to come along and have your
+say!
diff --git a/source/_posts/week-8-news-events/pizza.png b/content/post/week-8-news-events/pizza.png
similarity index 100%
rename from source/_posts/week-8-news-events/pizza.png
rename to content/post/week-8-news-events/pizza.png
diff --git a/content/post/week-9-news-events-1/index.md b/content/post/week-9-news-events-1/index.md
new file mode 100644
index 0000000..147bd89
--- /dev/null
+++ b/content/post/week-9-news-events-1/index.md
@@ -0,0 +1,95 @@
+---
+author: polka
+banner: week9.png
+date: '2013-11-24 18:28:47'
+tags:
+  - helpdesk
+  - Fundraising
+  - Trip
+  - Christmas
+  - admin
+thumbnail: week9.png
+title: Week-9 News & Events
+---
+
+Things are starting to wind down. This week we have a Q&A session with Helpdesk
+and a continuation of our LAMP stack tutorial. More info inside.
+
+- Helpdesk Talk
+- Admin Training
+- Project Services
+- EGM
+- Christmas Party
+- Irish Cancer Society Fundraiser
+- Trip Away
+
+ 
+
+## Helpdesk Talk
+
+This week's Helpdesk talk will be a simple drop in session in LG26 on Tuesday at
+5pm. Any questions about previous talks? Questions about problems you have? Want
+to just annoy Andrew and Niall? Sounds like you should come along. As always,
+there will some good ol' Firehouse pizza. If you missed talks from previous
+weeks you can find the slides here:
+[http://www.redbrick.dcu.ie/~newb/slides/helpdesk/](http://www.redbrick.dcu.ie/~newb/slides/helpdesk/).
+
+## Admin Training
+
+Interested in running for our webmaster and/or admin position this year? Or even
+just interested in Redbrick services? This will be a good opportunity to ask any
+questions and review previous training sessions with our admin team. Pop into
+L128 at 6pm on Thursday to answer your questions. And of course, as usual there
+will be pizza.
+
+## Project Services
+
+Making a web application for your third or fourth Year Project and need
+somewhere to host it? Redbrick provide free Virtual Private Servers (VPS) with
+port 80 and 443 publicly accessible from the internet for all members. More info
+can be found on our wiki
+[http://wiki.redbrick.dcu.ie/mw/Rbvm](http://wiki.redbrick.dcu.ie/mw/Rbvm) or by
+contacting [admins](mailto:admins@redbrick.dcu.ie)
+
+## EGM
+
+With a few available positions on the committee, we will be holding an EGM
+during week 11\. Date and time will be confirmed soon, the positions available
+are:
+
+- Systems Administrator
+- Webmaster
+- Events Officer
+- Secretary
+- Helpdesk
+
+If you think you would be interested in running for any of the above positions,
+you can contact us at committee@redbrick.dcu.ie to learn more about the
+positions. If you are interested in running for our admin, Helpdesk or webmaster
+positions, you must sit and pass an exam to run. Previous exams can be found at:
+[http://www.redbrick.dcu.ie/help/exams.](http://www.redbrick.dcu.ie/help/exams)
+
+## Christmas Party
+
+We'll be hosting our annual Intersocs Christmas party in week 11 as well as our
+EGM. Date and time will be confirmed soon, but we will have food, presents, and
+a special visit from Santa...
+
+## Irish Cancer Society Fundraiser
+
+Some of our members who have been affected by cancer are working together to
+raise funds for the Irish Cancer Society. The members will be dying their hair,
+getting their legs waxed (ouch!) and getting cancer related tattoos, all to
+reach their goal of &3,000\. If you would like to donate, you can contact
+[lithium](mailto:lithium@redbrick.dcu.ie) or check out their fundraising page at
+[http://www.mycharity.ie/event/katia_valadeaus_event/](http://www.mycharity.ie/event/katia_valadeaus_event/).
+
+## Trip Away
+
+We here on committee are busy planning a trip away for the inter-semester break;
+between exams and semester two. Two years ago we went to Brussels to attend the
+Free Open Source Developers European Meeting (FOSDEM), which members really
+enjoyed - however this year the first day or FOSDEM falls on the last day of the
+exam period (31st of January). So we're looking for something a bit more
+suitable and asking for your suggestions. Please email
+[committee](mailto:committee@redbrick.dcu.ie) if you have any ideas!
diff --git a/source/_posts/week-9-news-events-1/week9.png b/content/post/week-9-news-events-1/week9.png
similarity index 100%
rename from source/_posts/week-9-news-events-1/week9.png
rename to content/post/week-9-news-events-1/week9.png
diff --git a/source/_posts/week-9-news-events/helix.jpg b/content/post/week-9-news-events/helix.jpg
similarity index 100%
rename from source/_posts/week-9-news-events/helix.jpg
rename to content/post/week-9-news-events/helix.jpg
diff --git a/content/post/week-9-news-events/index.md b/content/post/week-9-news-events/index.md
new file mode 100644
index 0000000..3ce65bc
--- /dev/null
+++ b/content/post/week-9-news-events/index.md
@@ -0,0 +1,71 @@
+---
+author: fructus
+banner: helix.jpg
+date: '2012-04-01 20:00:00'
+tags:
+  - committee
+  - connector
+  - table quiz
+thumbnail: helix.jpg
+title: Week 9  News & Events
+---
+
+As we get closer and closer to the end of semester two, we have elected our new
+Committee, but still have events left.
+
+- New Committee
+- Redbrick Annual Quiz
+- Connector Conference
+
+ 
+
+## New Committee
+
+Our new committee was elected at the AGM on Tuesday, they are as follows:
+
+- Chair Person
+  - James Reilly (fun)
+- Secretary
+  - Robert Devereux (kylar)
+- Treasurer
+  - Richard Walsh (koffee)
+- Admins
+  - Vadim Clyne-Kelly (VadimCK)
+  - Craig Gavagan Mac Entee (creadak)
+  - Shane Stacey (isaac702)
+- Helpdesk
+  - Eimear Tyrell (beimear)
+  - Craig Duff (duff)
+- Webmaster
+  - Ciaran McNally (maK)
+- Events
+  - Tríona Barrow (polka)
+- PRO
+  - Andrew Boylan (fructus)
+
+Congratulations to all of the new committee - hopefully they will do a great
+job. Thank you to all who attended and ran for committee positions,
+commiserations to those who weren't elected this year
+
+## Redbrick Annual Quiz
+
+The Redbrick annual quiz is planned for week 10, final details are to be
+confirmed and will be released next week. However, it is planned to be held on
+the Thursday of that week.
+
+## Connector Conference
+
+![helix](helix.jpg)
+
+The conference is on Wednesday the 4th of April in the Helix, kicks
+off at 2pm and only lasts two hours. Featured speakers include:
+
+- Alan Kelly -TD & Minister of State Dept Transport, Tourism & Sport,
+- Mark Little - Founder of Storyful
+- Niall Harbison - Founder of Simply Zesty
+- Ciaran Crean - Micks Garage
+- Eoghan Jennings - MD Startup Bootcamp Dublin
+
+The event is free, and it should be a good bit of fun, all are welcome. Be sure
+to register to ensure a place at
+[http://connector.eventbrite.com/](http://connector.eventbrite.com)
diff --git a/source/_posts/welcome-freshers/freshers.png b/content/post/welcome-freshers/freshers.png
similarity index 100%
rename from source/_posts/welcome-freshers/freshers.png
rename to content/post/welcome-freshers/freshers.png
diff --git a/content/post/welcome-freshers/index.md b/content/post/welcome-freshers/index.md
new file mode 100644
index 0000000..913c01b
--- /dev/null
+++ b/content/post/welcome-freshers/index.md
@@ -0,0 +1,30 @@
+---
+author: polka
+banner: freshers.png
+date: '2013-09-23 15:46:27'
+tags:
+  - freshers
+title: Welcome Freshers!
+---
+
+Hey everyone.  
+We'd all like to welcome all our incoming first years to DCU, welcome to
+university! We will be meeting you during Freshers week, and again on Clubs and
+Societies Days.
+
+ 
+
+![freshers stand](freshers.png)We're currently planning our first few events of
+the year, including our Introduction to Redbrick Talk, and the Freshers Ball!
+Both of these are a fantastic opportunity to meet fellow students from all
+years, and make friends that will last through the years. As one of DCU's oldest
+societies, we can help you settle into college life, and show you how important
+society life is to your college experience.
+
+Be sure to check out our Facebook group and our Wiki, and we look forward to
+meeting you very soon!
+
+We will be announcing details for the first few weeks back within the next
+fortnight.
+
+w00t!
diff --git a/data/l10n.toml b/data/l10n.toml
new file mode 100644
index 0000000..06a5c40
--- /dev/null
+++ b/data/l10n.toml
@@ -0,0 +1,43 @@
+[articles]
+    read_more = "Read more"
+    words = "words"
+    readingtime = "minute read"
+    share = "Share"
+    comments = "Comments"
+
+# Linked older/newer posts at the bottom of each one
+[articles.linked_posts]
+    older = "Older"
+    newer = "Newer"
+
+[search]
+    placeholder = "Search"
+
+[pagination]
+    previous = "Prev"
+    next = "Next"
+
+[profile]
+    follow_button = "Follow"
+    tags = "Tags"
+    posts = "Posts"
+
+[page_not_found]
+    title = "404 page not found"
+    subtitle = "Dude, where is my page?"
+
+[server_error]
+    title = "500 Error"
+    subtitle = "An internal error as occurred"
+
+[widgets.categories]
+    title = "Categories"
+
+[widgets.recent_articles]
+    title = "Recents"
+
+[widgets.tag_cloud]
+    title = "Tag cloud"
+
+[widgets.tags]
+    title = "Tags"
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 3256850..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: "3"
-services:
-  redbrick:
-    build: .
-    command: 'yarn start'
-    volumes:
-      - $PWD/logs:/usr/src/app/logs
-      - $PWD/public:/usr/src/app/public
-      - $PWD/mailing_list:/usr/src/app/public/mailing_list
-    ports:
-      - '3000:3000'
-    env_file: .env
-    environment:
-      NODE_ENV: development
diff --git a/layouts/404.html b/layouts/404.html
new file mode 100644
index 0000000..3c03199
--- /dev/null
+++ b/layouts/404.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+

+  

+    

+      

+        
{{with .Site.Data.l10n.page_not_found.title}}{{.}}{{end}}

+      

+      
+      

+        
{{with .Site.Data.l10n.page_not_found.subtitle}}{{.}}{{end}}

+      

+    

+  

+

+{{ end }}
diff --git a/layouts/404.json b/layouts/404.json
new file mode 100644
index 0000000..fa9f6e3
--- /dev/null
+++ b/layouts/404.json
@@ -0,0 +1,4 @@
+{
+  "error": "404",
+  "message": "page not found"
+}
diff --git a/layouts/500.html b/layouts/500.html
new file mode 100644
index 0000000..c228428
--- /dev/null
+++ b/layouts/500.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+  

+    

+      

+        

+          
{{with .Site.Data.l10n.server_error.title}}{{.}}{{end}}

+        

+        
+        

+          {{with .Site.Data.l10n.server_error.subtitle}}{{.}}{{end}}
+        

+      

+    

+  

+{{ end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000..3224f46
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,16 @@
+
+
+  {{ partial "head" . }}
+  
+    

+      {{ partialCached "header" . }}
+      

+        {{ partialCached "profile" . }}
+        

+          {{ block "main" . }}{{ end }}
+        

+        {{ partial "sidebar" . }}
+      

+      {{ partialCached "footer" . }}
+  
+
diff --git a/layouts/_default/baseof.json b/layouts/_default/baseof.json
new file mode 100644
index 0000000..c7a95a9
--- /dev/null
+++ b/layouts/_default/baseof.json
@@ -0,0 +1,3 @@
+{
+  "data" : {{- block "response" . -}}{{- end -}}
+}
diff --git a/layouts/_default/item.json.json b/layouts/_default/item.json.json
new file mode 100644
index 0000000..18de574
--- /dev/null
+++ b/layouts/_default/item.json.json
@@ -0,0 +1,8 @@
+{
+  "title": "{{- replace .Title "\t" " " -}}",
+  "date": "{{ .Date }}",
+  "type": "{{ .Type }}",
+  "permalink": "{{ .Permalink }}",
+  {{- $summary := replace .Summary "\n" "\\n" }}
+  "summary" : "{{- replace $summary "\"" "\\\"" | htmlUnescape -}}"
+}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
new file mode 100644
index 0000000..91c13e4
--- /dev/null
+++ b/layouts/_default/list.html
@@ -0,0 +1,9 @@
+{{ define "main" }}
+  {{ $context := . }}
+  {{ with .Content }}
+    {{ partial "single_page" $context }}
+  {{ else }}
+    {{ partial "archive" . }}
+    {{ partial "pagination" . }}
+  {{ end }}
+{{ end }}
diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json
new file mode 100644
index 0000000..1303910
--- /dev/null
+++ b/layouts/_default/list.json.json
@@ -0,0 +1,7 @@
+{{ define "response" }}
+[
+  {{- range $index, $e := .Data.Pages -}}
+    {{- if $index -}}, {{- end -}}{{- .Render "item" -}}
+  {{- end -}}
+]
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
new file mode 100644
index 0000000..6364aa2
--- /dev/null
+++ b/layouts/_default/single.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+  {{ partial "single_page" . }}
+{{ end }}
diff --git a/layouts/_default/single.json.json b/layouts/_default/single.json.json
new file mode 100644
index 0000000..1e1a468
--- /dev/null
+++ b/layouts/_default/single.json.json
@@ -0,0 +1 @@
+{{ define "response" }} {{ .Render "item" }} {{ end }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
new file mode 100644
index 0000000..d5d75f3
--- /dev/null
+++ b/layouts/_default/summary.html
@@ -0,0 +1,33 @@
+

+  
+  

+    

+      
+    

+    

+      

+        
+        
+          
+        
+      

+      {{ with .Params.categories }}
+        

+          
+          {{ range . }}
+            #{{ . }}
+            '
+          {{ end }}
+        

+      {{ end }}
+      {{ with .Params.tags }}
+        

+          
+          {{ range . }}
+            #{{ . }}
+          {{ end }}
+        

+      {{ end }}
+    

+  

+

diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
new file mode 100644
index 0000000..be7dfde
--- /dev/null
+++ b/layouts/_default/terms.html
@@ -0,0 +1,19 @@
+{{ define "main" }}
+

+  

+    {{ .Title }}
+  

+  

+    
    
+      {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }}
+      
  • 
+        {{ $value.Name }}
+        {{ $value.Count }}
+      
    • 
+      {{ end }}
+    

+  

+

+{{ end }}
diff --git a/layouts/committee/item.json.json b/layouts/committee/item.json.json
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/committee/list.json.json b/layouts/committee/list.json.json
new file mode 100644
index 0000000..e8ec017
--- /dev/null
+++ b/layouts/committee/list.json.json
@@ -0,0 +1,13 @@
+{{ define "response" }}
+{
+  {{ with .Section }}
+  "section" : "{{ . }}",
+  {{ end }}
+  "count" : "{{ len .Data.Pages }}",
+  "items" : [
+  {{ range $i, $e := .Data.Pages }}
+  {{ if $i }}, {{ end }}{{ .Render "item" }}
+  {{ end }}
+  ]
+}
+{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
new file mode 100644
index 0000000..cdc3382
--- /dev/null
+++ b/layouts/index.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+  {{ partial "article_list" . }}
+{{ end }}
diff --git a/layouts/partials/archive.html b/layouts/partials/archive.html
new file mode 100644
index 0000000..1df7732
--- /dev/null
+++ b/layouts/partials/archive.html
@@ -0,0 +1,10 @@
+

+  

+    
+    
#{{ .Title }}

+  

+  {{ $paginator := .Paginate .Data.Pages }}
+  {{ range $paginator.Pages }}
+    {{ .Render "summary" }}
+  {{ end }}
+

diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html
new file mode 100644
index 0000000..c6f1981
--- /dev/null
+++ b/layouts/partials/article_footer.html
@@ -0,0 +1,96 @@
+

+  
+    
+    {{with .Site.Data.l10n.articles.share}}{{.}}{{end}}
+  
+
+  
+

diff --git a/layouts/partials/article_header.html b/layouts/partials/article_header.html
new file mode 100644
index 0000000..d0e4db8
--- /dev/null
+++ b/layouts/partials/article_header.html
@@ -0,0 +1,47 @@
+

+  
+    

+      {{ .Title }}
+    

+  
+  

+    {{ if not .Params.nodateline }}
+      

+        
+        
+        · {{ .WordCount }}
+        {{ with .Site.Data.l10n.articles.words }}{{.}}{{end}}
+        · {{ .ReadingTime }}
+        {{ with .Site.Data.l10n.articles.readingtime }}{{.}}{{end}}
+      

+    {{ end }}
+    {{ if isset .Params "categories" }}
+      {{ $categoriesLen := len .Params.categories }}
+      {{ if gt $categoriesLen 0 }}
+        

+          
+          {{ range $k, $v := .Params.categories }}
+            {{ $url := printf "categories/%s" (. | urlize | lower) }}
+            {{ . }}
+            {{ if lt $k (sub $categoriesLen 1) }}·{{ end }}
+          {{ end }}
+        

+      {{ end }}
+    {{ end }}
+    {{ if isset .Params "tags" }}
+      {{ $tagsLen := len .Params.tags }}
+      {{ if gt $tagsLen 0 }}
+        

+          
+          {{ range $k, $v := .Params.tags }}
+            {{ $url := printf "tags/%s" (. | urlize | lower) }}
+            {{ . }}
+            {{ if lt $k (sub $tagsLen 1) }}·{{ end }}
+          {{ end }}
+        

+      {{ end }}
+    {{ end }}
+  

+

diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html
new file mode 100644
index 0000000..53c3395
--- /dev/null
+++ b/layouts/partials/article_list.html
@@ -0,0 +1,29 @@
+{{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
+{{ range $paginator.Pages }}
+  
+{{ end }}
+{{ partial "pagination" . }}
diff --git a/layouts/partials/cmt.html b/layouts/partials/cmt.html
new file mode 100644
index 0000000..db7a3f8
--- /dev/null
+++ b/layouts/partials/cmt.html
@@ -0,0 +1,26 @@
+{{ with .Params.cmt }}
+  

+    {{ range . }}
+      

+        
+          
{{ .position }}

+            {{ if (isset . "resigned") | and .resigned }}
+              

+            {{ else }}
+              

+            {{ end }}
+            {{ if (isset . "image") }}
+              
+            {{ else }}
+              
+            {{ end }}
+          

+          
{{ .name }} - {{ .nick }}

+          {{ if (isset . "resigned") | and .resigned }}
+            
Resigned

+          {{ end }}
+        
+      

+    {{ end }}
+  

+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
new file mode 100644
index 0000000..0e299d8
--- /dev/null
+++ b/layouts/partials/footer.html
@@ -0,0 +1,13 @@
+

+  

+    
+  

+

+{{ partial "footer_js" . }}
diff --git a/layouts/partials/footer_js.html b/layouts/partials/footer_js.html
new file mode 100644
index 0000000..0953f84
--- /dev/null
+++ b/layouts/partials/footer_js.html
@@ -0,0 +1,29 @@
+{{ template "_internal/google_analytics.html" . }}
+
+{{ $secureJS := resources.Get "js/script.js" | resources.Minify | resources.Fingerprint "sha512" }}
+
+
+{{ $menu := resources.Get "js/menu.js" | resources.Minify | resources.Fingerprint "sha512" }}
+
+
+
+
+
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
new file mode 100644
index 0000000..38ebbb3
--- /dev/null
+++ b/layouts/partials/head.html
@@ -0,0 +1,72 @@
+
+  
+    {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }}
+  
+  {{ hugo.Generator }}
+  
+  
+  {{ with .Site.Params.author }}
+    
+  {{ end }}
+  {{ with .Description }}
+    
+  {{ else }}
+    
+  {{ end }}
+  {{ with .OutputFormats.Get "RSS" }}
+    
+    
+  {{ end }}
+  
+  
+  
+  {{ $style := resources.Get "scss/main.scss" | resources.ToCSS (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true) | resources.Fingerprint "sha512" }}
+  
+
+  
+  
+  
+  
+  {{ template "_internal/opengraph.html" . }}
+  {{ template "_internal/google_news.html" . }}
+  {{ template "_internal/schema.html" . }}
+  {{ template "_internal/twitter_cards.html" . }}
+
+  
+  
+
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..ddde4da
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,35 @@
+
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
new file mode 100644
index 0000000..e05f481
--- /dev/null
+++ b/layouts/partials/nav.html
@@ -0,0 +1,28 @@
+
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
new file mode 100644
index 0000000..9c96114
--- /dev/null
+++ b/layouts/partials/pagination.html
@@ -0,0 +1,14 @@
+
diff --git a/layouts/partials/prev_next_post.html b/layouts/partials/prev_next_post.html
new file mode 100644
index 0000000..b1bffc6
--- /dev/null
+++ b/layouts/partials/prev_next_post.html
@@ -0,0 +1,28 @@
+{{ if and (or .PrevInSection .NextInSection) (not .Params.noprevnext) }}
+  
+{{ end }}
diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html
new file mode 100644
index 0000000..51817f9
--- /dev/null
+++ b/layouts/partials/profile.html
@@ -0,0 +1,51 @@
+
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
new file mode 100644
index 0000000..7a03029
--- /dev/null
+++ b/layouts/partials/search.html
@@ -0,0 +1,17 @@
+

+  

+    
+    
+    
+  

+

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
new file mode 100644
index 0000000..0bf0824
--- /dev/null
+++ b/layouts/partials/sidebar.html
@@ -0,0 +1,7 @@
+
diff --git a/layouts/partials/single_article.html b/layouts/partials/single_article.html
new file mode 100644
index 0000000..23491b0
--- /dev/null
+++ b/layouts/partials/single_article.html
@@ -0,0 +1,18 @@
+

+  

+    {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
+      
+    {{ end }}
+    {{ partial "article_header" . }}
+    

+      {{ .Content }}
+    

+    {{ partial "article_footer" . }}
+  

+  {{ partial "prev_next_post" . }}
+

diff --git a/layouts/partials/single_page.html b/layouts/partials/single_page.html
new file mode 100644
index 0000000..8c34aec
--- /dev/null
+++ b/layouts/partials/single_page.html
@@ -0,0 +1,22 @@
+

+  

+    {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
+      
+    {{ end }}
+    

+      
+        
{{ .Title }}

+      
+    

+    {{ partial "cmt" . }}
+    

+      {{ .Content }}
+    

+    {{ partial "article_footer" . }}
+  

+

diff --git a/layouts/partials/social.html b/layouts/partials/social.html
new file mode 100644
index 0000000..a5ee291
--- /dev/null
+++ b/layouts/partials/social.html
@@ -0,0 +1,191 @@
+{{ with .Site.Social.github }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.gitlab }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.bitbucket }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.jsfiddle }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.codepen }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.foursquare }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.dribbble }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.deviantart }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.behance }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.flickr }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.instagram }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.youtube }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.vimeo }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.vine }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.medium}}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.wordpress }}
+  
+    
+  
+{{ end }} {{ with .Site.Social.tumblr }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.xing }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.linkedin }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.slideshare }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.stackoverflow }}
+  
+    
+
+{{ end }}
+{{ with .Site.Social.reddit }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.pinterest }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.googleplus }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.facebook }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.twitter }}
+  
+    
+  
+{{ end }}
+{{ with .Site.Social.status }}
+  
+    
+  
+{{ end }}
diff --git a/layouts/partials/widgets/categories.html b/layouts/partials/widgets/categories.html
new file mode 100644
index 0000000..ac5cf21
--- /dev/null
+++ b/layouts/partials/widgets/categories.html
@@ -0,0 +1,24 @@
+{{ if .Site.Params.widgets.categories }}
+  {{ if isset .Site.Taxonomies "categories" }}
+    {{ if not (eq (len .Site.Taxonomies.categories) 0) }}
+    

+      

+        {{with .Site.Data.l10n.widgets.categories.title}}{{.}}{{end}}
+      

+      

+        
    
+          {{ range $name, $items := .Site.Taxonomies.categories }}
+            
  • 
+              {{ $url := printf "%s/%s" "categories" ($name | urlize | lower)}}
+              
+                {{ $name }}
+              
+              {{ len $items }}
+            
    • 
+          {{ end }}
+        

+      

+    

+    {{ end }}
+  {{ end }}
+{{ end }}
diff --git a/layouts/partials/widgets/recent_articles.html b/layouts/partials/widgets/recent_articles.html
new file mode 100644
index 0000000..e2e813c
--- /dev/null
+++ b/layouts/partials/widgets/recent_articles.html
@@ -0,0 +1,46 @@
+{{ if .Site.Params.widgets.recent_articles }}
+  

+    

+      {{with .Site.Data.l10n.widgets.recent_articles.title}}{{.}}{{end}}
+    

+    

+      
+    

+  

+{{ end }}
diff --git a/layouts/partials/widgets/tag_cloud.html b/layouts/partials/widgets/tag_cloud.html
new file mode 100644
index 0000000..beaec76
--- /dev/null
+++ b/layouts/partials/widgets/tag_cloud.html
@@ -0,0 +1,19 @@
+{{ if .Site.Params.widgets.tag_cloud }}
+  {{ if isset .Site.Taxonomies "tags" }}
+    {{ if not (eq (len .Site.Taxonomies.tags) 0) }}
+    

+      

+        {{with .Site.Data.l10n.widgets.tag_cloud.title}}{{.}}{{end}}
+      

+      

+        {{ range $name, $items := .Site.Taxonomies.tags }}
+          {{ $name }}
+        {{ end }}
+      

+    

+    {{ end }}
+  {{ end }}
+{{ end }}
diff --git a/layouts/partials/widgets/tags.html b/layouts/partials/widgets/tags.html
new file mode 100644
index 0000000..ba80148
--- /dev/null
+++ b/layouts/partials/widgets/tags.html
@@ -0,0 +1,24 @@
+{{ if .Site.Params.widgets.tags }}
+  {{ if isset .Site.Taxonomies "tags" }}
+    {{ if not (eq (len .Site.Taxonomies.tags) 0) }}
+      

+        

+          {{ with .Site.Data.l10n.widgets.tags.title }}{{.}}{{end}}
+        

+        

+          
    
+            {{ range $name, $items := .Site.Taxonomies.tags }}
+              
  • 
+                {{ $name }}
+                {{ len $items }}
+              
    • 
+            {{ end }}
+          

+        

+      

+    {{ end }}
+  {{ end }}
+{{ end }}
diff --git a/layouts/post/list.html b/layouts/post/list.html
new file mode 100644
index 0000000..f64d4ce
--- /dev/null
+++ b/layouts/post/list.html
@@ -0,0 +1,9 @@
+{{ define "main" }}
+  {{ $context := . }}
+  {{ with .Content }}
+    {{ partial "single_article.html" $context }}
+  {{ else }}
+    {{ partial "archive" . }}
+    {{ partial "pagination" . }}
+  {{ end }}
+{{ end }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
new file mode 100644
index 0000000..4dddcde
--- /dev/null
+++ b/layouts/post/single.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+  {{ partial "single_article" . }}
+{{ end }}
diff --git a/layouts/section/events.html b/layouts/section/events.html
new file mode 100644
index 0000000..009f149
--- /dev/null
+++ b/layouts/section/events.html
@@ -0,0 +1,52 @@
+{{ define "main" }}
+  

+    

+      
Events

+    

+    

+      
+      
+      
+      
+      
+      

+    

+    {{ with .Params.subscribe }}
+      

+        {{ .text }}
+      

+    {{ end }}
+    {{ with .Params.message }}
+      

+        {{ .text }}
+      

+    {{ end }}
+  

+{{ end }}
diff --git a/layouts/shortcodes/back_button.html b/layouts/shortcodes/back_button.html
new file mode 100644
index 0000000..bb01a0c
--- /dev/null
+++ b/layouts/shortcodes/back_button.html
@@ -0,0 +1,4 @@
+ Back
+


diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html
new file mode 100644
index 0000000..08cf052
--- /dev/null
+++ b/layouts/shortcodes/gallery.html
@@ -0,0 +1,9 @@
+

+  

+    {{ range .Params }}
+    
+      
+    
+    {{ end }}
+  

+

diff --git a/layouts/shortcodes/paypal.html b/layouts/shortcodes/paypal.html
new file mode 100644
index 0000000..16de226
--- /dev/null
+++ b/layouts/shortcodes/paypal.html
@@ -0,0 +1,45 @@
+

+  
+  
+  
+  
+  

+    

+      

+        
+      

+      

+        €4.00 + 50c Paypal fees
+      

+    

+    

+      

+        
+      

+      

+        €8.00 + 63c Paypal fees
+      

+    

+    

+      

+        
+      

+      

+        €20.00
+      

+    

+    

+      

+        
+        
+      

+    

+    

+      
+    

+  

+  
+  
+  
+  
+
diff --git a/layouts/shortcodes/pdf.html b/layouts/shortcodes/pdf.html
new file mode 100644
index 0000000..ea2bdf0
--- /dev/null
+++ b/layouts/shortcodes/pdf.html
@@ -0,0 +1,21 @@
+{{ with .Get "googledoc" }}
+  

+    
+  

+{{ end }}
+{{ with .Get "slideshare" }}
+  
+{{ end }}
+{{ with .Get "src" }}
+  

+    
+  

+{{ end }}
diff --git a/layouts/shortcodes/reveal.html b/layouts/shortcodes/reveal.html
new file mode 100644
index 0000000..de29247
--- /dev/null
+++ b/layouts/shortcodes/reveal.html
@@ -0,0 +1,16 @@
+{{ if .Get "src" }}
+  

+