jan/cacert-devsetup
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Compare commits

merge into: jan:master
Branches Tags
jan:master
jan:run-locally
jan:use-gosigner
jan:old_signer_image
...
pull from: bdmc:run-locally
Branches Tags
bdmc:run-locally
bdmc:master
bdmc:use-gosigner
bdmc:old_signer_image
jan:master
jan:run-locally
jan:use-gosigner
jan:old_signer_image

4 commits
master ... run-locall

Author SHA1 Message Date
Jan Dittberner
1f815bad85 Point mr to jandd's run-locally github branch 2021-08-27 18:48:09 +02:00
Jan Dittberner
d3a44eb38e Add TVERIFY_HOSTNAME to support older code base 2021-08-27 18:45:42 +02:00
Jan Dittberner
dbb500f8e8 Add wget to allow download of translations on first start 2021-08-27 18:00:13 +02:00
Jan Dittberner
0857806acf Make signer and signer_client work with minimal changes 2021-08-27 17:41:26 +02:00
5 changed files with 12 additions and 5 deletions
Show stats Expand all files Collapse all files

3
.mrconfig
View file

@ -5,4 +5,5 @@ checkout = git clone https://github.com/CAcertOrg/cats cacert-cats
checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-mgr.git cacert-mgr checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-mgr.git cacert-mgr
[cacert-software] [cacert-software]
checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software #checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software
checkout = git clone -b run-locally https://github.com/jandd/cacert-devel.git cacert-software

3
docker-compose.yml
View file

@ -42,6 +42,7 @@ services:
CRL_DIRECTORY: /srv/certs/crl CRL_DIRECTORY: /srv/certs/crl
DEFAULT_HOSTNAME: www.cacert.localhost DEFAULT_HOSTNAME: www.cacert.localhost
SECURE_HOSTNAME: secure.cacert.localhost SECURE_HOSTNAME: secure.cacert.localhost
TVERIFY_HOSTNAME: tverify.cacert.localhost
INSECURE_PORT: 8080 INSECURE_PORT: 8080
SECURE_PORT: 8443 SECURE_PORT: 8443
RETURN_ADDRESS: "returns@cacert.localhost" RETURN_ADDRESS: "returns@cacert.localhost"
@ -101,6 +102,7 @@ services:
volumes: volumes:
- certstaging:/srv/certs - certstaging:/srv/certs
- signersockets:/srv/sockets - signersockets:/srv/sockets
- webdbincl:/home/cacert/www/includes/
depends_on: depends_on:
- db - db
- smtp - smtp
@ -127,3 +129,4 @@ volumes:
certstaging: { } certstaging: { }
signersockets: { } signersockets: { }
signerdata: { } signerdata: { }
webdbincl: { }

2
docker/run-signer
View file

@ -23,7 +23,7 @@ if [ ! -f /srv/ca/gpg/gpg_root_0/secring.gpg ]; then cp /srv/testca/gpg/gpg_root
if [ ! -f /srv/ca/gpg/gpg_root_0/pubring.gpg ]; then cp /srv/testca/gpg/gpg_root_0/pubring.gpg /srv/ca/gpg/gpg_root_0/pubring.gpg; fi if [ ! -f /srv/ca/gpg/gpg_root_0/pubring.gpg ]; then cp /srv/testca/gpg/gpg_root_0/pubring.gpg /srv/ca/gpg/gpg_root_0/pubring.gpg; fi
rm -f /srv/sockets/signer rm -f /srv/sockets/signer
socat -d -d PTY,link=/dev/ttyUSB0 UNIX-LISTEN:/srv/sockets/signer 2>&1 & socat -d -d "PTY,link=${SERIAL_PORT}" UNIX-LISTEN:/srv/sockets/signer 2>&1 &
sleep 1 sleep 1
cd /srv/CommModule/ cd /srv/CommModule/

6
docker/run-signer_client
View file

@ -2,10 +2,12 @@
set -eu set -eu
socat -d -d UNIX:/srv/sockets/signer PTY,link=/dev/ttyS0 2>&1 & export SERIAL_PORT=/dev/ttyUSB0
socat -d -d "UNIX:/srv/sockets/signer" "PTY,link=${SERIAL_PORT}" 2>&1 &
sleep 1 sleep 1
export SERIAL_PORT=/dev/ttyS0 echo "<?php mysql_connect(\"${MYSQL_WEBDB_HOSTNAME}\", \"${MYSQL_WEBDB_USER}\", \"${MYSQL_WEBDB_PASSWORD}\");" > "/home/cacert/www/includes/mysql.php"
cd /srv/CommModule/ cd /srv/CommModule/

1
webdb.Dockerfile
View file

@ -35,6 +35,7 @@ RUN apt-get update \
php5-recode \ php5-recode \
psmisc \ psmisc \
wamerican \ wamerican \
wget \
whois \ whois \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \