forked from c3d2/nix-config
c3d2-web: s/serv/flpk/
This commit is contained in:
parent
d29686a841
commit
2b2bf71305
|
@ -93,7 +93,7 @@ in
|
|||
};
|
||||
|
||||
# hooks, logs
|
||||
"c3d2-web.serv.zentralwerk.org" = {
|
||||
"c3d2-web.flpk.zentralwerk.org" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = webroot;
|
||||
|
@ -221,28 +221,28 @@ in
|
|||
|
||||
# web
|
||||
set +e
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"building...\", \"state\": \"pending\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"building...\", \"state\": \"pending\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
|
||||
make -j$(nproc) export DESTDIR=${webroot}/c3d2 \
|
||||
&> ${webroot}/log/build-$REV.txt
|
||||
|
||||
if [ $? = 0 ]; then
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"deployed\", \"state\": \"success\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"deployed\", \"state\": \"success\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
else
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"build failure\", \"state\": \"failure\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-web\", \"description\": \"build failure\", \"state\": \"failure\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-$REV.txt\"}"
|
||||
fi
|
||||
|
||||
git clean -fx
|
||||
# gemini
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"building...\", \"state\": \"pending\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"building...\", \"state\": \"pending\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
|
||||
make -f Makefile.gemini -j$(nproc) export DESTDIR=${geminiRoot} \
|
||||
&> ${webroot}/log/build-gemini-$REV.txt
|
||||
|
||||
if [ $? = 0 ]; then
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"deployed\", \"state\": \"success\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"deployed\", \"state\": \"success\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
else
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"build failure\", \"state\": \"failure\", \"target_url\": \"https://c3d2-web.serv.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
status "{ \"context\": \"c3d2-gemini\", \"description\": \"build failure\", \"state\": \"failure\", \"target_url\": \"https://c3d2-web.flpk.zentralwerk.org/log/build-gemini-$REV.txt\"}"
|
||||
fi
|
||||
set -e
|
||||
done
|
||||
|
|
|
@ -60,7 +60,6 @@
|
|||
"openpgpkey.c3d2.de"
|
||||
"netzbiotop.org" "www.netzbiotop.org"
|
||||
"autotopia.c3d2.de"
|
||||
"c3d2-web.serv.zentralwerk.org"
|
||||
];
|
||||
proxyTo.host = zentralwerk.lib.config.site.net.flpk.hosts4.c3d2-web;
|
||||
} {
|
||||
|
|
Loading…
Reference in New Issue
Block a user