Skip to content
Snippets Groups Projects
Commit 3e6bbb74 authored by Marco Malavolti's avatar Marco Malavolti
Browse files

Added entityID info link & UWSGI log rotation

parent fa855b6e
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ RUN useradd -rms /bin/bash eccs ...@@ -12,7 +12,7 @@ RUN useradd -rms /bin/bash eccs
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y apt-utils net-tools vim cron wget gpg gpg-agent unzip ca-certificates \ && apt-get install -y apt-utils net-tools vim cron wget gpg gpg-agent unzip ca-certificates \
build-essential python3-dev libxml2-dev libxml2-dev libxslt1-dev \ build-essential python3-dev libxml2-dev libxml2-dev libxslt1-dev logrotate \
apache2 php supervisor uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi libxml2-utils \ apache2 php supervisor uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi libxml2-utils \
python3 python3-pip python3-click python3-flask python3-flask-restful \ python3 python3-pip python3-click python3-flask python3-flask-restful \
python3-requests python3-selenium python3-urllib3 --no-install-recommends \ python3-requests python3-selenium python3-urllib3 --no-install-recommends \
...@@ -48,8 +48,9 @@ COPY --chown=eccs:eccs web/ web/ ...@@ -48,8 +48,9 @@ COPY --chown=eccs:eccs web/ web/
USER root USER root
COPY eccs_cron /etc/cron.d/eccs_cron COPY eccs-logrotate.conf /etc/logrotate.d/eccs
COPY pyff_cron /etc/cron.d/pyff_cron COPY eccs_cron /etc/cron.d/eccs
COPY pyff_cron /etc/cron.d/pyff
# Install ECCS API # Install ECCS API
COPY eccs.conf /etc/apache2/conf-available/eccs.conf COPY eccs.conf /etc/apache2/conf-available/eccs.conf
......
/home/eccs/logs/eccs-uwsgi.log {
su root root
create 664 eccs eccs
rotate 30
daily
nocompress
dateext
ifempty
}
0 0 * * * /usr/sbin/logrotate /etc/logrotate.d/eccs
0 3 * * * /usr/bin/touch /home/eccs/eccs.ini 0 3 * * * /usr/bin/touch /home/eccs/eccs.ini
0 4 * * * /bin/bash /home/eccs/cleanAndRunEccs.sh > /home/eccs/logs/eccs-cron.log 2>&1 0 4 * * * /bin/bash /home/eccs/cleanAndRunEccs.sh > /home/eccs/logs/eccs-cron.log 2>&1
0 10 * * * /bin/bash /home/eccs/clean7daysOldFiles.sh > /home/eccs/logs/eccs-clean.log 2>&1 0 10 * * * /bin/bash /home/eccs/clean7daysOldFiles.sh > /home/eccs/logs/eccs-clean.log 2>&1
...@@ -29,9 +29,9 @@ autorestart=true ...@@ -29,9 +29,9 @@ autorestart=true
[program:uwsgi] [program:uwsgi]
#command=uwsgi --ini /root/eccs/eccs.ini --die-on-term #command=uwsgi --ini /root/eccs/eccs.ini --die-on-term
command=uwsgi --ini /home/eccs/eccs.ini command=uwsgi --ini /home/eccs/eccs.ini
stdout_logfile=/dev/stdout stdout_logfile=/home/eccs/logs/eccs-uwsgi.log
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/home/eccs/logs/eccs-uwsgi.log
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
autostart=true autostart=true
autorestart=true autorestart=true
......
...@@ -312,7 +312,11 @@ $(document).ready(function() { ...@@ -312,7 +312,11 @@ $(document).ready(function() {
"data": "displayName", "data": "displayName",
"defaultContent": '' "defaultContent": ''
}, },
{ "data": "entityID" }, { "data": "entityID",
"render": function(data, type, row, meta) {
return '<a target="_blank" href="https://technical.edugain.org/api.php?action=show_entity_details&format=html&opt=standalone&e_id=' + data + '">' + data + '</a>';
}
},
{ "data": "registrationAuthority" }, { "data": "registrationAuthority" },
{ {
"data": "date", "data": "date",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment