From e8e484204f467f5326a6ef372631d9600d2625d2 Mon Sep 17 00:00:00 2001 From: Marsway Date: Mon, 12 May 2025 09:38:24 +0800 Subject: [PATCH] backup: 2025-05-12 --- .config/htop/htoprc | 63 ++++++++++++++++++++++++++++++++ .config/rclone/rclone.conf | 2 +- linux/crontab/server.crb | 2 +- linux/scripts/backup_services.sh | 12 +++--- 4 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 .config/htop/htoprc diff --git a/.config/htop/htoprc b/.config/htop/htoprc new file mode 100644 index 0000000..c1bf180 --- /dev/null +++ b/.config/htop/htoprc @@ -0,0 +1,63 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +htop_version=3.3.0 +config_reader_min_version=3 +fields=0 48 17 18 38 39 40 2 46 47 49 1 +hide_kernel_threads=1 +hide_userland_threads=0 +hide_running_in_container=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=0 +highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +header_margin=1 +screen_tabs=1 +detailed_cpu_time=0 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=AllCPUs Memory Swap +column_meter_modes_0=1 1 1 +column_meters_1=Tasks LoadAverage Uptime +column_meter_modes_1=2 2 2 +tree_view=0 +sort_key=47 +tree_sort_key=0 +sort_direction=-1 +tree_sort_direction=1 +tree_view_always_by_pid=0 +all_branches_collapsed=0 +screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PERCENT_MEM +.tree_sort_key=PID +.tree_view_always_by_pid=0 +.tree_view=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 +screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view_always_by_pid=0 +.tree_view=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/.config/rclone/rclone.conf b/.config/rclone/rclone.conf index 0e07f5f..13e25dd 100644 --- a/.config/rclone/rclone.conf +++ b/.config/rclone/rclone.conf @@ -6,7 +6,7 @@ team_drive = [od] type = onedrive -token = {"access_token":"EwA4BMl6BAAUBKgm8k1UswUNwklmy2v7U/S+1fEAAUGXXEO+hkAP3d5f/bblI9hb3jG3aQrQiMvBx/Bpye+h3Bub/BcETOHLTqQvgbdINPK/qHnMXeNErnbjSTAjvfLpE0R59eq1/F6u6RKuS3h0PJgYfbDVu4yEUHEkXHd5ax9lQCYvpFdZAmzud6spt0KAr24+jatm2eE0GEN4NguiPXA0A8+xHFT/EfbBkEMEuuPg8Eu7GpHzESbXNEppZrjoFs75W3EztrxdShYhQJNR+O1iC+U8QwMEWPpva7uvM0yNqsFDZ2JSyLOEMonsRuHLTyaqjYi+uNSwszxvW/+t0UYOdcQKKsyzuAWN9KxOKKRwmLTuFiTCZuhB/kKud0UQZgAAENrOgFjF4CaN/jA8vCslx3IAA5COppiJPP/11vtrt18paDZnVSd6whcqo51C/i1iiqWtqkb3GJmYHmmH7o2EiPCfzg3xh1RD3MTgl9o8MVsf/Cl3n8ViphheCHo1n4q5jPezqv3YzjuYFWGi3BDJl373Rs9rDPTcpqS6IdJn7V63zPDPmDXcsoSPlSHljstck5ps38qw8LieWD7CDk9JbodxjgaXrAhLMrOQ+mwB8l8jc/d28fhBdISGDqQq0l+r734dsHUGRM0daOGtpZzPbhH6JpQJSmgPqBaC/kWLKBCHsxBGYsaEgmkrturDn7EnSDsZ7A6aehV86cm2dCFnhgsRszHLdZil4mmu1oLr2m/yH04axg9/T3FJjb8h4Z0Dq5PghryBM2Ni8i4Wyc0jdTK5gu/3ipDNEkMdLgHaaG4qZH2R3zT5ql0NqJy8pOKRQhZqIasWu1Idy6IMBht3p4ZtHiiDAzs1dHBCdoKwj4YV55fBGiNtjmn/8qGUTLY5FmN5gazwM4+k7ZN33NtIxrsao3rTKn5975JWmZbb7SIFim8gX8qsLvzI27DNgQsyea+YwCgS0X6a6nEVOOGoinquthBRYNfIKRuNg6bBAgQa7InNpBKnAIBHnURfW6iNa3oDdnnLV/SCboJaMTI6cICXHlGkSltyf1R8sv4ByEPErCBHUDtWXqNOZveBky5V8wFr1H1Xhe/A8yZJMvj8YfJWq9gvOJGaUaE9TP/+Nan3xJdFlmz3SsZ/wJj5GEKbeuSblVnrupgM7+pNh4717x1oAGC+/eJ17ECDpyYiGGIMBfM+k0HOlb/79B7N/5SBLf8nHoRYzPKK8uw7tgQxH5Db5CN/g41P05nxZjsjmAiFAvaSoPe3TDVRITsOpt2H/7w3MnlKzyMCf8+x6AGUALxsO0YPigWvi8DGD06kPc/i2JQZSN5xdP5mfmFWIgkso3Sq3ZW/kaQXikPvMG3j3A+B7dKWy8JnorBzjSaDJa1pJy3J2f5UXX6s4x6wFqCbJRT/8kmmrINR1LUumdmQxKW6vzkD","token_type":"Bearer","refresh_token":"M.C534_BAY.0.U.-CkcHzUuD5IHufnrdhI46563AMOOfBLWNnyVT7PPkxqh0FVCgFT36E!OxNLwLphDhkSaRjnxfwzOfSdEuh5tkaW1qBN26uXlZU8xNa4zvb0TYn5yCgkZ9rCCKcnPKM0ZZm!MB!PE51oPD7f!jtuuMA9zaxCYlWIWwBGHolqZfmtobc7BQeSYm619n86BmvcGqSSz10wh7qUZ2UBVdrw1qz71DVFdkxuu*BhWbVUsHjLWEYu0wftnjCI1KMe4Ai*ie8KYGcq*UCHVrzfiKILiQ8g04cFWN8DADzLc4sBPhOg1ledITKBhB2EC3DjhvxQ1qkYXhGPSy4WVIBJBK89wnfdlP0eAdGFBFSUt7zNwVcCLk","expiry":"2025-04-21T20:53:50.176143+08:00"} +token = {"access_token":"EwA4BMl6BAAUBKgm8k1UswUNwklmy2v7U/S+1fEAAZZ0PYIXlfgLSKs7rJjREEMzA/rYLkdjQvqU1yv9O2mN3vcvVE46WjO+3bIPqkH/uJwu8uB2f7ga9rj4OxJComucKid3g1n4bX6Pi4mpCpiW9zsLCxITfjU86c8hCqMXkCQKzemNnwgM27RvgngrH7QMpk2LGswAPbYVNJ5r3eYsEPk9CeHxHqQFqrhOkzE3pbNklytKPI3Kv3k9uPu4LXsVq3jrWLCZWkyXsaJi2pxwtBKxyHD3hQttHkzy4FEkRXPKarfok6bB0q4w9YJmmCk58RqLrXrLPy7X0+Vtv9CpaTz0uvmXXKSDEzkMKn5MnrH/2SyZ31jZ1Uu5YklpkmwQZgAAEFZUbqokNY61TKKECX9mt/UAA7Hl4zZQwBEqWE7VhTyzEPcU8jBv6X9XcFqU6JyEFiRc5TKcPg0Y1PHtMED+iL0RekDLy0Wth6gci1vgmEvE/EdNRbrHersucs4bpzlOasnCW3gJEOFFrnZC2DdVGpLjr40pnJJ0Pm0ohLprxE4uJh1crM6LbzhvslbAabr+i8nMU2yQ19SM2Yy8zQZSGEoXYYA9KM3i6gWF5qBsvFQ7RYQZUCtyMvpfBgKeTuVqSBsHO/gdi2boPvmNc5ZdfGOPjnU8AgtUhgGDDHKTE+iM/r51OCL8nXPMR5jmrdOF3yCGR+8VHm1KuZ1si4Gm3IXyZzEQLZL5zqZIa6OueJZVI4L1QiaVsirIsmN/hm0qHsG1yx+W6prKFQWXihYz0Y4pxdKrD+DUa3/ZI7S/84rsRmbz2z2AfR2ciLRaWdsIRXxiggPEwz6AllsQ2x3nbTTJDNDXq2ytYxh3Jrlp101bnMEI7DLF8vpaY0cBVacMOqFLscibvaERhwiT/yGScmiVS0tykYSCuLvJMlTVqVgJW7pFh5MezUnQ8fEHRjxuqGEXLwp/CYrVFO0oqTFoB6a/h31MKR8eYA3zRnlO61tCkfVfpbbfrmUkQWWeh5aC2exopTazzW67qjX4g7s+hW8Lap9YhiVbsY4M9fWWSXzmrnuc9BIzCdGsedoM2eEbLzEirRNrxElV2dULN6AACuW5+bDKIgJQ1xuW4P2kB09lPpBc/6jz4UDHgeiro5VXWEYdeqXJ409ES/VC286gmvl9JCyJdiCb+LREUBM4LH3VGRrT45c6UEyorW8/7jq7S3mcH2KG+yBuAjmIbnUSygeMpb1Ti27lR6MZeJ/Crj6Tw9WfaNOXUu2w5eYmw9kgrX/59IWhi0TW1Mfz5dHp9fAv/8UncorkZDtfoNsOQZsI2VsmLalGzvyaVZVu2Y7b/cRh7Jd/D5+ukO6y1bqH06LVZue5Wx54S5AZxHqpyCu1lYaz0PKd9lplcqXLeFkcTxDlegLdghnKQ2Qct7v9ZLb+2TkD","token_type":"Bearer","refresh_token":"M.C534_SN1.0.U.-CsNFZmVINToEW8*HVLD7xHaaV6GHyk0wnL!ETnyhqUMAFP!IvjPAV*eFuj45ftz7nGQuLR6EB2urd5JK*ln!9Rw9cK!1ezDZw8zWIQm3l4zGdCes!cPGpqlZvB4WDfNi69K1nlNS!uA!qn91PtmdDhPmKwFwvbgz9HDub!BoKdeK83pcAYqLTv!odEI*UzDgAjZv37Ki2YIbhH38xRmIaqmq8dZ3dISZSHCgZHmEGluaU2IPtYVKLp9rCu77fb7LVZu!PGG5lvu4J!pVlAL0d1RDdwh672WIFX*6sePFRdOWm4IR9tI8YbAl2Z7IproxDBA*3dI!JG0A*9QAWdCCE!YYZnWMjPGaZ!ASavda9ycF","expiry":"2025-05-12T03:28:14.136561914+08:00"} drive_id = DA445CD50DBE653E drive_type = personal diff --git a/linux/crontab/server.crb b/linux/crontab/server.crb index e14cf34..821fdd8 100644 --- a/linux/crontab/server.crb +++ b/linux/crontab/server.crb @@ -1,3 +1,3 @@ */5 * * * * flock -xn /tmp/stargate.lock -c '/usr/local/qcloud/stargate/admin/start.sh > /dev/null 2>&1 &' -0 0 * * * ~/.vvconfig/linux/scripts/backup_services.sh +47 0 * * * bash -x ~/.vvconfig/linux/scripts/backup_services.sh 0 */12 * * * certbot renew --pre-hook "systemctl stop nginx" --post-hook "systemctl start nginx" diff --git a/linux/scripts/backup_services.sh b/linux/scripts/backup_services.sh index 6784788..07e71b7 100644 --- a/linux/scripts/backup_services.sh +++ b/linux/scripts/backup_services.sh @@ -3,16 +3,16 @@ today=$(date +%Y%m%d) basedir=/root/backup/ log=/root/backup/$today.log -echo "Starting backup..." | tee $log -echo "Zip $basedir/forgejo/$today.zip..." | tee $log +echo "Starting backup..." | tee -a $log +echo "Zip $basedir/forgejo/$today.zip..." | tee -a $log zip -r $basedir/forgejo/$today.zip /opt/forgejo/ > /dev/null zip -r $basedir/linkding/$today.zip /opt/linkding/ > /dev/null rm -rf $basedir/nginx/*.conf && cp -r /etc/nginx/conf.d/* $basedir/nginx > /dev/null -echo "Deleting old backups..." | tee $log -find /root/backup -name "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].zip" -mtime +6 -ls | tee $log +echo "Deleting old backups..." | tee -a $log +find /root/backup -name "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].zip" -mtime +6 -ls | tee -a $log find /root/backup -name "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].zip" -mtime +6 -delete -echo "Syncing to google drive..." | tee $log -rclone sync /root/backup gd:Backups/server +echo "Syncing to google drive..." | tee -a $log +#rclone sync /root/backup gd:Backups/server rclone sync /root/backup od:Backups/server