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 (from parent 1:
907dc7d
)
Fix problems with web server setup.
author
Christian Heller
<c.heller@plomlompom.de>
Mon, 10 Dec 2018 01:20:56 +0000
(
02:20
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Mon, 10 Dec 2018 01:20:56 +0000
(
02:20
+0100)
all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
patch
|
blob
|
history
all_new_2018/setup_plomlombot.sh
patch
|
blob
|
history
all_new_2018/setup_web.sh
patch
|
blob
|
history
diff --git
a/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
b/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
index 1ee35e82fd80a0d7c7c5341cdf9e1240bddcdb02..0286c6050f57dbb91ea498f85dc927a44b6d78bb 100644
(file)
--- a/
all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
+++ b/
all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
@@
-4,7
+4,7
@@
Description=plomlombot screen
[Service]
Type=forking
User=plom
[Service]
Type=forking
User=plom
-ExecStart=/bin/sh -c 'screen -d -m ~/start.sh plomlombob "#plomlompomtest"'
+ExecStart=/bin/sh -c 'screen -d -m ~/start
_plomlombot
.sh plomlombob "#plomlompomtest"'
[Install]
WantedBy=multi-user.target
[Install]
WantedBy=multi-user.target
diff --git
a/all_new_2018/setup_plomlombot.sh
b/all_new_2018/setup_plomlombot.sh
index 9304394b4a1c59718463e6bb50b1ea9c0ddf83fe..cf8a6797149d27fc7984f806204683ac6ddc15ae 100755
(executable)
--- a/
all_new_2018/setup_plomlombot.sh
+++ b/
all_new_2018/setup_plomlombot.sh
@@
-5,7
+5,10
@@
config_tree_prefix="${HOME}/config/all_new_2018//"
cp "${config_tree_prefix}"/user_scripts/start_plomlombot.sh /home/plom/
chown plom:plom /home/plom/start_plomlombot.sh
apt -y install screen python3-venv
cp "${config_tree_prefix}"/user_scripts/start_plomlombot.sh /home/plom/
chown plom:plom /home/plom/start_plomlombot.sh
apt -y install screen python3-venv
+su plom -c "cd && git clone http://github.com/plomlompom/plomlombot-irc"
systemctl enable /etc/systemd/system/plomlombot.service
systemctl enable /etc/systemd/system/plomlombot.service
-service
start plomlombo
t
+service
plomlombot star
t
mkdir -p /var/www/html/irclogs
mkdir -p /var/www/html/irclogs
-ln /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/789a38c5af11bb71833d89cd74387fcb/logs /var/www/html/irclogs/plomlompomtest
+plomlompomtest_dir=/home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/789a38c5af11bb71833d89cd74387fcb/logs
+mkdir -p "${plomlompomtest_dir}"
+ln "${plomlompomtest_dir}" /var/www/html/irclogs/plomlompomtest
diff --git
a/all_new_2018/setup_web.sh
b/all_new_2018/setup_web.sh
index 8cd1401e24e13c3b40cf1fae3cc3ca0612f29349..517e0afbdb5c2aa429c5972b796ed5e5681c0feb 100755
(executable)
--- a/
all_new_2018/setup_web.sh
+++ b/
all_new_2018/setup_web.sh
@@
-8,4
+8,5
@@
apt -y -o Dpkg::Options::=--force-confold install nginx gitweb fcgiwrap
cd /var/
rm -rf www
git clone plom@core.plomlompom.com:repos/website www
cd /var/
rm -rf www
git clone plom@core.plomlompom.com:repos/website www
+su plom -c 'cd /var/ && mkdir public_repos'
iptables-restore /etc/iptables/rules.v4
iptables-restore /etc/iptables/rules.v4