Skip to content

Commit e07f166

Browse files
MezzonianMezzonian
authored
V.1.3.0 (#84)
* Release Candidate 1.3.0 (#83) (#83) * Solving issues mentioned in the pull-request #83 * Removed "make restore" from upgrade script * Fixed "restore-all" in Makefile * Add Version 1.3.0 to Travis
1 parent e1d6bab commit e07f166

13 files changed

+1644
-34
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ env:
3030
#- VERSION=1.0.1
3131
#- VERSION=1.0.2
3232
#- VERSION=1.0.3
33-
- VERSION=1.0.4
33+
#- VERSION=1.0.4
3434
#- VERSION=1.1.0
3535
- VERSION=1.1.1
3636
- VERSION=1.2.0
37+
- VERSION=1.3.0
3738

3839

3940
before_install:

‎1.3.0/.gitlab-ci.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
env_test_only 1.1.1:
2+
variables:
3+
CURRENT_VERSION: 1.1.1
4+
extends: .env_test_only
5+
# only:
6+
# changes:
7+
# - 1.1.1/*
8+
9+
long_test 1.1.1:
10+
variables:
11+
CURRENT_VERSION: 1.1.1
12+
extends: .long_test
13+
# only:
14+
# changes:
15+
# - 1.1.1/*
16+
17+
push_productive_images 1.1.1:
18+
variables:
19+
CURRENT_VERSION: 1.1.1
20+
extends: .push_productive_images
21+
# only:
22+
# changes:
23+
# - 1.1.1/*
24+
25+
# scan proxy:
26+
# variables:
27+
# CI_CONTAINER_NAME: misp-dockerized-proxy
28+
# #CI_APPLICATION_TAG:
29+
# extends: .container_scanning
30+
31+
# scan robot:
32+
# variables:
33+
# CI_CONTAINER_NAME: misp-dockerized-robot
34+
# #CI_APPLICATION_TAG:
35+
# extends: .container_scanning
36+
37+
# scan server:
38+
# variables:
39+
# CI_CONTAINER_NAME: misp-dockerized-server
40+
# #CI_APPLICATION_TAG:
41+
# extends: .container_scanning
42+
43+
# scan modules:
44+
# variables:
45+
# CI_CONTAINER_NAME: misp-dockerized-misp-modules
46+
# #CI_APPLICATION_TAG:
47+
# extends: .container_scanning

‎1.3.0/Makefile

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
.PHONY: help \
2+
start requirements build-config deploy delete change-ssl disable-maintenance enable-maintenance\
3+
security configure config-db config-server config-proxy \
4+
backup-all backup-server backup-redis backup-db backup-proxy backup-robot \
5+
build-server build-proxy build-robot build-all \
6+
7+
# Shows Help and all Commands
8+
help:
9+
@echo "Please use one of the following options:\n \
10+
General: \n \
11+
make install | Initial Command for: requirements, build-config, deploy\n \
12+
make requirements | Check if server fullfill all requirements\n \
13+
make deploy | Deploy Docker container\n \
14+
make upgrade | Upgrade MISP-dockerized\n \
15+
make update | Update MISP-dockerized same as make install\n \
16+
make delete | Delete all docker container, volumes and images for MISP\n \
17+
make delete-unused | Delete all unused docker container, volumes and images \n \
18+
make security | Check docker security via misp-robot\n \
19+
make test | Test if MISP-environment is ready.\n \
20+
\n \
21+
make build-config REPOURL=<Custom Docker Registry URL> | Build configuration\n \
22+
\n \
23+
\n Control Docker Instances\n\
24+
make start-all | Start all docker container\n \
25+
make stop-all | Stop all docker container \n \
26+
make restart-all | Restart all docker container \n \
27+
\n Configure: \n \
28+
make change-ssl | Change ssl certificate and key\n \
29+
make change-smime | Change S/MIME certificate and key\n \
30+
make change-pgp | Change PGP keys\n \
31+
make change-all | Change SSL, S/MIME and PGP Keys \n \
32+
\n Maintenance: \n \
33+
make enable-maintenance | Enable maintenance mode \n \
34+
make disable-maintenance | Disable maintenance mode \n \
35+
\n Backup: \n \
36+
make backup-all | Backup all misp volumes via misp-robot\n \
37+
make backup-server | Backup misp-server volumes via misp-robot\n \
38+
make backup-redis | Backup misp-redis volumes via misp-robot\n \
39+
make backup-db | Backup misp-db volumes via misp-robot\n \
40+
make backup-proxy | Backup misp-proxy volumes via misp-robot\n \
41+
make backup-robot | Backup misp-robot volumes via misp-robot\n \
42+
\n \
43+
make restore-all | Restore all via misp-robot\n \
44+
make restore-server | Restore misp-server volumes via misp-robot\n \
45+
make restore-redis | Restore misp-redis volumes via misp-robot\n \
46+
make restore-db | Restore misp-db volumes via misp-robot\n \
47+
make restore-proxy | Restore misp-proxy volumes via misp-robot\n \
48+
make restore-robot | Restore misp-robot volumes via misp-robot\n \
49+
\n Help: \n \
50+
make help | Show help\n"
51+
52+
# Start
53+
install: requirements build-config pull deploy
54+
@echo
55+
@echo " ########### MISP environment is ready ###########"
56+
@echo "Please go to: $(shell cat config/config.env|grep HOSTNAME|cut -d = -f 2)"
57+
@echo "Login credentials:"
58+
@echo " Username: [email protected]"
59+
@echo " Password: admin"
60+
@echo
61+
@echo "Do not forget to change your SSL certificate with: make change-ssl"
62+
@echo "Do not forget to change your S/MIME certificate with: make change-smime"
63+
@echo "Do not forget to change your PGP certificate with: make change-pgp'"
64+
@echo " ##########################################################"
65+
@echo
66+
67+
#################### used as host ####################
68+
# Check requirements
69+
requirements:
70+
@echo " ########### Checking Requirements ###########"
71+
@scripts/requirements.sh
72+
@sleep 2
73+
74+
support:
75+
make -C ../ support
76+
77+
# Build Configuration
78+
build-config:
79+
@echo " ########### Build Configuration ###########"
80+
@scripts/build_config.sh $(REPOURL)
81+
@sleep 2
82+
83+
# Start Docker environment
84+
pull:
85+
@echo " ########### Pull Environment ###########"
86+
docker run \
87+
--name misp-robot-init \
88+
--rm \
89+
--network="host" \
90+
-v $(CURDIR):/srv/MISP-dockerized \
91+
-v $(CURDIR)/scripts:/srv/scripts:ro \
92+
-v ~/.docker:/root/.docker:ro \
93+
-v /var/run/docker.sock:/var/run/docker.sock:ro \
94+
$(shell cat $(CURDIR)/config/config.env|grep DOCKER_REGISTRY|cut -d = -f 2)/misp-dockerized-robot:$(shell cat $(CURDIR)/config/config.env|grep ROBOT_CONTAINER_TAG|cut -d = -f 2) bash -c "docker-compose -f /srv/MISP-dockerized/docker-compose.yml -f /srv/MISP-dockerized/docker-compose.override.yml pull "
95+
deploy:
96+
@echo " ########### Deploy Environment ###########"
97+
docker run \
98+
--name misp-robot-init \
99+
--rm \
100+
--network="host" \
101+
-v $(CURDIR):/srv/MISP-dockerized \
102+
-v $(CURDIR)/scripts:/srv/scripts:ro \
103+
-v ~/.docker:/root/.docker:ro \
104+
-v /var/run/docker.sock:/var/run/docker.sock:ro \
105+
$(shell cat $(CURDIR)/config/config.env|grep DOCKER_REGISTRY|cut -d = -f 2)/misp-dockerized-robot:$(shell cat $(CURDIR)/config/config.env|grep ROBOT_CONTAINER_TAG|cut -d = -f 2) bash -c "docker-compose -f /srv/MISP-dockerized/docker-compose.yml -f /srv/MISP-dockerized/docker-compose.override.yml up -d "
106+
107+
# delete all misp container, volumes and images
108+
delete: copy-ssl
109+
scripts/delete_all_misp_from_host.sh
110+
111+
# stop all misp docker container
112+
stop-all:
113+
docker stop misp-server
114+
docker stop misp-proxy
115+
docker stop misp-modules
116+
docker stop misp-robot
117+
118+
# start all misp docker container
119+
start-all:
120+
docker start misp-server
121+
docker start misp-proxy
122+
docker start misp-modules
123+
docker start misp-robot
124+
125+
# restart all misp docker container
126+
restart-all: stop-all start-all
127+
128+
# upgrade to a new version
129+
upgrade:
130+
@echo " ########### Upgrade MISP-dockerized to a new version ###########"
131+
@cd ../
132+
@UPGRADE.sh
133+
134+
# Update current MISP to all new functions in this Version without a new version
135+
update: install
136+
137+
138+
test:
139+
@make -C ../.ci test
140+
@echo
141+
@echo "#############################################"
142+
@echo "For the report output: cat $(CURDIR)/.travis/reports/*.xml"
143+
@echo "#############################################"
144+
145+
146+
#################### used in misp-robot ####################
147+
DOCKER_EXEC=docker exec -ti
148+
#DOCKER_EXEC= "docker run -it --rm "
149+
150+
# configure
151+
configure:
152+
@echo " ########### Configure Environment ########### "
153+
make copy-smime
154+
make copy-pgp
155+
make config-ssl
156+
157+
158+
change-ssl: config-ssl
159+
config-ssl: copy-ssl
160+
docker restart misp-server
161+
docker restart misp-proxy
162+
163+
# x509 SSL Certificate
164+
copy-ssl:
165+
-docker cp $(CURDIR)/config/ssl/cert.pem misp-proxy:/etc/nginx/ssl/
166+
-docker cp $(CURDIR)/config/ssl/key.pem misp-proxy:/etc/nginx/ssl/
167+
-docker cp misp-proxy:/etc/nginx/ssl/cert.pem $(CURDIR)/config/ssl/
168+
-docker cp misp-proxy:/etc/nginx/ssl/key.pem $(CURDIR)/config/ssl/
169+
170+
# S/MIME
171+
change-smime: copy-smime
172+
copy-smime:
173+
#$(DOCKER_EXEC) misp-robot /bin/bash -c "ansible-playbook -i 'localhost,' -c local -t smime /etc/ansible/playbooks/robot-playbook/site.yml"
174+
docker cp $(CURDIR)/config/smime/. misp-server:/var/www/MISP/.smime
175+
176+
# GnuPGP
177+
change-pgp: copy-pgp
178+
copy-pgp:
179+
#$(DOCKER_EXEC) misp-robot /bin/bash -c "ansible-playbook -i 'localhost,' -c local -t pgp /etc/ansible/playbooks/robot-playbook/site.yml"
180+
docker cp $(CURDIR)/config/pgp/. misp-server:/var/www/MISP/.pgp
181+
182+
# maintainence
183+
enable-maintenance:
184+
$(DOCKER_EXEC) misp-proxy /entrypoint_nginx.sh enable-maintenance
185+
docker restart misp-proxy
186+
disable-maintenance:
187+
$(DOCKER_EXEC) misp-proxy /entrypoint_nginx.sh disable-maintenance
188+
docker restart misp-proxy
189+
190+
# backup all services
191+
backup-all:
192+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup all"
193+
backup-server:
194+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup server"
195+
backup-redis:
196+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup redis"
197+
backup-db:
198+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup mysql"
199+
backup-proxy:
200+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup proxy"
201+
backup-robot:
202+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh backup robot"
203+
backup-ssl: copy-ssl
204+
205+
# restore service
206+
restore-all:
207+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore all"
208+
restore-server:
209+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore server"
210+
restore-redis:
211+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore redis"
212+
restore-db:
213+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore mysql"
214+
restore-proxy:
215+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore proxy"
216+
restore-robot:
217+
$(DOCKER_EXEC) misp-robot /bin/bash -c "scripts/backup_restore.sh restore robot"
218+

0 commit comments

Comments
 (0)