Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Move Pandora from port 8011 to 8002

Browse Source
This commit is contained in:
Disassembler 2018-01-27 22:35:55 +01:00
parent 5a67551dd4
commit 79cea15bca
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora.sh
View File

@ -21,7 +21,7 @@ docker exec rabbitmq rabbitmqctl set_permissions -p /pandora pandora ".*" ".*" "
# Configure Pandora # Configure Pandora
mkdir -p /srv/pandora/conf /srv/pandora/data mkdir -p /srv/pandora/conf /srv/pandora/data
chown 8011:8011 /srv/pandora/data chown 8002:8002 /srv/pandora/data
cp ${SOURCE_DIR}/srv/pandora/conf/config.jsonc /srv/pandora/conf/config.jsonc cp ${SOURCE_DIR}/srv/pandora/conf/config.jsonc /srv/pandora/conf/config.jsonc
cp ${SOURCE_DIR}/srv/pandora/conf/gunicorn_config.py /srv/pandora/conf/gunicorn_config.py cp ${SOURCE_DIR}/srv/pandora/conf/gunicorn_config.py /srv/pandora/conf/gunicorn_config.py
envsubst <${SOURCE_DIR}/srv/pandora/conf/local_settings.py >/srv/pandora/conf/local_settings.py envsubst <${SOURCE_DIR}/srv/pandora/conf/local_settings.py >/srv/pandora/conf/local_settings.py
@ -54,4 +54,4 @@ cp ${SOURCE_DIR}/etc/nginx/conf.d/pandora.conf /etc/nginx/conf.d/pandora.conf
service nginx reload service nginx reload
# Add portal application definition # Add portal application definition
portal-app-manager pandora "https://{host}:8411/" "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}" portal-app-manager pandora "https://{host}:8402/" "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}"

12
pandora/Dockerfile
View File

@ -60,16 +60,16 @@ RUN \
&& ./manage.py compile_pyc -p /srv/pandora/pandora \ && ./manage.py compile_pyc -p /srv/pandora/pandora \
&& ./manage.py collectstatic -l --noinput \ && ./manage.py collectstatic -l --noinput \
# Create OS user # Create OS user
&& addgroup -S -g 8011 pandora \ && addgroup -S -g 8002 pandora \
&& adduser -S -u 8011 -h /srv/pandora -s /bin/false -g pandora -G pandora pandora \ && adduser -S -u 8002 -h /srv/pandora -s /bin/false -g pandora -G pandora pandora \
&& chown -R 8011:8011 /srv/pandora \ && chown -R 8002:8002 /srv/pandora \
# Cleanup # Cleanup
&& apk del .deps \ && apk del .deps \
&& find /srv/pandora -name '.git*' -exec rm -rf {} + \ && find /srv/pandora -name '.git*' -exec rm -rf {} + \
&& rm -rf /tmp/lib* /tmp/oxframe \ && rm -rf /tmp/lib* /tmp/oxframe \
&& rm -rf /root/.cache /root/.ox && rm -rf /root/.cache /root/.ox
COPY --chown=8011:8011 docker/srv/ /srv/ COPY --chown=8002:8002 docker/srv/ /srv/
RUN \ RUN \
# Update static files for Czech translation # Update static files for Czech translation
@ -84,12 +84,12 @@ RUN \
&& ln -s /srv/pandora/conf/config.jsonc config.jsonc \ && ln -s /srv/pandora/conf/config.jsonc config.jsonc \
&& ln -s /srv/pandora/conf/gunicorn_config.py gunicorn_config.py \ && ln -s /srv/pandora/conf/gunicorn_config.py gunicorn_config.py \
&& ln -s /srv/pandora/conf/local_settings.py local_settings.py \ && ln -s /srv/pandora/conf/local_settings.py local_settings.py \
&& chown -R 8011:8011 /srv/pandora && chown -R 8002:8002 /srv/pandora
COPY docker/etc/ /etc/ COPY docker/etc/ /etc/
VOLUME ["/srv/pandora/conf", "/srv/pandora/data"] VOLUME ["/srv/pandora/conf", "/srv/pandora/data"]
EXPOSE 8011 EXPOSE 8002
WORKDIR /srv/pandora WORKDIR /srv/pandora
CMD ["s6-svscan", "/etc/services.d"] CMD ["s6-svscan", "/etc/services.d"]

2
pandora/docker/etc/nginx/nginx.conf
View File

@ -19,7 +19,7 @@ http {
tcp_nodelay on; tcp_nodelay on;
server { server {
listen 8011; listen 8002;
server_name localhost; server_name localhost;
location /favicon.ico { location /favicon.ico {

2
pandora/docker/etc/services.d/pandora-cron/run
View File

@ -3,5 +3,5 @@
cd /srv/pandora/pandora cd /srv/pandora/pandora
export HOME /srv/pandora export HOME /srv/pandora
fdmove -c 2 1 fdmove -c 2 1
s6-setuidgid 8011:8011 s6-setuidgid 8002:8002
./manage.py celerybeat -s /srv/pandora/data/celerybeat-schedule --pidfile pandora-cron.pid -l INFO ./manage.py celerybeat -s /srv/pandora/data/celerybeat-schedule --pidfile pandora-cron.pid -l INFO

2
pandora/docker/etc/services.d/pandora-encoding/run
View File

@ -3,5 +3,5 @@
cd /srv/pandora/pandora cd /srv/pandora/pandora
export HOME /srv/pandora export HOME /srv/pandora
fdmove -c 2 1 fdmove -c 2 1
s6-setuidgid 8011:8011 s6-setuidgid 8002:8002
./manage.py celery worker -Q encoding -n pandora-encoding --pidfile pandora-encoding.pid --maxtasksperchild 500 -l INFO ./manage.py celery worker -Q encoding -n pandora-encoding --pidfile pandora-encoding.pid --maxtasksperchild 500 -l INFO

2
pandora/docker/etc/services.d/pandora-tasks/run
View File

@ -3,5 +3,5 @@
cd /srv/pandora/pandora cd /srv/pandora/pandora
export HOME /srv/pandora export HOME /srv/pandora
fdmove -c 2 1 fdmove -c 2 1
s6-setuidgid 8011:8011 s6-setuidgid 8002:8002
./manage.py celery worker -Q default,celery -n pandora-default --pidfile pandora-tasks.pid --maxtasksperchild 1000 -l INFO ./manage.py celery worker -Q default,celery -n pandora-default --pidfile pandora-tasks.pid --maxtasksperchild 1000 -l INFO

2
pandora/docker/etc/services.d/pandora/run
View File

@ -3,5 +3,5 @@
cd /srv/pandora/pandora cd /srv/pandora/pandora
export HOME /srv/pandora export HOME /srv/pandora
fdmove -c 2 1 fdmove -c 2 1
s6-setuidgid 8011:8011 s6-setuidgid 8002:8002
gunicorn -c gunicorn_config.py wsgi:application gunicorn -c gunicorn_config.py wsgi:application

2
pandora/etc/init.d/pandora
View File

@ -14,7 +14,7 @@ start() {
-h pandora \ -h pandora \
--link postgres \ --link postgres \
--link rabbitmq \ --link rabbitmq \
-p 127.0.0.1:9011:8011 \ -p 127.0.0.1:9011:8002 \
-v /srv/pandora/conf:/srv/pandora/conf \ -v /srv/pandora/conf:/srv/pandora/conf \
-v /srv/pandora/data:/srv/pandora/data \ -v /srv/pandora/data:/srv/pandora/data \
pandora pandora

4
pandora/etc/nginx/conf.d/pandora.conf
View File

@ -1,6 +1,6 @@
server { server {
listen [::]:8011 ipv6only=off; listen [::]:8002 ipv6only=off;
listen [::]:8411 ssl http2 ipv6only=off; listen [::]:8402 ssl http2 ipv6only=off;
access_log /var/log/nginx/pandora.access.log; access_log /var/log/nginx/pandora.access.log;
error_log /var/log/nginx/pandora.error.log; error_log /var/log/nginx/pandora.error.log;