diff --git a/.gitignore b/.gitignore index 6ed8787..221113f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ errors .eslintrc.json gitlab_read.pat ssl.* +key.pem +cert.pem diff --git a/broker.sh b/broker.sh index 8821bd4..4a255f9 100755 --- a/broker.sh +++ b/broker.sh @@ -418,7 +418,7 @@ setup_local () { # $1: string to generate key # $2: fully-qualified domain name of host -cert_gen_self_signed () { +cert_gen_self_signed_crt () { local pass_str="$1" local fqdn="$2" local dir="ssl.$fqdn" @@ -451,9 +451,11 @@ cert_gen_self_signed () { return } - - - +cert_gen_self_signed_pem () { + openssl req -newkey rsa:2048 \ + -new -nodes -x509 -days 3650 \ + -keyout key.pem -out cert.pem +} ###################################################################### # Global constructions. diff --git a/data.json b/data.json index 443af02..0b2606e 100644 --- a/data.json +++ b/data.json @@ -27,6 +27,31 @@ "install -y texlive-latex-extra texlive-xetex" ] }, + "charybdis": { + "repo": "sys/charybdis.git", + "docker": { + "issue_path": "/opt/charybdis", + "image": "vanityshed/charybdis", + "options": [ + [ + "--rm" + ], + [ + "--volume", + "/opt/charybdis:/irc/etc" + ], + [ + "--publish", + "6667:6667" + ], + ["--restart","always"], + ["--hostname","b5vr.adamo.network"] + ] + }, + "suggest": [ + "Mounting problem?" + ] + }, "gitlab": { "repo": "GITLABREPO.git", "docker": {