ddd

diff --git a/.bash_history b/.bash_history
index 20225272e05fe20264ca43eada45d92bba976a34..335e5a8bef09b6b955ff6d48b5f5642e6c0fff4d 100644 (file)
--- a/.bash_history
+++ b/.bash_history
@@ -590,3 +590,79 @@ git push
 cd ~
 cd .bin/
 ./ros-diff.sh 
+cd ~
+gpg -k
+gpg --import gpg_vados-dev.pub 
+gpg --import gpg_vados-dev.asc 
+ls -la
+gpg --import ~/gpg_vados-dev.asc
+mc
+gpg -k
+gpg --list-secret-keys --keyid-format LONG
+gpg --import gpg_vados-dev.asc 
+gpg --edit-key 0x1FD2694762FCE438
+git config --global user.signingkey 0x1FD2694762FCE438
+git config --global commit.gpgsign true
+mc
+./ros-diff.sh
+git init
+git add .
+git commit -m 'Mikro_bak Initial Commit'
+git log --show-signature -1
+git init
+git add .
+git commit -m 'mikro_bak Initial Commit'
+git push /.data/nfs/repos/Mikrotiks/backups.git main
+git remote add origin /.data/nfs/repos/Mikrotiks/backups.git
+git remote -v
+git remote show origin
+./ros-diff.sh
+git push /.data/nfs/repos/Mikrotiks/ros.vados.ru.git main
+git remote add origin /.data/nfs/repos/Mikrotiks/ros.vados.ru.git
+git push /.data/nfs/repos/Mikrotiks/ros.vados.ru.git main
+git remote show origin
+git init
+git add .
+git init
+git add .
+git commit -m 'mikro_bak initial Commit'
+git push /.data/nfs/repos/Mikrotiks/ros.vados.ru.git main
+git remote add origin /.data/nfs/repos/Mikrotiks/ros.vados.ru.git
+git remote show origin
+git push
+git push --set-upstream origin main
+git push origin main
+git push --set-upstream origin main
+git push origin main
+git push
+git config --global --add safe.directory /.data/nfs/repos/Mikrotiks/ros.vados.ru.git
+git add .gitignore
+git commit -m 'Add Mikrotiks to ignore folders.'
+git push
+git init --bare
+git init
+git config --global init.defaultBranch main
+git config --global user.name "vados-dev"
+git config --global user.email "vados@vados.ru"
+git add .
+git commit -m 'mikro_bak Initial Commit'
+git push /.data/nfs/repos/Mikrotiks/Mikrotiks.git main
+git remote add origin /.data/nfs/repos/Mikrotiks/Mikrotiks.git
+git remote -v
+git push origin main
+git remote -v
+git push /.data/nfs/repos/Mikrotiks/Mikrotiks.git main
+git push origin main
+git remote add origin /.data/nfs/repos/Mikrotiks/Mikrotiks.git
+git fetch origin
+gpg -k
+git config --list
+source ~/.bashrc
+git fetch origin
+git push origin main
+git push
+git push --set-upstream origin main
+git push
+git add .
+git commit -m 'nna'
+git push

diff --git a/.gitconfig b/.gitconfig
index 7950bf87488a57426bc6a17db67f400df016c034..1d9bed2394017ae99a1718e0077bc81c306396f3 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,8 +17,6 @@
        defaultBranch = main
 [core]
        autocrlf = false
-[http]
-       cookiefile = %USERPROFILE%\\.gitcookies
 [protocol]
        version = 2
 [commit]

diff --git a/.local/share/mc/filepos b/.local/share/mc/filepos
index 938f07839e95868c82709ebb558e6a5cf3aebe33..cd0f5dd28186536c94081d52c359cd5ca8a9e13f 100644 (file)
--- a/.local/share/mc/filepos
+++ b/.local/share/mc/filepos
@@ -1,15 +1,17 @@
-/var/www/ros.vados.ru/Mikrotiks/.git/config 2;35;35
+/var/www/ros.vados.ru/.git/config 2;35;35
+/var/www/ros.vados.ru/ros.code-workspace 1;0;0
+/var/www/ros.vados.ru/Mikrotiks/.gitconfig 20;0;524
+/var/www/ros.vados.ru/Mikrotiks/backups/.git/config 2;35;35
+/var/www/ros.vados.ru/Mikrotiks/backups/.ssh/id_rsa.pub 2;402;805
 /var/www/ros.vados.ru/Mikrotiks/.repo_.gitconfig.json 15;9;216
-/var/www/ros.vados.ru/Mikrotiks/.gitconfig 9;0;146
+/var/www/ros.vados.ru/Mikrotiks/.ssh/authorized_keys 1;745;745
+/var/www/ros.vados.ru/Mikrotiks/.git/config 2;35;35
 /var/www/ros.vados.ru/Mikrotiks/.bashrc 122;0;3856
 /.data/nfs/repos/Mikrotiks/ros.vados.ru.git/config 3;23;52
-/var/www/ros.vados.ru/Mikrotiks/backups/.git/config 2;35;35
 /.data/nfs/repos/Mikrotiks/backups.git/config 1;0;0
-/var/www/ros.vados.ru/.git/config 6;0;92
 /www/ros.vados.ru/Mikrotiks/.gnupg/gpg-agent.conf 3;0;50
 /www/ros.vados.ru/.git/config 2;35;35
 /var/www/ros.vados.ru/Mikrotiks/gpg_vados-dev.asc 107;0;6687
-/var/www/ros.vados.ru/Mikrotiks/.ssh/authorized_keys 6;0;2699
 /var/www/ros.vados.ru/Mikrotiks/.gnupg/gpg-agent.conf 2;22;40
 /var/www/ros.vados.ru/Mikrotiks/.bin/ros-diff.sh 407;1;10786
 /var/www/ros.vados.ru/Mikrotiks/.bin/test.sh 13;22;257

diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys
index c5dddec0a0067b6058ca599f36490cb653c6f6ed..aa0468a3c535ba538e311c360376ef1b8129229c 100644 (file)
--- a/.ssh/authorized_keys
+++ b/.ssh/authorized_keys
@@ -1,4 +1,4 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtYPqhMLWEhFjiZKUCWBVxoEtNRkZvCMjfJ+F2jqJl2SVVCay92wuItwjibkmVVlXMdokemr8oBTqvlL+tXghJbOselR00HPyvwdeMVE+EGxtOXGwSHDTYSaYDl7OkKhURnJ4N+cLrxuuljXT26L9btpayJzsyqy8i6hNbcgg0rLAcgFwrDW05cUgWOTtSD8OIzE0BRGCFNTYuEz6cI6e+XeqZa0RILhbEYjznRo5OYx7xyCYI2cYJm8PKpLSXWjZGHsej1e1wqBaxSoAUO4ja7AE1Dg3oIZ8ac9NeNk0Zgn9CLPZNb9qRYBgf1eTkpg+ll0IDUkzFY6LA7vA2WfiGPZkguurFczr1K9f1RtfWc2QDVvyXytnMzAHaGBC/zUpxvJBcL1vHzRwBREWUfcBNSP44QMkJ10adPupDmATZAVkaoqKEyIi2opN+obBUL1tRd8PlKV1B2mw5brqpZQuxAhbSTRVAnc5fOQjs6r/8q4pXRN7JRSgjwk/+7gLmQE0S7hJ82PkW1mLzdMxHbNqFouvFh6vTIGC0szuP8p3F6IChDPEy9p3FfffF6B4jqLHJXiANzszwG2aReLl6mivRmO6ZcyuahmekdqytzjihgtmYBO8wqU/kGvU38xtbI6OTKBXom2kGnEoNd4PlBNVXlsn1al2jyKzPKGI3xlA9FQ== git@amster-nuc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtYPqhMLWEhFjiZKUCWBVxoEtNRkZvCMjfJ+F2jqJl2SVVCay92wuItwjibkmVVlXMdokemr8oBTqvlL+tXghJbOselR00HPyvwdeMVE+EGxtOXGwSHDTYSaYDl7OkKhURnJ4N+cLrxuuljXT26L9btpayJzsyqy8i6hNbcgg0rLAcgFwrDW05cUgWOTtSD8OIzE0BRGCFNTYuEz6cI6e+XeqZa0RILhbEYjznRo5OYx7xyCYI2cYJm8PKpLSXWjZGHsej1e1wqBaxSoAUO4ja7AE1Dg3oIZ8ac9NeNk0Zgn9CLPZNb9qRYBgf1eTkpg+ll0IDUkzFY6LA7vA2WfiGPZkguurFczr1K9f1RtfWc2QDVvyXytnMzAHaGBC/zUpxvJBcL1vHzRwBREWUfcBNSP44QMkJ10adPupDmATZAVkaoqKEyIi2opN+obBUL1tRd8PlKV1B2mw5brqpZQuxAhbSTRVAnc5fOQjs6r/8q4pXRN7JRSgjwk/+7gLmQE0S7hJ82PkW1mLzdMxHbNqFouvFh6vTIGC0szuP8p3F6IChDPEy9p3FfffF6B4jqLHJXiANzszwG2aReLl6mivRmO6ZcyuahmekdqytzjihgtmYBO8wqU/kGvU38xtbI6OTKBXom2kGnEoNd4PlBNVXlsn1al2jyKzPKGI3xlA9FQ== mikro_bak@amster-nuc
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7lpAKxEKB3RexZlN1TNRnGOVmZi0fhM8DUiW+mKdcDtGBmAOHTHOuhFCofpDXyGLbeOT3FOTumPNbM3RLssY3t/GDxxaJUfQhbUbQJgEwHmlP2ianJ4hSqtoJhnu3jCn7y8LnEhd0I1nCYF4D/XUTodmglKR/FJujCRoqbYLuqNPozwUxMgCTb+OYpmaEhILE9hXD6qM06CMnOFtE2Xg+CaRRmsv7nuu8Z8kMp/239lUj9AnTgNMoI73wxL2HR4M+WzrCiiTRWExJWyIH+WTjrY40iQY6vYD+BKXN6B9bl03MxwdhlYYspItX/u2b80/V7oy0lpe4uC/ZdkWrpXdPaGFCdOehfn//jnPryguSF8aXBRsHVCOl0QB/yb84+JbS494Kkkr7g4S16qtxQ6JP52tMc+7SLEufZ67pdKyz9JpQLJyMpKTJtK0y9wMaqQoIn0/9Yb+W3XnAepr5zhxercdEw6dpFgJdKlnsqINDlJ3VU+b07uk1nt/fuIksS3v8gZkFvE8OV5lgTD6/gOPGGwBD73SyY/sVVwHEoMr3B+647nilfiiC/VOTfzk5VOv6R2apbYZCN2phI6YQvk6bhQGDrl61Lne2mXioCLbDW0rTRabdQrPOQTml+hM3WIudyvt7nKajQcaUnwIw3yBFNc77cGuHLrxjiaaZARntlw== git@github.com:vados-dev
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcieLidti9XSkOD3EkZyigI+GGLBhe8bBhPuXI0afyxnuagbMz3vY3tzyMaQ7iEi9NGgUE2BnPaxp/04DQ9/fcjwlCeuYUq0Kk7ZP4XtVSsYuDPDcx/pcLaIUum/G6bZpDA9Hmq5B3zPDbbgq0ujCIAAusV8jAqgVw7LZJM9NejpvMLd3VAw6HrwQIptIyp+5w+6hQd2VcOVjcdprFQnZeLS0DzfY7557bKLomxXncbyNVd8NqB3YT1+m+P5+3SyQe0K8FKnwiIWvh6L8CpL1f40Dke/BOoKg5N/1LO7kpZP27yVG7gqKW+d9/aE0xGa+uLUKcSHyEqtIJ+D/oAg8f mikro_bak@10.30.30.81
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcieLidti9XSkOD3EkZyigI+GGLBhe8bBhPuXI0afyxnuagbMz3vY3tzyMaQ7iEi9NGgUE2BnPaxp/04DQ9/fcjwlCeuYUq0Kk7ZP4XtVSsYuDPDcx/pcLaIUum/G6bZpDA9Hmq5B3zPDbbgq0ujCIAAusV8jAqgVw7LZJM9NejpvMLd3VAw6HrwQIptIyp+5w+6hQd2VcOVjcdprFQnZeLS0DzfY7557bKLomxXncbyNVd8NqB3YT1+m+P5+3SyQe0K8FKnwiIWvh6L8CpL1f40Dke/BOoKg5N/1LO7kpZP27yVG7gqKW+d9/aE0xGa+uLUKcSHyEqtIJ+D/oAg8f mikro_bak@10.30.30.10