diff --git a/ansible/build.gradle.kts b/ansible/build.gradle.kts index d02a7dae6..d97be6899 100644 --- a/ansible/build.gradle.kts +++ b/ansible/build.gradle.kts @@ -67,7 +67,6 @@ dependencies { pvpPlugin(project(path = ":plugins:namelayer-paper", configuration = "shadow")) pvpPlugin(project(path = ":plugins:civchat2-paper")) pvpPlugin(project(path = ":plugins:namecolors-paper")) - pvpPlugin(project(path = ":plugins:secureboot-paper")) proxyPlugin(project(path = ":plugins:civproxy-velocity", configuration = "shadow")) proxyPlugin(project(path = ":plugins:announcements-velocity", configuration = "shadow")) diff --git a/ansible/files/gamma-config/plugins/SecureBoot/config.yml b/ansible/files/gamma-config/plugins/SecureBoot/config.yml new file mode 100644 index 000000000..cb465644c --- /dev/null +++ b/ansible/files/gamma-config/plugins/SecureBoot/config.yml @@ -0,0 +1,24 @@ +kick_message: "Server did not startup properly, please contact an @Admin!" + +# enable or disable secureboot +enable: ${CIV_SECUREBOOT_ENABLE} + +# Plugin names that SecureBoot will require to be enabled +required_plugins: + - "CivModCore" + - "NameLayer" + - "Bastion" + - "CivChat2" + - "JukeAlert" + - "HiddenOre" + - "Orebfuscator" + - "EssenceGlue" + - "BanStick" + - "CombatTagPlus" + - "ExilePearl" + - "Finale" + - "FactoryMod" + - "RailSwitch" + - "SuperVanish" + - "RealisticBiomes" + - "Vulcan" diff --git a/ansible/files/paper-config/plugins/SecureBoot/config.yml b/ansible/files/paper-config/plugins/SecureBoot/config.yml index bfd329382..cb465644c 100644 --- a/ansible/files/paper-config/plugins/SecureBoot/config.yml +++ b/ansible/files/paper-config/plugins/SecureBoot/config.yml @@ -6,4 +6,19 @@ enable: ${CIV_SECUREBOOT_ENABLE} # Plugin names that SecureBoot will require to be enabled required_plugins: - "CivModCore" - - "testpluginthatdoesnotexist" + - "NameLayer" + - "Bastion" + - "CivChat2" + - "JukeAlert" + - "HiddenOre" + - "Orebfuscator" + - "EssenceGlue" + - "BanStick" + - "CombatTagPlus" + - "ExilePearl" + - "Finale" + - "FactoryMod" + - "RailSwitch" + - "SuperVanish" + - "RealisticBiomes" + - "Vulcan" diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2 index 83388f60e..8c600fcdb 100644 --- a/ansible/templates/stacks/minecraft.yml.j2 +++ b/ansible/templates/stacks/minecraft.yml.j2 @@ -90,6 +90,7 @@ services: USE_MEOWICE_GRAALVM_FLAGS: 'TRUE' STOP_DURATION: 3600 + CIV_SECUREBOOT_ENABLE: 'true' CIV_SERVER_NAME: prod-server {% if setting.minecraft.whitelist %} ENABLE_WHITELIST: 'true' @@ -191,6 +192,7 @@ services: USE_MEOWICE_GRAALVM_FLAGS: 'TRUE' STOP_DURATION: 3600 + CIV_SECUREBOOT_ENABLE: 'true' CIV_SERVER_NAME: prod-server {% if setting.minecraft.gamma_whitelist %} ENABLE_WHITELIST: 'true' diff --git a/docker-compose.yml b/docker-compose.yml index c2f268a23..eaf680486 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -138,6 +138,7 @@ services: INIT_MEMORY: 1G MAX_MEMORY: 3G + CIV_SECUREBOOT_ENABLE: 'false' CIV_SERVER_NAME: local CIV_WORDBANK_SEED: wordbank