cedricAbonnel
/
Proxmox
mirror of https://github.com/tteck/Proxmox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: cedricAbonnel:2d3cae43cbf679a8171c68ef2dd72e13d521cd74
Branches Tags
cedricAbonnel:main
cedricAbonnel:gh-pages
..
compare: cedricAbonnel:06742f7ef5773b82a4b3cd127a4fdae16d058251
Branches Tags
cedricAbonnel:gh-pages
cedricAbonnel:main

No commits in common. "2d3cae43cbf679a8171c68ef2dd72e13d521cd74" and "06742f7ef5773b82a4b3cd127a4fdae16d058251" have entirely different histories.
2d3cae43cb ... 06742f7ef5

2 changed files with 3 additions and 23 deletions
Show Stats Expand all files Collapse all files

24
ct/tianji.sh
View File

@ -61,25 +61,12 @@ if (( $(df /boot | awk 'NR==2{gsub("%","",$5); print $5}') > 80 )); then
fi fi
RELEASE=$(curl -s https://api.github.com/repos/msgbyte/tianji/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') RELEASE=$(curl -s https://api.github.com/repos/msgbyte/tianji/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "SET RESOURCES" "Please set the resources in your ${APP} LXC to ${var_cpu}vCPU and ${var_ram}RAM for the build process before continuing" 10 75
msg_info "Stopping ${APP} Service" msg_info "Stopping ${APP} Service"
systemctl stop tianji systemctl stop tianji
msg_ok "Stopped ${APP} Service" msg_ok "Stopped ${APP} Service"
msg_info "Updating ${APP} to ${RELEASE}" msg_info "Updating ${APP} to ${RELEASE}"
cd /opt cd /opt/tianji
cp /opt/tianji/src/server/.env /opt/.env git checkout -f -q v${RELEASE}
mv /opt/tianji /opt/tianji_bak
wget -q "https://github.com/msgbyte/tianji/archive/refs/tags/v${RELEASE}.zip"
unzip -q v${RELEASE}.zip
mv tianji-${RELEASE} /opt/tianji
cd tianji
pnpm install --filter @tianji/client... --config.dedupe-peer-dependents=false --frozen-lockfile >/dev/null 2>&1
pnpm build:static >/dev/null 2>&1
pnpm install --filter @tianji/server... --config.dedupe-peer-dependents=false >/dev/null 2>&1
mkdir -p ./src/server/public >/dev/null 2>&1
cp -r ./geo ./src/server/public >/dev/null 2>&1
pnpm build:server >/dev/null 2>&1
mv /opt/.env /opt/tianji/src/server/.env
cd src/server cd src/server
pnpm db:migrate:apply >/dev/null 2>&1 pnpm db:migrate:apply >/dev/null 2>&1
echo "${RELEASE}" >/opt/${APP}_version.txt echo "${RELEASE}" >/opt/${APP}_version.txt
@ -87,13 +74,6 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v
msg_info "Starting ${APP}" msg_info "Starting ${APP}"
systemctl start tianji systemctl start tianji
msg_ok "Started ${APP}" msg_ok "Started ${APP}"
msg_info "Cleaning up"
rm -R /opt/v${RELEASE}.zip
rm -rf /opt/tianji_bak
rm -rf /opt/tianji/src/client
rm -rf /opt/tianji/website
rm -rf /opt/tianji/reporter
msg_ok "Cleaned"
msg_ok "Updated Successfully" msg_ok "Updated Successfully"
else else
msg_ok "No update required. ${APP} is already at ${RELEASE}." msg_ok "No update required. ${APP} is already at ${RELEASE}."

2
install/pihole-install.sh
View File

@ -49,7 +49,7 @@ if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
cat <<EOF >/etc/unbound/unbound.conf.d/pi-hole.conf cat <<EOF >/etc/unbound/unbound.conf.d/pi-hole.conf
server: server:
verbosity: 0 verbosity: 0
interface: 127.0.0.1 interface: 0.0.0.0
port: 5335 port: 5335
do-ip6: no do-ip6: no
do-ip4: yes do-ip4: yes