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:32:33 +07:00
parent 5cc34713c3
commit fd96cedf8c
9 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json → backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685493.json
View File

0
hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json → backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685493.json
View File

10
backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685493.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:U1RSTQEeotmMe5/SBVYgXsFyNxPNbrMNIvnYGmwKeh4zx3SjzhOYGCp+lvA="
},
"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_1786685493.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"
}

17
hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD Normal file
View File

@@ -0,0 +1,17 @@
{
"id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
"name": "Docker Password Host",
"hostname": "127.0.0.1",
"port": 2222,
"username": "testuser",
"identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
"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:29:30.180223+00:00",
"updated_at": "2026-08-14T05:29:30.180223+00:00"
}

17
hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD Normal file
View File

@@ -0,0 +1,17 @@
{
"id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
"name": "Docker Password Host",
"hostname": "127.0.0.1",
"port": 2222,
"username": "testuser",
"identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
"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:29:30.180223+00:00",
"updated_at": "2026-08-14T05:29:30.180223+00:00"
}

14
identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD Normal file
View File

@@ -0,0 +1,14 @@
{
"id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
"password": "ENC:v1:U1RSTQEeotmMe5/SBVYgXsFyNxPNbrMNIvnYGmwKeh4zx3SjzhOYGCp+lvA="
=======
"password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
},
"created_at": "2026-08-14T05:29:30.176231+00:00",
"updated_at": "2026-08-14T05:29:30.176231+00:00"
}

14
identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD Normal file
View File

@@ -0,0 +1,14 @@
{
"id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
"name": "Docker Test Identity",
"auth_method": {
"type": "password",
<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
"password": "ENC:v1:U1RSTQEcyeKSsaxr0+1XqEGSRmnJ32HlR0U4xaMSotpS1fjCKAX0b/tEWHg="
=======
"password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
},
"created_at": "2026-08-14T05:29:30.176231+00:00",
"updated_at": "2026-08-14T05:29:30.176231+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:U1RSTQEeotmMe5/SBVYgXsFyNxPNbrMNIvnYGmwKeh4zx3SjzhOYGCp+lvA="
"password": "ENC:v1:U1RSTQFn/70uE5Tpy2Vd5C4sJE8UBSEqrCXKVWrb73w22OZRLtbNNnsJs/E="
},
"created_at": "2026-08-14T05:20:24.759864+00:00",
"updated_at": "2026-08-14T05:20:24.759864+00:00"