julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ssl path, minor language tweaks (#49)

Browse Source 
Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
This commit is contained in:
Dis McCarthy 2020-04-06 07:59:16 -04:00 committed by GitHub
parent 057df4bad8
commit df5566b170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jails/organizr/install.sh
View File

@ -13,15 +13,15 @@ cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage
cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom
if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then
echo "cert folder not existing... creating..." echo "cert folder doesn't exist... creating..."
iocage exec organizr mkdir /config/ssl iocage exec organizr mkdir /config/ssl
fi fi
if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
echo "certificate exist... Skipping cert generation" echo "certificate exists... Skipping cert generation"
else else
echo "No ssl certificate present, generating self signed certificate" echo "No ssl certificate present, generating self signed certificate"
openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt
fi fi
iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr