Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eduGAIN Connectivity Check
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
edugain
eduGAIN Connectivity Check
Commits
3e6bbb74
Commit
3e6bbb74
authored
1 year ago
by
Marco Malavolti
Browse files
Options
Downloads
Patches
Plain Diff
Added entityID info link & UWSGI log rotation
parent
fa855b6e
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Dockerfile
+4
-3
4 additions, 3 deletions
Dockerfile
eccs-logrotate.conf
+9
-0
9 additions, 0 deletions
eccs-logrotate.conf
eccs_cron
+1
-0
1 addition, 0 deletions
eccs_cron
supervisord.conf
+2
-2
2 additions, 2 deletions
supervisord.conf
web/eccs.js
+5
-1
5 additions, 1 deletion
web/eccs.js
with
21 additions
and
6 deletions
Dockerfile
+
4
−
3
View file @
3e6bbb74
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
eccs-logrotate.conf
0 → 100644
+
9
−
0
View file @
3e6bbb74
/
home
/
eccs
/
logs
/
eccs
-
uwsgi
.
log
{
su
root
root
create
664
eccs
eccs
rotate
30
daily
nocompress
dateext
ifempty
}
This diff is collapsed.
Click to expand it.
eccs_cron
+
1
−
0
View file @
3e6bbb74
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
This diff is collapsed.
Click to expand it.
supervisord.conf
+
2
−
2
View file @
3e6bbb74
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
web/eccs.js
+
5
−
1
View file @
3e6bbb74
...
@@ -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
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment