Compare commits
	
		
			4 Commits
		
	
	
		
			7b07df0ec0
			...
			c8be4e5d2c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c8be4e5d2c | |||
| 578e1ba496 | |||
| 2a78030816 | |||
| 459e3bc59b | 
@@ -5,7 +5,7 @@
 | 
				
			|||||||
set -e
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# bark key
 | 
					# bark key
 | 
				
			||||||
deviceKey='PFEMc4eVAQutUrcAbXrVCb'
 | 
					deviceKey='R5BU8VnMn3ufSFjMnwSmd6'
 | 
				
			||||||
# push payload
 | 
					# push payload
 | 
				
			||||||
# json='{"body": "test", "sound": "birdsong"}'
 | 
					# json='{"body": "test", "sound": "birdsong"}'
 | 
				
			||||||
json=`cat /opt/scripts/alert/bark/option.json`
 | 
					json=`cat /opt/scripts/alert/bark/option.json`
 | 
				
			||||||
@@ -25,4 +25,4 @@ ciphertext=$(echo -n $json | openssl enc -aes-256-cbc -K $key -iv $iv | base64)
 | 
				
			|||||||
ciphertext=`echo $ciphertext | tr -d ' '`
 | 
					ciphertext=`echo $ciphertext | tr -d ' '`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 密文可能有特殊字符,所以记得 URL 编码一下。
 | 
					# 密文可能有特殊字符,所以记得 URL 编码一下。
 | 
				
			||||||
curl --data-urlencode "ciphertext=$ciphertext" --data-urlencode "iv=QA475QXtg4YaGQzc" https://bark.erratic.eu.org/$deviceKey
 | 
					curl --data-urlencode "ciphertext=$ciphertext" --data-urlencode "iv=QA475QXtg4YaGQzc" https://bark.rustle.cc/$deviceKey
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 设置图片数量和输出文件名
 | 
					# 设置图片数量和输出文件名
 | 
				
			||||||
IMAGE_NUM_ALL=`ls /opt/apps/localcr/A_dashboard/local/icons | wc -l`
 | 
					IMAGE_NUM_ALL=`ls /opt/apps/localcr/A_dashboard/local/icons/*.jpg | wc -l`
 | 
				
			||||||
IMAGE_NUM_NEEDED=`cat /opt/apps/localcr/A_dashboard/local/config/services.yaml | grep -E '[0-9]{1,3}.jpg' | wc -l`
 | 
					IMAGE_NUM_NEEDED=`cat /opt/apps/localcr/A_dashboard/local/config/services.yaml | grep -E '[0-9]{1,3}.jpg' | wc -l`
 | 
				
			||||||
if [[ $IMAGE_NUM_NEEDED -gt $IMAGE_NUM_ALL ]]; then
 | 
					if [[ $IMAGE_NUM_NEEDED -gt $IMAGE_NUM_ALL ]]; then
 | 
				
			||||||
    alarm='Dashboard:\nThere is NOT enough logos to use, please check ASAP.'
 | 
					    alarm='Dashboard:\nThere is NOT enough logos to use, please check ASAP.'
 | 
				
			||||||
@@ -9,6 +9,7 @@ cp -rf /usr/local/nginx/conf/nginx.conf /opt/configs/nginx/nginx.conf
 | 
				
			|||||||
cp -rf /usr/local/nginx/conf/domain_confs/ /opt/configs/nginx/
 | 
					cp -rf /usr/local/nginx/conf/domain_confs/ /opt/configs/nginx/
 | 
				
			||||||
cp -rf /etc/docker/daemon.json /opt/configs/conf/
 | 
					cp -rf /etc/docker/daemon.json /opt/configs/conf/
 | 
				
			||||||
cp -rf /etc/sysctl.conf /opt/configs/conf/
 | 
					cp -rf /etc/sysctl.conf /opt/configs/conf/
 | 
				
			||||||
 | 
					cp -rf /etc/sysctl.d/99-tailscale.conf /opt/configs/conf/
 | 
				
			||||||
cp -rf /etc/pip.conf /opt/configs/conf/
 | 
					cp -rf /etc/pip.conf /opt/configs/conf/
 | 
				
			||||||
cp -rf /etc/apt/sources.list /opt/configs/conf/
 | 
					cp -rf /etc/apt/sources.list /opt/configs/conf/
 | 
				
			||||||
cp -rf /etc/ssh/sshd_config /opt/configs/conf/
 | 
					cp -rf /etc/ssh/sshd_config /opt/configs/conf/
 | 
				
			||||||
@@ -18,7 +19,6 @@ cp -rf /root/.ssh/config /opt/configs/conf/
 | 
				
			|||||||
cp -rf /etc/samba/smb.conf /opt/configs/conf/
 | 
					cp -rf /etc/samba/smb.conf /opt/configs/conf/
 | 
				
			||||||
cp -rf /etc/network/interfaces /opt/configs/conf/
 | 
					cp -rf /etc/network/interfaces /opt/configs/conf/
 | 
				
			||||||
cp -rf /root/.acme.sh/*ecc /opt/configs/acme/
 | 
					cp -rf /root/.acme.sh/*ecc /opt/configs/acme/
 | 
				
			||||||
cp -rf /opt/scripts/update/restore.sh /opt/apps/syncthing/data/common/F_Backup/Linux/
 | 
					 | 
				
			||||||
cp -rf /opt/wd/25-Syncthing/common/A_Program/FRP/* /opt/apps/frp/frpc-xtcp-visitor
 | 
					cp -rf /opt/wd/25-Syncthing/common/A_Program/FRP/* /opt/apps/frp/frpc-xtcp-visitor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd /opt && t=`date +%Y%m%dT%H%M%S`
 | 
					cd /opt && t=`date +%Y%m%dT%H%M%S`
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,13 +9,14 @@ node assets/js/bing.js > /dev/null 2>&1
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if [[ `date +%d` == '01' ]]; then
 | 
					if [[ `date +%d` == '01' ]]; then
 | 
				
			||||||
    # random logo for dash
 | 
					    # random logo for dash
 | 
				
			||||||
    bash /opt/scripts/update/dash_rand_logo.sh
 | 
					    # bash /opt/scripts/update/dash_rand_logo.sh
 | 
				
			||||||
 | 
					    cp /root/.acme/rustle.cc_ecc/fullchain.cer '/opt/wd/25-Syncthing/common/A_Program/nginx-1.24.0/certs/rustle.cc.cer'
 | 
				
			||||||
 | 
					    cp /root/.acme/rustle.cc_ecc/rustle.cc.key '/opt/wd/25-Syncthing/common/A_Program/nginx-1.24.0/certs/rustle.cc.key'
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# logo renew
 | 
					# logo renew
 | 
				
			||||||
let numOfAvatar=`ls /opt/apps/localcr/A_dashboard/local/icons/ | wc -l`
 | 
					let numOfAvatar=`ls /opt/websites/homepage/assets/img/logos | wc -l`
 | 
				
			||||||
let randNumber=$RANDOM%$numOfAvatar
 | 
					let randNumber=$RANDOM%$numOfAvatar
 | 
				
			||||||
cp /opt/apps/localcr/A_dashboard/local/icons/${randNumber}.jpg /opt/websites/homepage/assets/img/logo.jpg
 | 
					cp /opt/websites/homepage/assets/img/logos/${randNumber}.jpg /opt/websites/homepage/assets/img/logo.jpg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
docker exec -u www-data nextcloud php /var/www/html/occ files:scan --all
 | 
					docker exec -u www-data nextcloud php /var/www/html/occ files:scan --all
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user