SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-09 09:31:13 +00:00
Code Issues Projects Releases Wiki Activity

fix: Properly convert Digital Ocean droplets to ServerBasicInfo

Browse source
This commit is contained in:
NaiJi 2023-06-14 14:56:07 -03:00
parent 2b1f6a12ea
commit 69707f543f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart
View file

@ -326,7 +326,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi {
'image': 'ubuntu-20-04-x64', 'image': 'ubuntu-20-04-x64',
'user_data': '#cloud-config\n' 'user_data': '#cloud-config\n'
'runcmd:\n' 'runcmd:\n'
'- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/testing/final-digital-ocean/nixos-infect | ' '- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/providers/digital-ocean/nixos-infect | '
"PROVIDER=$infectProviderName DNS_PROVIDER_TYPE=$dnsProviderType STAGING_ACME='$stagingAcme' DOMAIN='$domainName' " "PROVIDER=$infectProviderName DNS_PROVIDER_TYPE=$dnsProviderType STAGING_ACME='$stagingAcme' DOMAIN='$domainName' "
"LUSER='${rootUser.login}' ENCODED_PASSWORD='$base64Password' CF_TOKEN=$dnsApiToken DB_PASSWORD=$databasePassword " "LUSER='${rootUser.login}' ENCODED_PASSWORD='$base64Password' CF_TOKEN=$dnsApiToken DB_PASSWORD=$databasePassword "
'API_TOKEN=$serverApiToken HOSTNAME=$hostName bash 2>&1 | tee /tmp/infect.log', 'API_TOKEN=$serverApiToken HOSTNAME=$hostName bash 2>&1 | tee /tmp/infect.log',

2
lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart
View file

@ -372,7 +372,7 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi {
'networks': [], 'networks': [],
'user_data': '#cloud-config\n' 'user_data': '#cloud-config\n'
'runcmd:\n' 'runcmd:\n'
'- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/testing/final-hetzner/nixos-infect | ' '- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/providers/hetzner/nixos-infect | '
"STAGING_ACME='$stagingAcme' PROVIDER=$infectProviderName DNS_PROVIDER_TYPE=$dnsProviderType " "STAGING_ACME='$stagingAcme' PROVIDER=$infectProviderName DNS_PROVIDER_TYPE=$dnsProviderType "
"NIX_CHANNEL=nixos-21.05 DOMAIN='$domainName' LUSER='${rootUser.login}' ENCODED_PASSWORD='$base64Password' " "NIX_CHANNEL=nixos-21.05 DOMAIN='$domainName' LUSER='${rootUser.login}' ENCODED_PASSWORD='$base64Password' "
'CF_TOKEN=$dnsApiToken DB_PASSWORD=$databasePassword API_TOKEN=$serverApiToken HOSTNAME=$hostName bash 2>&1 | ' 'CF_TOKEN=$dnsApiToken DB_PASSWORD=$databasePassword API_TOKEN=$serverApiToken HOSTNAME=$hostName bash 2>&1 | '

4
lib/logic/providers/server_providers/digital_ocean.dart
View file

@ -318,7 +318,7 @@ class DigitalOceanServerProvider extends ServerProvider {
@override @override
Future<GenericResult<List<ServerBasicInfo>>> getServers() async { Future<GenericResult<List<ServerBasicInfo>>> getServers() async {
final List<ServerBasicInfo> servers = []; List<ServerBasicInfo> servers = [];
final result = await _adapter.api().getServers(); final result = await _adapter.api().getServers();
if (result.data.isEmpty || !result.success) { if (result.data.isEmpty || !result.success) {
return GenericResult( return GenericResult(
@ -330,7 +330,7 @@ class DigitalOceanServerProvider extends ServerProvider {
} }
final List rawServers = result.data; final List rawServers = result.data;
rawServers.map<ServerBasicInfo>( servers = rawServers.map<ServerBasicInfo>(
(final server) { (final server) {
String ipv4 = '0.0.0.0'; String ipv4 = '0.0.0.0';
if (server['networks']['v4'].isNotEmpty) { if (server['networks']['v4'].isNotEmpty) {