Merge branch 'master' into dockerfile-best-practices
This commit is contained in:
commit
4e63073cc4
23
2.9/conf/ocsinventory-restapi.conf
Normal file
23
2.9/conf/ocsinventory-restapi.conf
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
PerlOptions +Parent
|
||||||
|
|
||||||
|
<Perl>
|
||||||
|
$ENV{PLACK_ENV} = 'production';
|
||||||
|
$ENV{MOJO_HOME} = 'REST_API_PATH';
|
||||||
|
$ENV{MOJO_MODE} = 'deployment';
|
||||||
|
$ENV{OCS_DB_HOST} = 'DATABASE_SERVER';
|
||||||
|
$ENV{OCS_DB_PORT} = 'DATABASE_PORT';
|
||||||
|
$ENV{OCS_DB_LOCAL} = 'DATABASE_NAME';
|
||||||
|
$ENV{OCS_DB_USER} = 'DATABASE_USER';
|
||||||
|
$ENV{OCS_DB_PWD} = 'DATABASE_PASSWD';
|
||||||
|
$ENV{OCS_DB_SSL_ENABLED} = OCS_SSL_ENABLED;
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_KEY} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_CERT} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CA_CERT} = '';
|
||||||
|
$ENV{OCS_DB_SSL_MODE} = 'SSL_MODE_PREFERRED';
|
||||||
|
</Perl>
|
||||||
|
|
||||||
|
<Location /ocsapi>
|
||||||
|
SetHandler perl-script
|
||||||
|
PerlResponseHandler Plack::Handler::Apache2
|
||||||
|
PerlSetVar psgi_app 'REST_API_LOADER_PATH'
|
||||||
|
</Location>
|
||||||
@ -1,5 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
SRV_CONF_FILE="/etc/httpd/conf.d/z-ocsinventory-server.conf"
|
||||||
|
REPORTS_CONF_FILE="/etc/httpd/conf.d/ocsinventory-reports.conf"
|
||||||
|
DB_CONFIG_INC_FILE="${OCS_WEBCONSOLE_DIR}/ocsreports/dbconfig.inc.php"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "+----------------------------------------------------------+"
|
echo "+----------------------------------------------------------+"
|
||||||
echo "| |"
|
echo "| |"
|
||||||
@ -19,16 +23,18 @@ mkdir -p $OCS_VARLIB_DIR/scripts
|
|||||||
mkdir -p $OCS_VARLIB_DIR/snmp
|
mkdir -p $OCS_VARLIB_DIR/snmp
|
||||||
|
|
||||||
if [ ! -f $OCS_WEBCONSOLE_DIR/ocsreports/var.php ]; then
|
if [ ! -f $OCS_WEBCONSOLE_DIR/ocsreports/var.php ]; then
|
||||||
cp -r /tmp/OCSNG_UNIX_SERVER-2.9/ocsreports/ ${OCS_WEBCONSOLE_DIR}
|
cp -r /tmp/OCSNG_UNIX_SERVER-${OCS_VERSION}/ocsreports/ ${OCS_WEBCONSOLE_DIR}
|
||||||
rm -rf ${OCS_WEBCONSOLE_DIR}/ocsreports/dbconfig.inc.php
|
rm -rf ${DB_CONFIG_INC_FILE}
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
cp -r /tmp/OCSNG_UNIX_SERVER-2.9/Api/ /usr/local/share/perl5
|
||||||
|
|
||||||
if [ ! -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
if [ ! -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
||||||
echo
|
echo
|
||||||
echo "+---------------------------------------------------------------------------+"
|
echo "+---------------------------------------------------------------------------+"
|
||||||
echo "| Warning: OCS_DISABLE_COM_MODE environment variable is set! |"
|
echo "| Warning: OCS_DISABLE_COM_MODE environment variable is set! |"
|
||||||
echo "| Communication server, which handles HTTP communications between database |"
|
echo "| Communication server, which handles HTTP communications between database |"
|
||||||
echo "| server and agents (Apache, perl and mod_perl) will be DISABLED! |"
|
echo "| server and agents (Apache, perl and mod_perl) will be DISABLED! |"
|
||||||
echo "+---------------------------------------------------------------------------+"
|
echo "+---------------------------------------------------------------------------+"
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
@ -50,22 +56,34 @@ echo
|
|||||||
sed -ri -e "s!^#(ServerName)\s+\S+!\1 ${APACHE_SERVER_NAME:-localhost}:80!g" \
|
sed -ri -e "s!^#(ServerName)\s+\S+!\1 ${APACHE_SERVER_NAME:-localhost}:80!g" \
|
||||||
"/etc/httpd/conf/httpd.conf"
|
"/etc/httpd/conf/httpd.conf"
|
||||||
|
|
||||||
# Configure z-ocsinventory-server file
|
# Configure z-ocsinventory-server file
|
||||||
if [ ! -f /etc/httpd/conf.d/z-ocsinventory-server.conf ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
if [ ! -f ${SRV_CONF_FILE} ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
||||||
cp /tmp/conf/ocsinventory-server.conf /etc/httpd/conf.d/z-ocsinventory-server.conf
|
cp /tmp/conf/ocsinventory-server.conf ${SRV_CONF_FILE}
|
||||||
sed -i 's/VERSION_MP/2/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/VERSION_MP/2/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/"PATH_TO_LOG_DIRECTORY"/'"${OCS_LOG_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/"PATH_TO_LOG_DIRECTORY"/'"${OCS_LOG_DIR//\//\\/}"'/g' ${SRV_CONF_FILE}
|
||||||
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_PERL_DIRECTORY"/'"${OCS_PERLEXT_DIR//\//\\/}"'/g' ${SRV_CONF_FILE}
|
||||||
sed -i 's/"PATH_TO_PLUGINS_CONFIG_DIRECTORY"/'"${OCS_PLUGINSEXT_DIR//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
sed -i 's/"PATH_TO_PLUGINS_CONFIG_DIRECTORY"/'"${OCS_PLUGINSEXT_DIR//\//\\/}"'/g' ${SRV_CONF_FILE}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Configure zz-ocsinventory-restapi file
|
||||||
|
if [ ! -f /etc/httpd/conf.d/zz-ocsinventory-restapi.conf ]; then
|
||||||
|
cp /tmp/conf/ocsinventory-restapi.conf /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_PATH/\/usr\/local\/share\/perl5/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_LOADER_PATH/\/usr\/local\/share\/perl5\/Api\/Ocsinventory\/Restapi\/Loader.pm/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Replace Variables
|
# Replace Variables
|
||||||
SRV_CONF_FILE="/etc/httpd/conf.d/z-ocsinventory-server.conf"
|
|
||||||
if [ -f ${SRV_CONF_FILE} ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
if [ -f ${SRV_CONF_FILE} ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
||||||
echo "+-----------------------------------------------+"
|
echo "+-----------------------------------------------+"
|
||||||
echo "| Customizing from environment variables... |"
|
echo "| Customizing from environment variables... |"
|
||||||
@ -76,36 +94,36 @@ if [ -f ${SRV_CONF_FILE} ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
|
|||||||
# Check that the current var is not commented out in conf file
|
# Check that the current var is not commented out in conf file
|
||||||
if grep -q "^\s*PerlSetEnv ${var^^}" ${SRV_CONF_FILE} ; then
|
if grep -q "^\s*PerlSetEnv ${var^^}" ${SRV_CONF_FILE} ; then
|
||||||
echo "Applying Config ${var^^}=${!var} from environment variable"
|
echo "Applying Config ${var^^}=${!var} from environment variable"
|
||||||
sed -ie "s,^\(\s*PerlSetEnv ${var^^}\).*$,\1 ${!var},g" ${SRV_CONF_FILE}
|
sed -i "s,^\(\s*PerlSetEnv ${var^^}\).*$,\1 ${!var},g" ${SRV_CONF_FILE}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Configure ocsinventory-reports file
|
# Configure ocsinventory-reports file
|
||||||
if [ ! -f /etc/httpd/conf.d/ocsinventory-reports.conf ] && [ -z ${OCS_DISABLE_WEB_MODE+x} ]; then
|
if [ ! -f ${REPORTS_CONF_FILE} ] && [ -z ${OCS_DISABLE_WEB_MODE+x} ]; then
|
||||||
cp /tmp/conf/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
|
cp /tmp/conf/ocsinventory-reports.conf ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/OCSREPORTS_ALIAS/\/ocsreports/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/OCSREPORTS_ALIAS/\/ocsreports/g' ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/PATH_TO_OCSREPORTS_DIR/'"${OCS_WEBCONSOLE_DIR//\//\\/}"'\/ocsreports/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/PATH_TO_OCSREPORTS_DIR/'"${OCS_WEBCONSOLE_DIR//\//\\/}"'\/ocsreports/g' ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/PACKAGES_ALIAS/\/download/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/PACKAGES_ALIAS/\/download/g' ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/PATH_TO_PACKAGES_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'download/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/PATH_TO_PACKAGES_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'download/g' ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/SNMP_ALIAS/\/snmp/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/SNMP_ALIAS/\/snmp/g' ${REPORTS_CONF_FILE}
|
||||||
sed -i 's/PATH_TO_SNMP_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'snmp/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/PATH_TO_SNMP_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'snmp/g' ${REPORTS_CONF_FILE}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Generate dbconfig.inc.php
|
# Generate dbconfig.inc.php
|
||||||
if [ ! -f $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php ] && [ -z ${OCS_DISABLE_WEB_MODE+x} ]; then
|
if [ ! -f ${DB_CONFIG_INC_FILE} ] && [ -z ${OCS_DISABLE_WEB_MODE+x} ]; then
|
||||||
cp /tmp/conf/dbconfig.inc.php $OCS_WEBCONSOLE_DIR/ocsreports
|
cp /tmp/conf/dbconfig.inc.php $OCS_WEBCONSOLE_DIR/ocsreports
|
||||||
sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_DB_PORT/'"$OCS_DB_PORT"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_DB_PORT/'"$OCS_DB_PORT"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_WEB_MODE"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_SSL_WEB_MODE/'"$OCS_SSL_WEB_MODE"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_SSL_KEY/'"${OCS_SSL_KEY//\//\\/}"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' $OCS_WEBCONSOLE_DIR/ocsreports/dbconfig.inc.php
|
sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/g' ${DB_CONFIG_INC_FILE}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Permissions
|
# Permissions
|
||||||
|
|||||||
23
dev/conf/ocsinventory-restapi.conf
Normal file
23
dev/conf/ocsinventory-restapi.conf
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
PerlOptions +Parent
|
||||||
|
|
||||||
|
<Perl>
|
||||||
|
$ENV{PLACK_ENV} = 'production';
|
||||||
|
$ENV{MOJO_HOME} = 'REST_API_PATH';
|
||||||
|
$ENV{MOJO_MODE} = 'deployment';
|
||||||
|
$ENV{OCS_DB_HOST} = 'DATABASE_SERVER';
|
||||||
|
$ENV{OCS_DB_PORT} = 'DATABASE_PORT';
|
||||||
|
$ENV{OCS_DB_LOCAL} = 'DATABASE_NAME';
|
||||||
|
$ENV{OCS_DB_USER} = 'DATABASE_USER';
|
||||||
|
$ENV{OCS_DB_PWD} = 'DATABASE_PASSWD';
|
||||||
|
$ENV{OCS_DB_SSL_ENABLED} = OCS_SSL_ENABLED;
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_KEY} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_CERT} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CA_CERT} = '';
|
||||||
|
$ENV{OCS_DB_SSL_MODE} = 'SSL_MODE_PREFERRED';
|
||||||
|
</Perl>
|
||||||
|
|
||||||
|
<Location /ocsapi>
|
||||||
|
SetHandler perl-script
|
||||||
|
PerlResponseHandler Plack::Handler::Apache2
|
||||||
|
PerlSetVar psgi_app 'REST_API_LOADER_PATH'
|
||||||
|
</Location>
|
||||||
@ -32,6 +32,8 @@ make
|
|||||||
make install
|
make install
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
cp -R Api/ /usr/local/share/perl5
|
||||||
|
|
||||||
# Webconsole
|
# Webconsole
|
||||||
cp -R ocsreports/. $OCS_WEBCONSOLE_DIR
|
cp -R ocsreports/. $OCS_WEBCONSOLE_DIR
|
||||||
|
|
||||||
@ -52,6 +54,19 @@ sed -i 's/OCS_SSL_CERT/'"${OCS_SSL_CERT//\//\\/}"'/g' /etc/httpd/conf.d/z-ocsinv
|
|||||||
sed -i 's/OCS_SSL_CA/'"${OCS_SSL_CA//\//\\/}"'/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
|
sed -i 's/OCS_SSL_COM_MODE/'"$OCS_SSL_COM_MODE"'/g' /etc/httpd/conf.d/z-ocsinventory-server.conf
|
||||||
|
|
||||||
|
# Configure zz-ocsinventory-restapi file
|
||||||
|
if [ ! -f /etc/httpd/conf.d/zz-ocsinventory-restapi.conf ]; then
|
||||||
|
cp /tmp/conf/ocsinventory-restapi.conf /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_PATH/\/usr\/local\/share\/perl5/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_LOADER_PATH/\/usr\/local\/share\/perl5\/Api\/Ocsinventory\/Restapi\/Loader.pm/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
fi
|
||||||
|
|
||||||
# Configure ocsinventory-reports file
|
# Configure ocsinventory-reports file
|
||||||
cp /tmp/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
|
cp /tmp/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
|
||||||
sed -i 's/OCSREPORTS_ALIAS/\/ocsreports/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
sed -i 's/OCSREPORTS_ALIAS/\/ocsreports/g' /etc/httpd/conf.d/ocsinventory-reports.conf
|
||||||
@ -89,4 +104,4 @@ if [ -f "$APACHE_PID_FILE" ]; then
|
|||||||
rm "$APACHE_PID_FILE"
|
rm "$APACHE_PID_FILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/sbin/httpd -DFOREGROUND
|
/usr/sbin/httpd -DFOREGROUND
|
||||||
|
|||||||
@ -72,6 +72,8 @@ RUN cd Apache/ && \
|
|||||||
make && \
|
make && \
|
||||||
make install ;
|
make install ;
|
||||||
|
|
||||||
|
RUN cp -r Api/ /usr/local/share/perl5/
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
COPY conf/ /tmp/conf
|
COPY conf/ /tmp/conf
|
||||||
@ -79,4 +81,4 @@ COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
|
|||||||
|
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
|
||||||
|
|||||||
23
nightly/conf/ocsinventory-restapi.conf
Normal file
23
nightly/conf/ocsinventory-restapi.conf
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
PerlOptions +Parent
|
||||||
|
|
||||||
|
<Perl>
|
||||||
|
$ENV{PLACK_ENV} = 'production';
|
||||||
|
$ENV{MOJO_HOME} = 'REST_API_PATH';
|
||||||
|
$ENV{MOJO_MODE} = 'deployment';
|
||||||
|
$ENV{OCS_DB_HOST} = 'DATABASE_SERVER';
|
||||||
|
$ENV{OCS_DB_PORT} = 'DATABASE_PORT';
|
||||||
|
$ENV{OCS_DB_LOCAL} = 'DATABASE_NAME';
|
||||||
|
$ENV{OCS_DB_USER} = 'DATABASE_USER';
|
||||||
|
$ENV{OCS_DB_PWD} = 'DATABASE_PASSWD';
|
||||||
|
$ENV{OCS_DB_SSL_ENABLED} = OCS_SSL_ENABLED;
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_KEY} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CLIENT_CERT} = '';
|
||||||
|
# $ENV{OCS_DB_SSL_CA_CERT} = '';
|
||||||
|
$ENV{OCS_DB_SSL_MODE} = 'SSL_MODE_PREFERRED';
|
||||||
|
</Perl>
|
||||||
|
|
||||||
|
<Location /ocsapi>
|
||||||
|
SetHandler perl-script
|
||||||
|
PerlResponseHandler Plack::Handler::Apache2
|
||||||
|
PerlSetVar psgi_app 'REST_API_LOADER_PATH'
|
||||||
|
</Location>
|
||||||
@ -35,6 +35,19 @@ if [ ! -f /etc/httpd/conf.d/z-ocsinventory-server.conf ]; then
|
|||||||
sed -i 's/OCS_SSL_COM_MODE/'"$OCS_SSL_COM_MODE"'/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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Configure zz-ocsinventory-restapi file
|
||||||
|
if [ ! -f /etc/httpd/conf.d/zz-ocsinventory-restapi.conf ]; then
|
||||||
|
cp /tmp/conf/ocsinventory-restapi.conf /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_PATH/\/usr\/local\/share\/perl5/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
sed -i 's/REST_API_LOADER_PATH/\/usr\/local\/share\/perl5\/Api\/Ocsinventory\/Restapi\/Loader.pm/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
|
||||||
|
fi
|
||||||
|
|
||||||
# Configure ocsinventory-reports file
|
# Configure ocsinventory-reports file
|
||||||
if [ ! -f /etc/httpd/conf.d/ocsinventory-reports.conf ]; then
|
if [ ! -f /etc/httpd/conf.d/ocsinventory-reports.conf ]; then
|
||||||
cp /tmp/conf/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
|
cp /tmp/conf/ocsinventory-reports.conf /etc/httpd/conf.d/ocsinventory-reports.conf
|
||||||
@ -86,4 +99,4 @@ if [ -f "$APACHE_PID_FILE" ]; then
|
|||||||
rm "$APACHE_PID_FILE"
|
rm "$APACHE_PID_FILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/sbin/httpd -DFOREGROUND
|
/usr/sbin/httpd -DFOREGROUND
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user