Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
server-monitor
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Recolic
server-monitor
Commits
32c7c30b
There was an error fetching the commit references. Please try again later.
Verified
Commit
32c7c30b
authored
5 years ago
by
Recolic Keghart
Browse files
Options
Downloads
Patches
Plain Diff
bug fix
parent
41cd7d2d
No related branches found
No related tags found
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Dockerfile
+6
-2
6 additions, 2 deletions
Dockerfile
datafile.py
+1
-1
1 addition, 1 deletion
datafile.py
datafile.py.gen.d.py
+1
-1
1 addition, 1 deletion
datafile.py.gen.d.py
datafile_gen_daemon_conf.py
+16
-1
16 additions, 1 deletion
datafile_gen_daemon_conf.py
status.html
+0
-565
0 additions, 565 deletions
status.html
with
24 additions
and
570 deletions
Dockerfile
+
6
−
2
View file @
32c7c30b
...
@@ -4,8 +4,12 @@ MAINTAINER root@recolic.net
...
@@ -4,8 +4,12 @@ MAINTAINER root@recolic.net
RUN
pacman
-Sy
RUN
pacman
-Sy
RUN
pacman
-S
--noconfirm
curl netcat iputils
grep
RUN
pacman
-S
--noconfirm
curl netcat iputils
grep
RUN
pacman
-S
--noconfirm
python
COPY
do.bash /
RUN
mkdir
/app
RUN
chmod
+x /do.bash
COPY
. /app
CMD
["/app/datafile.py.gen.d.py"]
# docker run -v /var/www/html/status.html:/app/status.html my_docker_image
This diff is collapsed.
Click to expand it.
datafile.py
+
1
−
1
View file @
32c7c30b
# datafile for status.html generator.
# datafile for status.html generator.
current_status
=
[
(
"
Reverse Proxy
"
,
"
green
"
),(
"
Drive
"
,
"
green
"
)
]
current_status
=
[
(
"
Reverse Proxy
"
,
"
green
"
),(
"
Drive
"
,
"
green
"
)
,(
"
ShadowSocks taiwan
"
,
"
green
"
),(
"
ShadowSocks US-1
"
,
"
green
"
),(
"
ShadowSocks US-5
"
,
"
green
"
),(
"
ShadowSocks US-6
"
,
"
green
"
),(
"
OpenVPN taiwan
"
,
"
green
"
),(
"
Main Website
"
,
"
green
"
),(
"
Mail Server
"
,
"
green
"
),(
"
Teachermate Web Seller
"
,
"
green
"
),(
"
Git
"
,
"
green
"
),(
"
ZhiXiang Fucker
"
,
"
green
"
),(
"
Minecraft Server
"
,
"
green
"
),(
"
httpdb
"
,
"
green
"
),(
"
DDNS WuHan
"
,
"
green
"
),(
"
DDNS USA
"
,
"
green
"
),(
"
Download Site
"
,
"
green
"
)
]
saved_events
=
[
]
saved_events
=
[
]
past_day
=
[
(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
))
]
past_day
=
[
(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
)),(
True
,
(
"
2019
"
,
"
May
"
,
"
14
"
,
"
None
"
,
""
))
]
This diff is collapsed.
Click to expand it.
datafile.py.gen.d.py
+
1
−
1
View file @
32c7c30b
...
@@ -47,7 +47,7 @@ def save_status():
...
@@ -47,7 +47,7 @@ def save_status():
curr_time
=
datetime
.
datetime
.
utcnow
()
curr_time
=
datetime
.
datetime
.
utcnow
()
for
i
in
range
(
14
):
for
i
in
range
(
14
):
# previous 2 weeks.
# previous 2 weeks.
the_date
=
curr_time
-
datetime
.
timedelta
(
days
=
1
)
the_date
=
curr_time
-
datetime
.
timedelta
(
days
=
i
)
the_month
,
the_day
,
the_year
=
the_date
.
strftime
(
"
%b
"
),
the_date
.
strftime
(
"
%d
"
),
the_date
.
strftime
(
"
%Y
"
)
the_month
,
the_day
,
the_year
=
the_date
.
strftime
(
"
%b
"
),
the_date
.
strftime
(
"
%d
"
),
the_date
.
strftime
(
"
%Y
"
)
msgs
=
[]
msgs
=
[]
...
...
This diff is collapsed.
Click to expand it.
datafile_gen_daemon_conf.py
+
16
−
1
View file @
32c7c30b
...
@@ -2,7 +2,22 @@
...
@@ -2,7 +2,22 @@
tests
=
[
tests
=
[
(
'
./do.bash rproxy
'
,
'
Reverse Proxy
'
),
(
'
./do.bash rproxy
'
,
'
Reverse Proxy
'
),
(
'
./do.bash drive
'
,
'
Drive
'
),
(
'
./do.bash drive
'
,
'
Drive
'
),
(
'
./do.bash ss-tw
'
,
'
ShadowSocks taiwan
'
),
(
'
./do.bash ss-us1
'
,
'
ShadowSocks US-1
'
),
(
'
./do.bash ss-us5
'
,
'
ShadowSocks US-5
'
),
(
'
./do.bash ss-us6
'
,
'
ShadowSocks US-6
'
),
(
'
./do.bash ovpn-tw
'
,
'
OpenVPN taiwan
'
),
(
'
./do.bash www
'
,
'
Main Website
'
),
(
'
./do.bash mail
'
,
'
Mail Server
'
),
(
'
./do.bash tm
'
,
'
Teachermate Web Seller
'
),
(
'
./do.bash git
'
,
'
Git
'
),
(
'
./do.bash zhixiang
'
,
'
ZhiXiang Fucker
'
),
(
'
./do.bash mc
'
,
'
Minecraft Server
'
),
(
'
./do.bash push-httpdb-agent
'
,
'
httpdb
'
),
(
'
./do.bash ddns-wuhan
'
,
'
DDNS WuHan
'
),
(
'
./do.bash ddns-us
'
,
'
DDNS USA
'
),
(
'
./do.bash dl
'
,
'
Download Site
'
),
]
]
test_interval
=
20
*
60
# 20min
test_interval
=
20
*
60
# 20min
...
...
This diff is collapsed.
Click to expand it.
status.html
deleted
100644 → 0
+
0
−
565
View file @
41cd7d2d
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