sneak/adchpp-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enables TLS by default
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
* update to config file to use TLS
* generates self-signed certs if none exist and saves them in config dir
This commit is contained in:
Jeffrey Paul 2020-03-22 05:43:16 -07:00
parent d8eed67ef7
commit fb2bf698ca
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
root/etc/service/adchpp/run
View File

@ -9,5 +9,11 @@ if [[ ! -d /config/scripts ]]; then
cp /usr/local/src/adchpp/plugins/Script/examples/*.lua /config/scripts cp /usr/local/src/adchpp/plugins/Script/examples/*.lua /config/scripts
fi fi
cd /tmp if [[ ! -d /config/certs ]]; then
mkdir -p /config/certs
cd /config/certs
bash /usr/local/src/adchpp/linux/generate_certs.sh
fi
cd /config
exec /usr/local/bin/adchppd -c /config exec /usr/local/bin/adchppd -c /config

17
src/etc/adchpp.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<ADCHubPlusPlus> <ADCHubPlusPlus>
<!-- IMPORTANT: under Linux, you should use absolute paths in the various path settings <!-- IMPORTANT: under Linux, you should use absolute paths in the various path settings
of this configuration file --> of this configuration file -->
<Settings> <Settings>
@ -59,7 +59,6 @@
To create secure connections, set TLS="1" and define the following (preferably absolute) To create secure connections, set TLS="1" and define the following (preferably absolute)
paths: Certificate, PrivateKey, TrustedPath, DHParams. An example secure server setting: paths: Certificate, PrivateKey, TrustedPath, DHParams. An example secure server setting:
<Server Port="2780" TLS="1" Certificate="certs/cacert.pem" PrivateKey="certs/privkey.pem" TrustedPath="certs/trusted/" DHParams="certs/dhparam.pem"/>
Simple OpenSSL commands to generate files used for secure connections: Simple OpenSSL commands to generate files used for secure connections:
openssl genrsa -out privkey.pem 2048 openssl genrsa -out privkey.pem 2048
@ -69,8 +68,16 @@
Alternatively, you can use the cert generator contributed on Alternatively, you can use the cert generator contributed on
<http://launchpadlibrarian.net/31960965/Cert_Generator.7z>. <http://launchpadlibrarian.net/31960965/Cert_Generator.7z>.
-->
<Server Port="2780"/> <Server Port="2780"/>
-->
<Server
Port="2780"
TLS="1"
Certificate="/config/certs/cacert.pem"
PrivateKey="/config/certs/privkey.pem"
TrustedPath="/config/certs/trusted/"
DHParams="/config/certs/dhparam.pem"
/>
</Servers> </Servers>
<!-- Instead of scripts, ADCH++ uses plugins. Plugins can do the same work <!-- Instead of scripts, ADCH++ uses plugins. Plugins can do the same work
@ -79,9 +86,9 @@
write a script plugin, enabling people to choose their own script language, write a script plugin, enabling people to choose their own script language,
if someone's written a script plugin for it. You must specify the path to your if someone's written a script plugin for it. You must specify the path to your
plugins in linux default place it looks for the plugin path is /home/<username>/adchpp/ --> plugins in linux default place it looks for the plugin path is /home/<username>/adchpp/ -->
<!--Plugins Path="~/adchpp/"--> <!--Plugins Path="~/adchpp/"-->
<Plugins> <Plugins>
<!-- This plugins provides the scripting support. --> <!-- This plugins provides the scripting support. -->
<Plugin>Script</Plugin> <Plugin>Script</Plugin>