sonpx/sterm-profile2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-sync: update local configurations

Browse Source
This commit is contained in:
sTerm Sync
2026-08-14 12:28:29 +07:00
parent c5449dba99
commit b14e30f972
6 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json → backups/conflicts/91d024bd-bdf7-4f24-84dd-c9cd37475058_conflict_1786685249.json
View File

10
backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685249.json Normal file
View File

@@ -0,0 +1,10 @@
{
"id": "a7ca3944-af0e-498b-abd1-6af456468102",
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
"password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
},
"created_at": "2026-08-14T05:20:24.759864+00:00",
"updated_at": "2026-08-14T05:20:24.759864+00:00"
}

17
backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685249.json Normal file
View File

@@ -0,0 +1,17 @@
{
"id": "cfcc6e2e-666e-4928-9914-dea57e939bf0",
"name": "Docker Password Host",
"hostname": "127.0.0.1",
"port": 2222,
"username": "testuser",
"identity_id": "a7ca3944-af0e-498b-abd1-6af456468102",
"group_id": null,
"tags": [],
"jump_host_id": null,
"keepalive_interval": 1,
"legacy_algorithms": null,
"ssh_config_overrides": null,
"notes": null,
"created_at": "2026-08-14T05:20:24.764057+00:00",
"updated_at": "2026-08-14T05:20:24.764057+00:00"
}

14
identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~FETCH_HEAD Normal file
View File

@@ -0,0 +1,14 @@
{
"id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
"password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
=======
"password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
>>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
},
"created_at": "2026-08-14T05:25:31.913053+00:00",
"updated_at": "2026-08-14T05:25:31.913053+00:00"
}

14
identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~HEAD Normal file
View File

@@ -0,0 +1,14 @@
{
"id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
"password": "ENC:v1:U1RSTQEj1UPOaYdnAnsH5Gg7MHpiw0wUgzRDpcvXKLw46aH+GHf/Aqe9paU="
=======
"password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
>>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
},
"created_at": "2026-08-14T05:25:31.913053+00:00",
"updated_at": "2026-08-14T05:25:31.913053+00:00"
}

2
identities/a7ca3944-af0e-498b-abd1-6af456468102.json
View File

@@ -3,7 +3,7 @@
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
"password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
"password": "ENC:v1:U1RSTQEcyeKSsaxr0+1XqEGSRmnJ32HlR0U4xaMSotpS1fjCKAX0b/tEWHg="
},
"created_at": "2026-08-14T05:20:24.759864+00:00",
"updated_at": "2026-08-14T05:20:24.759864+00:00"