From 5ee4f584a78d23643fe1969f00c92b8bf7935c2f Mon Sep 17 00:00:00 2001 From: northdpole Date: Thu, 14 May 2015 20:07:23 +0200 Subject: [PATCH 1/3] travis test Signed-off-by: northdpole --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..4380016f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: php + +php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 + + +before_install: + - travis-lint + - composer install + - sudo apt-get update > /dev/null + +install: + # install php packages required for running a web server from on php 5.3 + - sudo apt-get install -y --force-yes php5-cgi php5-mysql + + # add composer's global bin directory to the path + # see: https://github.com/drush-ops/drush#install---composer + - export PATH="$HOME/.composer/vendor/bin:$PATH" + + # install drush globally + - composer global require phpunit/phpunit smarty-gettext/smarty-gettext + +before_script: + # navigate out of module directory to prevent blown stack by recursive module lookup + - cd ../.. + + # create new site, stubbing sendmail path with true to prevent delivery errors and manually resolving drush path + - mysql -e 'create database hackademic_travis' + + - java -jar hacakdemic_devtests/selenium-server-standalone-2.45.0.jar From 9bec7b32a009a6fe6316f0a4aa1ecb927fdd793d Mon Sep 17 00:00:00 2001 From: northdpole Date: Sun, 9 Aug 2015 18:28:34 +0200 Subject: [PATCH 2/3] Initial challenge xml file Signed-off-by: northdpole --- challenges/Example/example.xml | 51 ++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/challenges/Example/example.xml b/challenges/Example/example.xml index 9e118991..f04506ae 100755 --- a/challenges/Example/example.xml +++ b/challenges/Example/example.xml @@ -2,23 +2,46 @@ Example Template For Challenge .xml Files creation - Name or email or both + Name or email or both - In what category does your challenge belong?(web? crypto? networks?) + In what category does your challenge belong?(Value used to make the admin's life easier) - Insert some text describing the scenario of the challenge(what the users are supposed to do and if there is any fictional story) + text describing the scenario of the challenge(what the users are supposed to do and if there is any fictional story) will be presented to the users as is - Either an interger from 1 to 10 with 1 being the easiest , or one of beginner, intermediate, advanced , hide_yo_wife - The level will be the max points a user can get. - beginner: 2pts - intermediate 4pts - advanced 6pts - hide_yo_wife 8pts - b4d1d3a 10pts + Either an interger from 1 to 100 with 1 being the easiest + The level will be the max points a user can get. - - The duration after which a user is disqualified. - The timer starts when a username starts a challenge for first time. - + + one of vagrant,docker + Note: + Bellow you can find examples of all provider directives. Also, for each kind of provider there should be + example/template challenges provided in the repository + * Docker means that the challenge contains a service which should run inside a docker container. + Should you choose docker you can either provide a folder which will be copied in /var/www/ of the target container + or you can provide a Dockerfile along with the challenge files which will be used to configure the container + * Vagrant means that the challenge will should be launched inside a virtual machine. In that case you can choose to + + + docker + (optional)relative path to your dockerfile + (optional)if you don't provide a dockerfile you can list here the files to be added to the target container, + you can have multiple copy directives, one for each file + e.g. challenge_folder/ /var/www/html/ + + a set of commands to be run when the container starts, you can have multiple run statements + + + vagrant + + puppet + + text here will appear in the config.vm.provision "puppet" do |puppet| section of the target vagrantfile as is + + From 93f5a639e61d90677cf12355225ee2b3fc996b70 Mon Sep 17 00:00:00 2001 From: northdpole Date: Sun, 9 Aug 2015 18:31:00 +0200 Subject: [PATCH 3/3] temporarily removed travis.yml to make the challenge xml commit cleaner Signed-off-by: northdpole --- .travis.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4380016f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: php - -php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - -before_install: - - travis-lint - - composer install - - sudo apt-get update > /dev/null - -install: - # install php packages required for running a web server from on php 5.3 - - sudo apt-get install -y --force-yes php5-cgi php5-mysql - - # add composer's global bin directory to the path - # see: https://github.com/drush-ops/drush#install---composer - - export PATH="$HOME/.composer/vendor/bin:$PATH" - - # install drush globally - - composer global require phpunit/phpunit smarty-gettext/smarty-gettext - -before_script: - # navigate out of module directory to prevent blown stack by recursive module lookup - - cd ../.. - - # create new site, stubbing sendmail path with true to prevent delivery errors and manually resolving drush path - - mysql -e 'create database hackademic_travis' - - - java -jar hacakdemic_devtests/selenium-server-standalone-2.45.0.jar