home
·
contact
·
privacy
projects
/
config
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c69984
)
Fix guiltcards setup.
author
Christian Heller
<c.heller@plomlompom.de>
Mon, 27 Dec 2021 21:37:07 +0000
(22:37 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Mon, 27 Dec 2021 21:37:07 +0000
(22:37 +0100)
bullseye/apt-mark/website
patch
|
blob
|
history
bullseye/etc_files/website/etc/nginx/sites-available/website.nginx
patch
|
blob
|
history
bullseye/setup_scripts/setup_website.sh
patch
|
blob
|
history
diff --git
a/bullseye/apt-mark/website
b/bullseye/apt-mark/website
index c046f502b5c7f08a1f5fb48d207cdcf097b8d8e7..7bdd77f3c3e8b410d2ec254c9090b41876e62704 100644
(file)
--- a/
bullseye/apt-mark/website
+++ b/
bullseye/apt-mark/website
@@
-6,3
+6,6
@@
gnupg
dirmngr
python3-venv
screen
+# for uwsgi
+build-essential
+python3-dev
diff --git
a/bullseye/etc_files/website/etc/nginx/sites-available/website.nginx
b/bullseye/etc_files/website/etc/nginx/sites-available/website.nginx
index 008b5862a505858bb498df01b71c41e7cccac2aa..ad5abed5a6044336469fa2283948b907a305ac2c 100644
(file)
--- a/
bullseye/etc_files/website/etc/nginx/sites-available/website.nginx
+++ b/
bullseye/etc_files/website/etc/nginx/sites-available/website.nginx
@@
-38,7
+38,7
@@
server {
autoindex on;
}
-
#
location /guiltcards/ {
+ location /guiltcards/ {
include uwsgi_params;
uwsgi_pass 127.0.0.1:9000;
}
diff --git
a/bullseye/setup_scripts/setup_website.sh
b/bullseye/setup_scripts/setup_website.sh
index d2dd5e87a94ba4d16a4a199bbb8bb60adf078cad..ad36796d493e3c578fc7ad7a7ac2f26c5d4245e0 100755
(executable)
--- a/
bullseye/setup_scripts/setup_website.sh
+++ b/
bullseye/setup_scripts/setup_website.sh
@@
-125,6
+125,9
@@
fi
# Set up guiltcards.
su -lc "git clone /var/repos/guiltcards" plom
+cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
+su -lc "./mirror_dir.sh ${old_server} /home/plom/guiltcards/decks" plom
+rm /home/plom/mirror_dir.sh
# In the above step, we might have created a root-owned /var/www/html –
# fix this here.