diff --git a/dev/scripts/docker-entrypoint.sh b/dev/scripts/docker-entrypoint.sh index 103e76f..60a2530 100755 --- a/dev/scripts/docker-entrypoint.sh +++ b/dev/scripts/docker-entrypoint.sh @@ -7,9 +7,9 @@ php73 composer-setup.php --quiet # Move to temp and download OCS cd /tmp -git clone https://github.com/OCSInventory-NG/OCSInventory-Server OCSNG_UNIX_SERVER +git clone $SERVER_REPOSITORY_GIT_URL OCSNG_UNIX_SERVER -b $SERVER_REPOSITORY_BRANCH cd OCSNG_UNIX_SERVER/ -git clone https://github.com/OCSInventory-NG/OCSInventory-ocsreports ocsreports +git clone $OCSREPORTS_REPOSITORY_GIT_URL ocsreports -b $OCSREPORTS_REPOSITORY_BRANCH cd ocsreports/ php73 /opt/composer.phar install cd /tmp/OCSNG_UNIX_SERVER @@ -46,10 +46,10 @@ sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/z-ocsinventory-s sed -i 's/"PATH_TO_LOG_DIRECTORY"/'"${OCS_LOG_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/"PATH_TO_PLUGINS_PERL_DIRECTORY"/'"${OCS_PERLEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/"PATH_TO_PLUGINS_CONFIG_DIRECTORY"/'"${OCS_PLUGINSEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_KEY/'"$OCS_SSL_KEY"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_CERT/'"$OCS_SSL_CERT"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_CA/'"$OCS_SSL_CA"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/OCS_SSL_COM_MODE/'"$OCS_SSL_COM_MODE"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf # Configure ocsinventory-reports file @@ -69,10 +69,10 @@ sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc. sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/SSL_MODE/'"$OCS_SSL_WEB_MODE"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_KEY/'"$OCS_SSL_KEY"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_CERT/'"$OCS_SSL_CERT"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_CA/'"$OCS_SSL_CA"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_WEB_MODE"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php # Permissions chown -R $APACHE_RUN_USER: $OCS_VARLIB_DIR diff --git a/nightly/scripts/docker-entrypoint.sh b/nightly/scripts/docker-entrypoint.sh index 17e9a3b..749fc9f 100755 --- a/nightly/scripts/docker-entrypoint.sh +++ b/nightly/scripts/docker-entrypoint.sh @@ -38,10 +38,10 @@ sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/z-ocsinventory-s sed -i 's/"PATH_TO_LOG_DIRECTORY"/'"${OCS_LOG_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/"PATH_TO_PLUGINS_PERL_DIRECTORY"/'"${OCS_PERLEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/"PATH_TO_PLUGINS_CONFIG_DIRECTORY"/'"${OCS_PLUGINSEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_KEY/'"$OCS_SSL_KEY"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_CERT/'"$OCS_SSL_CERT"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf -sed -i 's/OCS_SSL_CA/'"$OCS_SSL_CA"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf +sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf sed -i 's/OCS_SSL_COM_MODE/'"$OCS_SSL_COM_MODE"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf # Configure ocsinventory-reports file @@ -61,10 +61,10 @@ sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc. sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/SSL_MODE/'"$OCS_SSL_WEB_MODE"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_KEY/'"$OCS_SSL_KEY"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_CERT/'"$OCS_SSL_CERT"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_SSL_CA/'"$OCS_SSL_CA"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_WEB_MODE"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php # Permissions