mod: wsl-prep,common,registry> cleaning code

Author: cybermerlin

common/handler.sh

@@ -20,7 +20,7 @@ handler() {
   if _out=$(eval "$_cmd 2>&1"); then
     success "[ finished ]: $_description... [${_cmd}]" "${_lvl}"
   else
-    error "[ failed ]: $_description... [${_cmd}] :-{\n\t'${_out}'" "${_lvl}"
+    error "[ failed ]: $_description... [${_cmd}] :-{\n\t${_out}" "${_lvl}"
     return 1
   fi
 }

dev-prep/git/README.md

@@ -0,0 +1 @@
+Tools for working with git or for git

dev-prep/git/tools.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+set -eu
+set +u; [ -n "$ROOT" ] || export ROOT="$(cd -- "$(dirname -- "$0")/.." && pwd)"; set -u;
+. "${ROOT}/common/colors.sh"
+
+
+# rewrite all E-mail of author whole git history (for all commits)
+# rewriteAuthorEmail 'old@email' 'new_username' 'new_email'
+rewriteAuthorEmail() {
+  # Validate exactly 3 arguments
+  case $# in
+    3) ;;
+    *) error "Usage: $0 old@email newname new@email" >&2; exit 1 ;;
+  esac
+
+  _OLD_EMAIL="${1}"
+  _CORRECT_NAME="${2}"
+  _CORRECT_EMAIL="${3}"
+
+  info "Rewriting: ${_OLD_EMAIL} → ${_CORRECT_NAME} <${_CORRECT_EMAIL}>"
+
+  # git filter-branch env-filter (POSIX sh inside)
+  git filter-branch -f --env-filter "
+    if [ \"\$GIT_COMMITTER_EMAIL\" = '${_OLD_EMAIL}' ]; then
+        GIT_COMMITTER_NAME='${_CORRECT_NAME}'
+        GIT_COMMITTER_EMAIL='${_CORRECT_EMAIL}'
+        export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
+    fi
+    if [ \"\$GIT_AUTHOR_EMAIL\" = '${_OLD_EMAIL}' ]; then
+        GIT_AUTHOR_NAME='${_CORRECT_NAME}'
+        GIT_AUTHOR_EMAIL='${_CORRECT_EMAIL}'
+        export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
+    fi
+  " --tag-name-filter cat -- --branches --tags
+
+  rm -rf .git/refs/original/
+  git reflog expire --expire=now --all
+  git gc --prune=now --aggressive
+
+  ask 'Local rewrite complete.\nForce push? [y/N]: '
+  read -r response
+  case "${response}" in
+    [yY]|[yY][eE][sS]) 
+      git push origin --force --all
+      git push origin --force --tags
+      success 'Force pushed'
+      ;;
+    *) error 'Run: git push origin --force --all --tags' ;;
+  esac
+}

registry/docker-compose.yml

@@ -2,14 +2,14 @@ services:
   # APT Cache (Debian/Ubuntu/Alpine/etc)
   # https://qmacro.org/blog/posts/2024/09/03/setting-up-a-cache-server-for-apt-packages/
   registry_apt:
-    # image: sameersbn/apt-cacher-ng
     build:
       context: ./acng
       dockerfile: Dockerfile
       args:
         - PUID=${PUID:-1000}
         - PGID=${PGID:-1000}
         - TZ=Europe/Moscow
+        - APT_PROXY_URL=${APT_PROXY_URL}
     container_name: registry_apt
     restart: unless-stopped
     ports:
@@ -116,7 +116,7 @@ volumes:
     driver: local
     driver_opts:
       type: none
-      device: ${WSL_VLM}/apt_cache
+      device: ${HST_VLM}/apt_cache
       o: bind
   verdaccio_storage:
     # external: true

wsl-prep/README.md

@@ -19,3 +19,19 @@ and then:
 ```
 
 Each time in the console you can see some warnings for you to do smth... some manual actions (restart WSL or smth else) - pls, do it and go ahead.
+
+## Read it to advance
+
+- https://learn.microsoft.com/ru-ru/windows/wsl/use-custom-distro?source=recommendations
+
+## Hyper-V + WSL Network
+
+- **hyperv-wsl-network.ps1** script to get all current network configuration to reproduce it in another Win-host.
+
+## Structure
+
+- [win](./win/README.md) to works with WSL (add a new WSL machine, clone or del)
+- [wsl-files](wsl-files/) configs and some scripts from /etc, /usr, ... to copy-paste into a new system
+- [wsl-nat](wsl-nat/) scripts to configure as a NAT your WSL-Ubuntu system
+- [getter cur network conf](get-hyperv-wsl-network.ps1) to backup it
+- [setter network conf](set-hyperv-wsl-network.ps1)  for your win-host to preset an Internet saccess for Hyper-V and WSL

wsl-prep/del/sources.list

@@ -13,7 +13,8 @@ set +u; [ -n "$ROOT" ] || export ROOT="$(cd -- "$(dirname -- "$0")/.." && pwd)";
 . "${ROOT}/common/handler.sh"
 
 _USERPROFILE=$(wslpath "$(cmd.exe /c "echo %USERPROFILE%" 2>/dev/null)" | tr -d '\r')
-
+_lvl=5
+_UID=$(id -u)
 
 fixnetwork() {
   ping ya.ru -A -c 3 >/dev/null || { echo 'fixing...'; echo "nameserver 9.9.9.9" | sudo tee /etc/resolv.conf; }
@@ -151,17 +152,24 @@ upgrade() {
     reset_wo_reboot
     progress_bar 80 "Обновление завершено"
 
-    warning "Please reboot this system ('wsl --shutdown' in powershell) \n AND restart this _cmd: `./ubuntu_upgrade.sh upgrade`"
+    warning "Please reboot this system ('wsl --shutdown' in powershell) \n AND restart this _cmd: './ubuntu_upgrade.sh upgrade'"
   fi
 }
 
 git_prep() {
-  info "Check and generate ssh keys for git" 20
+  # region git_prep() {
+  info "Check and generate ssh keys for git"
   mkdir -p ~/.ssh
   . "${ROOT}/secrets/secrets.sh"
-  ([ -d "${ROOT}/secrets" ] && cp -r "${ROOT}/secrets/.ssh/*" ~/.ssh/) || ssh-keygen -t rsa -b 4096 -C "${useremail}" -N "" -f ~/.ssh/github;
+  ([ -d "${ROOT}/secrets" ] && cp -rf "${ROOT}/secrets/.ssh/"* ~/.ssh/) \
+    || ( echo 'n' | ssh-keygen -t rsa -b 4096 -C "${useremail}" -N "" -f ~/.ssh/github)
+  sudo chown -R ${_UID}:${_UID} ~/.ssh
+  chmod 600 ~/.ssh/github
+  chmod 644 ~/.ssh/github.pub
+  chmod 700 ~/.ssh
+
 
-  info "Configuring git Credential Manager" 20
+  info "Configuring git Credential Manager"
   git config --global user.email "${useremail}"
   git config --global user.name "${username}"
   git config --global credential.credentialStore cache
@@ -170,18 +178,16 @@ git_prep() {
   git config --global credential.gitHubAccountFiltering "false"
   git config --global credential.gitLabAuthModes "browser"
   git config --global init.defaultBranch master
+  git config --global push.autoSetupRemote true
 
-  if [ -z "$(pgrep -a ssh-agent)" ]; then
-    info "running ssh-agent service..." 20
+  if ! pgrep -a ssh-agent; then
+    info "running ssh-agent service..."
 
-    if [ -z "$(systemctl --user list-unit-files | grep ssh)" ]; then
-      info "making ssh-agen.service..." 20;
+    if ! systemctl --user list-unit-files | grep ssh; then
+      info "Creating systemd user ssh-agen.service..." 5
 
       mkdir -p ~/.config/systemd/user/
-      _TMPDIR=$(mktemp -d)
-      touch "$_TMPDIR/sshass"
-      trap 'rm -rf "$_TMPDIR"' EXIT
-      tee "$_TMPDIR/sshass" <<EOF
+      cat > "${HOME}/.config/systemd/user/ssh-agent.service" <<'EOF'
 [Unit]
 Description=SSH key agent
 Wants=default.target
@@ -194,29 +200,33 @@ ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 [Install]
 WantedBy=default.target
 EOF
-      tee ~/.config/systemd/user/ssh-agent.service > /dev/null < "${_TMPDIR}/sshass"
-      systemctl --user enable ssh-agent
-      systemctl --user start ssh-agent
+      systemctl --user daemon-reload
+      systemctl --user enable --now ssh-agent
+      sleep 1
     fi
 
     # Auto SSH-AUTH_SOCK setup
-    if [ -z "$SSH_AUTH_SOCK" ]; then
-        info "have no SSH_AUTH_SOCK" 20
+    if [ -z "${SSH_AUTH_SOCK+isset}" ]; then
+        info "No SSH_AUTH_SOCK set, configuring..." 5
         # Try XDG_RUNTIME_DIR first (systemd user service)
-        if [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/ssh-agent.socket" ]; then
-            info 'have no $XDG_RUNTIME_DIR/ssh-agent.socket' 20
-            export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+        if [ -n "${XDG_RUNTIME_DIR}" ] && [ -S "${XDG_RUNTIME_DIR}/ssh-agent.socket" ] 2> /dev/null; then
+            export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
         # Try to find any existing ssh-agent socket
-        elif sockets=$(find /tmp/ssh-* -user "$USER" -name "agent.*" 2>/dev/null); then
-            export SSH_AUTH_SOCK="$(echo "$sockets" | head -n1)"
+        elif sockets=$(find /tmp/ssh-* -maxdepth 2 -user "${USER}" -name "agent.*" -type s 2>/dev/null | head -1); then
+            export SSH_AUTH_SOCK="$sockets"
+            info "Using existing socket: $SSH_AUTH_SOCK" 10
         # Fallback: start new agent if nothing found
-        # else
-        #     eval "$(ssh-agent -s)" > /dev/null
+        else
+            info "Starting fallback ssh-agent..." 10
+            eval "$(ssh-agent -s)" > /dev/null
         fi
     fi
-    # eval "$(ssh-agent -s)"
   fi
-  eval "$(ssh-agent -s)" && ssh-add ~/.ssh/github
+  ssh-add ~/.ssh/github 2> /dev/null || true
+  git fetch || eval "$(ssh-agent -s)"
+  git fetch
+  success "GIT configured and ready to use."
+  # endregion git_prep() {
 }
 
 inst_base() {
@@ -227,9 +237,17 @@ inst_base() {
   flatpak install flathub git mc screen plocate || { exit 1; }
   sudo updatedb&
   handler 'git_prep' "Prepare Git..." 10
+  handler 'inst_registry' 'Install local registry under proxy...' 10
   handler 'clean main' "Cleaning after installation" 10
 }
 
+inst_registry() {
+  "${ROOT}/registry/run.sh" conf apply
+  "${ROOT}/registry/run.sh" conf check || {
+    error "Need install the Registry: 'wsl -d Ubuntu2 -- /bin/bash -ls \"~/dev/admin/DevSecOps_tools/registry/run.sh install\"'"
+  }
+}
+
 # how to use more isolations for apps [too old?]
 tryFlatseal() {
   flatpak install flathub com.github.tchx84.Flatseal -y
@@ -393,8 +411,7 @@ case "${1:-}" in
       handler 'upgrade' "Upgrade"
       info "Next step ->upgrade() and then ->inst()"
       ;;
-  inst)
-      handler 'inst_base' "Install base packages" || { error "Try to use '-> fix()'"; exit 1; };;
+  inst) handler 'inst_base' "Install base packages" || { error "Try to use '-> fix()'"; exit 1; };;
 
   clean) handler 'clean' "Clean up" ;;
 
@@ -404,7 +421,27 @@ case "${1:-}" in
   nat) handler 'setAsNAT' 'Run [setAsNAT] to preset this system as NAT router' ;;
   wslconf) handler 'wslconfiguration' 'Run copying .wslconfig to win-host' ;;
   fixnetwork) handler 'fixnetwork' 'Run fix network';;
+  
   test) handler "test ${2}" "Run test";;
 
-  *) warning 'Undefined parameter';;
+  *)
+    error "Usage:";
+    justSay "  $0 full" $_lvl
+    justSay "  $0 prep" $_lvl
+    justSay "  $0 fix" $_lvl
+    justSay "  $0 upgrade" $_lvl
+    justSay "  $0 inst" $_lvl
+    echo ''
+    justSay "  $0 clean" $_lvl
+    echo ''
+    justSay "  $0 inst_registry" $_lvl
+    justSay "  $0 inst_code" $_lvl
+    justSay "  $0 gitprep" $_lvl
+    justSay "  $0 nat" $_lvl
+    justSay "  $0 wslconf" $_lvl
+    justSay "  $0 fixnetwork" $_lvl
+    echo ''
+    justSay "  $0 test [opt]" $_lvl
+    exit 2
+    ;;
 esac

wsl-prep/del/sources.list.distUpgrade

@@ -1,4 +1,4 @@
 # This file was automatically generated by WSL. To stop automatic generation of this file, add the following entry to /etc/wsl.conf:
 # [automount]
 # ldconfig = false
-/usr/lib/wsl/lib
+/usr/lib/wsl/lib

wsl-prep/run.sh

@@ -1,3 +1,4 @@
+nameserver 127.0.0.53
 nameserver 9.9.9.9
+options edns0 trust-ad
 search .
-