diff --git a/defaults/main/network_opts.yml b/defaults/main/network_opts.yml index 5886ce6..d7c1291 100644 --- a/defaults/main/network_opts.yml +++ b/defaults/main/network_opts.yml @@ -62,6 +62,7 @@ neogo__default_network_config: - 'seed5.neo.org:10333' Hardforks: Aspidochelone: 1730000 + - enabled: "{{ neogo__network_type == 'morph-mainnet' }}" path: ProtocolConfiguration options: @@ -74,16 +75,6 @@ neogo__default_network_config: - 'morph5.fs.neo.org:40333' - 'morph6.fs.neo.org:40333' - 'morph7.fs.neo.org:40333' - - enabled: "{{ neogo__network_type == 'morph-mainnet' and neogo__oracle_enabled }}" - path: ApplicationConfiguration - options: - Oracle: - NeoFS: - Nodes: - - 'st1.storage.fs.neo.org:8080' - - 'st2.storage.fs.neo.org:8080' - - 'st3.storage.fs.neo.org:8080' - - 'st4.storage.fs.neo.org:8080' - enabled: "{{ neogo__network_type == 'neo-testnet' }}" path: ProtocolConfiguration @@ -122,6 +113,7 @@ neogo__default_network_config: MaxBlockSize: 2097152 MaxBlockSystemFee: 150000000000 MaxTransactionsPerBlock: 5000 + - enabled: "{{ neogo__network_type == 'morph-testnet' }}" path: ProtocolConfiguration options: @@ -138,21 +130,6 @@ neogo__default_network_config: - 'morph5.t5.fs.neo.org:50333' - 'morph6.t5.fs.neo.org:50333' - 'morph7.t5.fs.neo.org:50333' - - enabled: "{{ neogo__network_type == 'neo-testnet' and neogo__oracle_enabled }}" - path: ApplicationConfiguration - options: - Oracle: - Nodes: - - 'http://oracle1.ngd.network:30332' - - 'http://oracle2.ngd.network:30332' - - 'http://oracle3.ngd.network:30332' - - 'http://oracle.t5.n3.nspcc.ru:30332' - NeoFS: - Nodes: - - 'st1.t5.fs.neo.org:8080' - - 'st2.t5.fs.neo.org:8080' - - 'st3.t5.fs.neo.org:8080' - - 'st4.t5.fs.neo.org:8080' - enabled: "{{ neogo__network_type == 'privnet' }}" options: diff --git a/tasks/main.yml b/tasks/main.yml index 65c79a9..ac7bef4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,14 +43,14 @@ - name: Copy regular systemd unit ansible.builtin.template: - src: 'neogo-n3.service.j2' + src: 'neogo.service.j2' dest: '/etc/systemd/system/neogo{{ neogo__instance }}.service' notify: [ 'Restart NeoGo{{ neogo__instance }}' ] when: not (neogo__use_compose | bool) - name: Copy dockerized systemd unit ansible.builtin.template: - src: 'neogo-n3_compose.service.j2' + src: 'neogo_compose.service.j2' dest: '/etc/systemd/system/neogo{{ neogo__instance }}.service' notify: [ 'Restart NeoGo{{ neogo__instance }}' ] when: neogo__use_compose | bool diff --git a/templates/neogo-n3.service.j2 b/templates/neogo.service.j2 similarity index 100% rename from templates/neogo-n3.service.j2 rename to templates/neogo.service.j2 diff --git a/templates/neogo-n3_compose.service.j2 b/templates/neogo_compose.service.j2 similarity index 100% rename from templates/neogo-n3_compose.service.j2 rename to templates/neogo_compose.service.j2