fix
This commit is contained in:
parent
f784dd15a2
commit
97c872ddbb
30
build.sh
30
build.sh
@ -1,30 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
d=${0:a:h}
|
|
||||||
cd $d/repos
|
|
||||||
|
|
||||||
t="
|
|
||||||
https://github.com/bluesky-social/atproto
|
|
||||||
https://github.com/did-method-plc/did-method-plc
|
|
||||||
https://github.com/bluesky-social/feed-generator
|
|
||||||
https://github.com/bluesky-social/social-app
|
|
||||||
https://github.com/bluesky-social/cookbook
|
|
||||||
https://github.com/itaru2622/bluesky-selfhost-env
|
|
||||||
"
|
|
||||||
|
|
||||||
t=`echo $t|grep -v '^$'`
|
|
||||||
n=`echo $t|wc -l`
|
|
||||||
|
|
||||||
for ((i=1;i<=$n;i++))
|
|
||||||
do
|
|
||||||
tt=`echo $t|awk "NR==$i"`
|
|
||||||
dd=$d/repos/$tt:t
|
|
||||||
if [ -d $dd ];then
|
|
||||||
echo ok
|
|
||||||
cd $dd
|
|
||||||
git pull
|
|
||||||
cd $d/repos
|
|
||||||
else
|
|
||||||
git clone $tt
|
|
||||||
fi
|
|
||||||
done
|
|
231
install.zsh
231
install.zsh
@ -1,199 +1,58 @@
|
|||||||
#!/bin/zsh
|
#!/bin/zsh
|
||||||
|
|
||||||
host=syu.is
|
|
||||||
name=${host%%.*}
|
|
||||||
domain=${host##*.}
|
|
||||||
|
|
||||||
d=${0:a:h}
|
d=${0:a:h}
|
||||||
dh=${0:a:h:h}
|
|
||||||
|
|
||||||
git_plc=https://github.com/did-method-plc/did-method-plc
|
repos=(
|
||||||
git_bgs=https://github.com/bluesky-social/indigo
|
https://github.com/did-method-plc/did-method-plc
|
||||||
git_atp=https://github.com/bluesky-social/atproto
|
https://github.com/bluesky-social/indigo
|
||||||
git_web=https://github.com/bluesky-social/social-app
|
https://github.com/bluesky-social/atproto
|
||||||
git_fee=https://github.com/bluesky-social/feed-generator
|
https://github.com/bluesky-social/social-app
|
||||||
|
https://github.com/bluesky-social/feed-generator
|
||||||
|
)
|
||||||
|
|
||||||
run_repos_dl() {
|
function run-env() {
|
||||||
|
host=syu.is
|
||||||
|
name=${host%%.*}
|
||||||
|
domain=${host##*.}
|
||||||
|
dh=${0:a:h:h}
|
||||||
|
}
|
||||||
|
|
||||||
|
function run-dl() {
|
||||||
mkdir -p $d/repos
|
mkdir -p $d/repos
|
||||||
cd $d/repos
|
cd $d/repos
|
||||||
if [ ! -d $d/repos/did-method-plc ];then
|
for ((i=1; i<=${#repos}; i++)); do
|
||||||
git clone $git_plc
|
repo=${repos[$i]}
|
||||||
fi
|
echo $repo
|
||||||
if [ ! -d $d/repos/indigo ];then
|
if [ ! -d $d/repos/${repo##*/} ];then
|
||||||
git clone $git_bgs
|
git clone $repo
|
||||||
fi
|
fi
|
||||||
if [ ! -d $d/repos/atproto ];then
|
done
|
||||||
git clone $git_atp
|
if [ ! -f $d/repos/feed-generator/Dockerfile ];then
|
||||||
fi
|
|
||||||
if [ ! -d $d/repos/social-app ];then
|
|
||||||
git clone $git_web
|
|
||||||
fi
|
|
||||||
if [ ! -d $d/repos/feed-generator ];then
|
|
||||||
git clone $git_fee
|
|
||||||
cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
|
cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
run_repos_dl
|
function run-update() {
|
||||||
|
cd $d/repos
|
||||||
run_env() {
|
for ((i=1; i<=${#repos}; i++)); do
|
||||||
|
repo=${repos[$i]}
|
||||||
b="ADMIN_PASSWORD
|
echo $repo
|
||||||
MODERATOR_PASSWORD
|
if [ -d $d/repos/${repo##*/} ];then
|
||||||
TRIAGE_PASSWORD
|
cd $d/repos/${repo##*/}
|
||||||
SERVICE_SIGNING_KEY
|
git pull
|
||||||
IMG_URI_SALT
|
fi
|
||||||
IMG_URI_KEY
|
|
||||||
OZONE_ADMIN_PASSWORD
|
|
||||||
OZONE_MODERATOR_PASSWORD
|
|
||||||
OZONE_TRIAGE_PASSWORD
|
|
||||||
OZONE_SIGNING_KEY_HEX
|
|
||||||
BGS_ADMIN_KEY
|
|
||||||
PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX
|
|
||||||
PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX"
|
|
||||||
|
|
||||||
for ((i=1;i<=`echo $b|wc -l`;i++))
|
|
||||||
do
|
|
||||||
f=`echo $b|awk "NR==$i"`
|
|
||||||
o=`openssl ecparam --name secp256k1 --genkey --noout --outform DER | tail --bytes=+8 | head --bytes=32 | xxd --plain --cols 32`
|
|
||||||
echo $f=$o
|
|
||||||
export $f=$o
|
|
||||||
done
|
|
||||||
|
|
||||||
b="PDS_JWT_SECRET
|
|
||||||
PDS_ADMIN_PASSWORD"
|
|
||||||
|
|
||||||
for ((i=1;i<=`echo $b|wc -l`;i++))
|
|
||||||
do
|
|
||||||
f=`echo $b|awk "NR==$i"`
|
|
||||||
o=`openssl rand --hex 16`
|
|
||||||
echo $f=$o
|
|
||||||
export $f=$o
|
|
||||||
done
|
done
|
||||||
|
cd $d
|
||||||
|
echo "docker compose build && docker compose up -d"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_env_write() {
|
function run-dl-icon() {
|
||||||
echo MODERATION_PUSH_URL=https://admin:${OZONE_ADMIN_PASSWORD}@mod.${host} >> $d/.env/bsky
|
|
||||||
echo MODERATION_PUSH_URL=https://admin:${OZONE_ADMIN_PASSWORD}@mod.${host} >> $d/.env/mod
|
|
||||||
echo ADMIN_PASSWORD=$ADMIN_PASSWORD >> $d/.env/bsky
|
|
||||||
echo MODERATOR_PASSWORD=$MODERATOR_PASSWORD >> $d/.env/bsky
|
|
||||||
echo TRIAGE_PASSWORD=$TRIAGE_PASSWORD >> $d/.env/bsky
|
|
||||||
echo SERVICE_SIGNING_KEY=$SERVICE_SIGNING_KEY >> $d/.env/bsky
|
|
||||||
echo IMG_URI_SALT=$IMG_URI_SALT >> $d/.env/bsky
|
|
||||||
echo IMG_URI_KEY=$IMG_URI_KEY >> $d/.env/bsky
|
|
||||||
echo OZONE_ADMIN_PASSWORD=$OZONE_ADMIN_PASSWORD >> $d/.env/mod
|
|
||||||
echo OZONE_MODERATOR_PASSWORD=$OZONE_MODERATOR_PASSWORD >> $d/.env/mod
|
|
||||||
echo OZONE_TRIAGE_PASSWORD=$OZONE_TRIAGE_PASSWORD >> $d/.env/mod
|
|
||||||
echo OZONE_SIGNING_KEY_HEX=$OZONE_SIGNING_KEY_HEX >> $d/.env/mod
|
|
||||||
echo BGS_ADMIN_KEY=$BGS_ADMIN_KEY >> $d/.env/bgs
|
|
||||||
echo PDS_JWT_SECRET=$PDS_JWT_SECRET >> $d/.env/pds
|
|
||||||
echo PDS_ADMIN_PASSWORD=$PDS_ADMIN_PASSWORD >> $d/.env/pds
|
|
||||||
echo PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX=$PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX >> $d/.env/pds
|
|
||||||
echo PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=$PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX >> $d/.env/pds
|
|
||||||
}
|
|
||||||
|
|
||||||
run_web() {
|
|
||||||
cd $d/repos/social-app/src
|
|
||||||
if [ -n "`grep -R bsky.social .`" ];then
|
|
||||||
for f (`grep -R bsky.social . |cut -d : -f 1`) sed -i -e "s/bsky\.social/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
#if [ -n "`grep -R bsky.app .`" ];then
|
|
||||||
# for f (`grep -R bsky.app . |cut -d : -f 1`) sed -i -e "s/bsky\.app/web\.${name}\.${domain}/g" $f
|
|
||||||
#fi
|
|
||||||
if [ -n "`grep -R "isSandbox: false" .`" ];then
|
|
||||||
for f (`grep -R "isSandbox: false" . |cut -d : -f 1`) sed -i -e "s/isSandbox: false/isSandbox: true/g" $f
|
|
||||||
fi
|
|
||||||
if [ -n "`grep -R SANDBOX .`" ];then
|
|
||||||
for f (`grep -R SANDBOX . |cut -d : -f 1`) sed -i -e "s/SANDBOX/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./view/com/modals/ServerInput.tsx
|
|
||||||
if [ -n "`grep -R Bluesky.Social $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/Bluesky\.Social/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./state/queries/preferences/moderation.ts
|
|
||||||
if [ -n "`grep -R 'Bluesky Social' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/Bluesky Social/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./view/com/auth/create/Step1.tsx
|
|
||||||
if [ -n "`grep -R 'Bluesky' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/Bluesky/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./lib/strings/url-helpers.ts
|
|
||||||
if [ -n "`grep -R 'Bluesky Social' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/Bluesky Social/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./view/icons/Logotype.tsx
|
|
||||||
o=$d/icons/Logotype.tsx
|
|
||||||
if [ -n "`grep -R 'M8.478 6.252c1.503.538 2.3 1.7' $f`" ] && [ -f $f ] && [ -f $o ];then
|
|
||||||
cp -rf $o $f
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
run_web_icon_dl() {
|
|
||||||
curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/main/src/view/icons/Logotype.tsx -o $d/repos/social-app/src/view/icons/Logotype.tsx
|
curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/main/src/view/icons/Logotype.tsx -o $d/repos/social-app/src/view/icons/Logotype.tsx
|
||||||
cp -rf $d/repos/social-app/src/view/icons/Logotype.tsx $d/icons/
|
cp -rf $d/repos/social-app/src/view/icons/Logotype.tsx $d/icons/
|
||||||
}
|
}
|
||||||
|
|
||||||
run_web_app() {
|
|
||||||
cd $d/repos/social-app/src
|
|
||||||
f=./lib/analytics/analytics.tsx
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s#https://api.events.bsky.app/v1#https://bsky.syu.is/v1#g" $f
|
|
||||||
fi
|
|
||||||
f=./lib/analytics/analytics.web.tsx
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s#api.events.bsky.app/v1#bsky.syu.is/v1#g" $f
|
|
||||||
fi
|
|
||||||
f=./lib/notifications/notifications.ts
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/bsky\.app/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./lib/constants.ts
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/bsky\.app/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./lib/strings/url-helpers.ts
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/bsky\.app/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./view/com/modals/ServerInput.tsx
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/bsky\.app/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./view/com/modals/ContentFilteringSettings.tsx
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s/bsky\.app/${name}\.${domain}/g" $f
|
|
||||||
fi
|
|
||||||
f=./state/queries/index.ts
|
|
||||||
if [ -n "`grep -R 'bsky.app' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s#https://public.api.bsky.app#https://api.syu.is#g" $f
|
|
||||||
fi
|
|
||||||
f=./App.native.tsx
|
|
||||||
if [ -n "`grep -R 'sentry' $f`" ] && [ -f $f ];then
|
|
||||||
sed -i -e "s#import 'lib/sentry'#//import 'lib/sentry'#g" $f
|
|
||||||
sed -i -e "s#import 'lib/sentry'#//import 'lib/sentry'#g" ./App.web.tsx
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
run_update() {
|
function web-write() {
|
||||||
cd $d/repos/did-method-plc;git pull
|
|
||||||
cd $d/repos/indigo;git pull
|
|
||||||
cd $d/repos/atproto;git pull
|
|
||||||
cd $d/repos/feed-generator;git pull
|
|
||||||
rm -rf $d/repos/social-app;
|
|
||||||
if [ ! -d $d/repos/social-app ];then
|
|
||||||
cd $d/repos
|
|
||||||
git clone $git_web
|
|
||||||
run_web
|
|
||||||
run_web_app
|
|
||||||
fi
|
|
||||||
cd $d
|
|
||||||
echo ----------------------------
|
|
||||||
echo cd $d
|
|
||||||
echo 'docker compose build && docker compose up -d'
|
|
||||||
}
|
|
||||||
|
|
||||||
web_write() {
|
|
||||||
dt=$d/repos/social-app/src
|
dt=$d/repos/social-app/src
|
||||||
cd $dt
|
cd $dt
|
||||||
grep -R bsky.social .|cut -d : -f 1|sort -u|xargs sed -i "s/bsky.social/syu.is/g"
|
grep -R bsky.social .|cut -d : -f 1|sort -u|xargs sed -i "s/bsky.social/syu.is/g"
|
||||||
@ -211,20 +70,14 @@ web_write() {
|
|||||||
sed -i $t "s#source={{uri: avatar}}#source={{ uri: hackModifyThumbnailPath(avatar, 1 > 0), }}#g" $f
|
sed -i $t "s#source={{uri: avatar}}#source={{ uri: hackModifyThumbnailPath(avatar, 1 > 0), }}#g" $f
|
||||||
}
|
}
|
||||||
|
|
||||||
|
run-env
|
||||||
|
run-dl
|
||||||
case $1 in
|
case $1 in
|
||||||
run-env-write)
|
update)
|
||||||
run_env
|
run-update
|
||||||
run_env_write
|
|
||||||
;;
|
|
||||||
web-app)
|
|
||||||
run_web_icon_dl
|
|
||||||
run_web
|
|
||||||
run_web_app
|
|
||||||
;;
|
|
||||||
update|up)
|
|
||||||
run_update
|
|
||||||
;;
|
;;
|
||||||
web)
|
web)
|
||||||
web_write
|
web-write
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8f2b80a0dcf118652452ea09764a947b09991e0f
|
Subproject commit 22a96d6b7459dbfd88c289ace88ec823e9adc6ee
|
@ -1 +1 @@
|
|||||||
Subproject commit 13da315787e50bd79548d5b695f4f597b43b4015
|
Subproject commit 39f28d196f06367735b2c544533954ac17cdcac4
|
@ -1 +1 @@
|
|||||||
Subproject commit 9a887dd8f2ee634c5e524cfa802f754878a91e5a
|
Subproject commit c14c54bd65eb2ea638e0be4303a4b1af53a211a6
|
1
repos/social-app
Submodule
1
repos/social-app
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 6c9e1d4837e9e385da5ca0c89c28000ad25c70d8
|
Loading…
x
Reference in New Issue
Block a user