Commit c51c80c1 authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

remove teams from configuration

parent b10069ee
......@@ -20,63 +20,6 @@ proxiedHeaders:
- "EY_HEADER"
- "Content-Type"
admins:
- name: "gpietrus_admin"
password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
email: "gpietrusza@gmail.com"
admin: true
- name: "anteq_admin"
password: "1a7fcdd5a9fd433523268883cfded9d0" #gpietrus md5
email: "antonigrzanka@gmail.com"
admin: true
teams:
- name: "misiaczki"
description: "misiaczki opis"
members:
- name: "gpietrus1"
password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
email: "gpietrusza@gmail.com"
- name: "mehow1"
password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
email: "mehow@gmail.com"
- name: "rosiu1"
password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
email: "rosiu@gmail.com"
- name: "anteq1"
password: "1a7fcdd5a9fd433523268883cfded9d0" #anteq1 md5
email: "antonigrzanka@gmail.com"
- name: "prosiaczki"
description: "prosiaczki opis"
members:
- name: "gpietrus2"
password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
email: "gpietrusza@gmail.com"
- name: "mehow2"
password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
email: "mehow@gmail.com"
- name: "rosiu2"
password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
email: "rosiu@gmail.com"
- name: "anteq2"
password: "1a7fcdd5a9fd433523268883cfded9d0" #anteq1 md5
email: "antonigrzanka@gmail.com"
- name: "dupeczki"
description: "dupeczki opis"
members:
- name: "gpietrus3"
password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
email: "gpietrusza@gmail.com"
- name: "mehow3"
password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
email: "mehow@gmail.com"
- name: "rosiu3"
password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
email: "rosiu@gmail.com"
- name: "anteq3"
password: "1a7fcdd5a9fd433523268883cfded9d0" #anteq1 md5
email: "antonigrzanka@gmail.com"
textTasks:
- name: "Sprzętowe"
text: "Ten link nie prowadzi do budynku :P"
......
package com.telephoners.krakyournet.ctf.core;
import com.telephoners.krakyournet.ctf.beans.Team;
import com.telephoners.krakyournet.ctf.beans.User;
import com.telephoners.krakyournet.ctf.beans.tasks.TextTask;
import com.telephoners.krakyournet.ctf.beans.tasks.WebTask;
import io.dropwizard.Configuration;
......@@ -24,8 +22,8 @@ public class ApplicationConfiguration extends Configuration
@NotNull
private String digestMethod;
@NotNull
private List<Team> teams;
// @NotNull
// private List<Team> teams;
@NotNull
private List<TextTask> textTasks;
......@@ -33,39 +31,39 @@ public class ApplicationConfiguration extends Configuration
@NotNull
private List<WebTask> webTasks;
@NotNull
private List<User> admins;
// @NotNull
// private List<User> admins;
@NotNull
private StartupConfiguration startupConfiguration;
@NotNull
private Set<String> proxiedHeaders;
public List<User> getAdmins()
{
return admins;
}
public void setAdmins(List<User> admins)
{
this.admins = admins;
}
//
// public List<User> getAdmins()
// {
// return admins;
// }
//
// public void setAdmins(List<User> admins)
// {
// this.admins = admins;
// }
public String getDigestMethod()
{
return digestMethod;
}
public List<Team> getTeams()
{
return teams;
}
public void setTeams(List<Team> teams)
{
this.teams = teams;
}
// public List<Team> getTeams()
// {
// return teams;
// }
//
// public void setTeams(List<Team> teams)
// {
// this.teams = teams;
// }
public void setDigestMethodHashMethod(String digestMethod)
{
......
......@@ -38,6 +38,6 @@ public class TaskResource
{
return null;
// Task task = tasksRepository.getByLevel(taskLevel);
// return task.getTaskResponse();
// retrn task.getTaskResponse();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment