diff --git a/deploy_forcad.yml b/deploy_forcad.yml index 68555fd..1ea33c6 100644 --- a/deploy_forcad.yml +++ b/deploy_forcad.yml @@ -4,17 +4,12 @@ become: true tasks: - # - name: Install docker on machine - # include_role: - # name: docker - # tasks_from: main - # - # - name: install and setup forcad - # include_role: - # name: forcad - # tasks_from: main - # - - name: Destory forcAD - include_role: - name: destroy - tasks_from: main + - name: Install docker on machine + include_role: + name: docker + tasks_from: main + + - name: install and setup forcad + include_role: + name: forcad + tasks_from: main diff --git a/nuke_forcad.yml b/nuke_forcad.yml new file mode 100644 index 0000000..5628930 --- /dev/null +++ b/nuke_forcad.yml @@ -0,0 +1,11 @@ +--- +- name: Nuke ForcAD infra + hosts: forc_ad + become: true + + tasks: + - name: Destory forcAD + include_role: + name: destroy + tasks_from: main + diff --git a/roles/destroy/tasks/main.yml b/roles/destroy/tasks/main.yml index 1f04ff7..e504aa8 100644 --- a/roles/destroy/tasks/main.yml +++ b/roles/destroy/tasks/main.yml @@ -25,6 +25,7 @@ docker_image: name: "{{ item }}" state: absent + force_absent: true loop: "{{ image_info.images | map(attribute='Id') | list }}" - name: Delete forcAD directory diff --git a/roles/forcad/files/checkers/dummy_checker/dummy-checker.py b/roles/forcad/files/checkers/dummy_checker/checker.py similarity index 100% rename from roles/forcad/files/checkers/dummy_checker/dummy-checker.py rename to roles/forcad/files/checkers/dummy_checker/checker.py diff --git a/roles/forcad/files/config.yml b/roles/forcad/files/config.yml index 31bd036..5942371 100644 --- a/roles/forcad/files/config.yml +++ b/roles/forcad/files/config.yml @@ -7,7 +7,6 @@ game: round_time: 20 start_time: 2019-11-30 15:30:00 timezone: Europe/Ljubljana - checkers_path: '/checkers' default_score: 2500 flag_lifetime: 5 @@ -15,7 +14,7 @@ game: inflation: true tasks: - - checker: /checkers/baby_sql_checker/checker.py + - checker: baby_sql_checker/checker.py checker_timeout: 10 checker_type: hackerdom gets: 2 @@ -23,7 +22,7 @@ tasks: places: 5 puts: 2 - - checker: /checkers/dummy_checker/checker.py + - checker: dummy_checker/checker.py checker_timeout: 10 checker_type: gevent gets: 2 @@ -31,7 +30,7 @@ tasks: places: 5 puts: 2 - - checker: /checkers/hash_me_please_checker/checker.py + - checker: hash_me_please_checker/checker.py checker_timeout: 10 checker_type: gevent gets: 2 diff --git a/roles/forcad/tasks/main.yml b/roles/forcad/tasks/main.yml index 6514c30..07c91c2 100644 --- a/roles/forcad/tasks/main.yml +++ b/roles/forcad/tasks/main.yml @@ -40,6 +40,7 @@ ansible.builtin.copy: src: "checkers/" dest: "{{ forc_ad_directory }}/checkers" + mode: '0755' - name: Copy forcAD config ansible.builtin.copy: diff --git a/roles/forcad/vars/main.yml b/roles/forcad/vars/main.yml index f145af9..d986c03 100644 --- a/roles/forcad/vars/main.yml +++ b/roles/forcad/vars/main.yml @@ -3,7 +3,7 @@ forc_ad_directory: '/forc_ad' # forcAD download link -forc_ad_link: 'https://github.com/pomo-mondreganto/ForcAD/releases/download/v1.4.0/ForcAD_v1.4.0.zip' +forc_ad_link: 'https://github.com/pomo-mondreganto/ForcAD/archive/refs/heads/master.zip' # forcAd zipfile -forc_ad_zipfile: 'ForcAD_v1.4.0.zip' +forc_ad_zipfile: 'ForcAD-master.zip'