diff --git a/docker/app/frank.Dockerfile b/docker/app/frank.Dockerfile index 317be5e..91f6aae 100644 --- a/docker/app/frank.Dockerfile +++ b/docker/app/frank.Dockerfile @@ -1,7 +1,7 @@ FROM python:latest # Install Poetry -RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ +RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python - && \ cd /usr/local/bin && \ ln -s /opt/poetry/bin/poetry && \ poetry config virtualenvs.create false && \ diff --git a/docker/files/.env b/docker/files/.env index 4f28ce8..bad384a 100644 --- a/docker/files/.env +++ b/docker/files/.env @@ -2,17 +2,17 @@ HOST=0.0.0.0 PORT=80 LOG_LEVEL=WARN DEBUG=false -SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/petty +SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/petty{{ name }} MODULE_NAME=barker.main PROJECT_NAME=barker +MAX_WORKERS=4 REDIS_HOST=redis REDIS_PORT=6379 -SECRET_KEY=611f9393e58f85521d16d9497bfd847ced70f2b99e12a9c6af40b7bd05cc7b1d -MIDDLEWARE_SECRET_KEY=c4afceca1a +SECRET_KEY={{ secret_key }} +MIDDLEWARE_SECRET_KEY={{ middleware_key }} ALGORITHM=HS256 JWT_TOKEN_EXPIRE_MINUTES=30 NEW_DAY_OFFSET_MINUTES=420 TIMEZONE_OFFSET_MINUTES=330 ALEMBIC_LOG_LEVEL=INFO ALEMBIC_SQLALCHEMY_LOG_LEVEL=WARN -SQLALCHEMY_WARN_20=true diff --git a/docker/files/.env-chd b/docker/files/.env-chd deleted file mode 100644 index f85a34e..0000000 --- a/docker/files/.env-chd +++ /dev/null @@ -1,18 +0,0 @@ -HOST=0.0.0.0 -PORT=80 -LOG_LEVEL=WARN -DEBUG=false -SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettychd -MODULE_NAME=barker.main -PROJECT_NAME=barker -MAX_WORKERS=4 -REDIS_HOST=redis -REDIS_PORT=6379 -SECRET_KEY=d9e4facec94d7e0bf3d63ca03b1d78d834b158627b6593274f7fe27f6aed6db4 -MIDDLEWARE_SECRET_KEY=8d5f28b083 -ALGORITHM=HS256 -JWT_TOKEN_EXPIRE_MINUTES=30 -NEW_DAY_OFFSET_MINUTES=420 -TIMEZONE_OFFSET_MINUTES=330 -ALEMBIC_LOG_LEVEL=INFO -ALEMBIC_SQLALCHEMY_LOG_LEVEL=WARN diff --git a/docker/files/.env-mhl b/docker/files/.env-mhl deleted file mode 100644 index 2d8b1ca..0000000 --- a/docker/files/.env-mhl +++ /dev/null @@ -1,18 +0,0 @@ -HOST=0.0.0.0 -PORT=80 -LOG_LEVEL=WARN -DEBUG=false -SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettymhl -MODULE_NAME=barker.main -PROJECT_NAME=barker -MAX_WORKERS=4 -REDIS_HOST=redis -REDIS_PORT=6379 -SECRET_KEY=8b7f704ad1bbee3caa683a57440a6a371937fe5f64a7712a6a15bf3165c3c598 -MIDDLEWARE_SECRET_KEY=1aa5487223 -ALGORITHM=HS256 -JWT_TOKEN_EXPIRE_MINUTES=30 -NEW_DAY_OFFSET_MINUTES=420 -TIMEZONE_OFFSET_MINUTES=330 -ALEMBIC_LOG_LEVEL=INFO -ALEMBIC_SQLALCHEMY_LOG_LEVEL=WARN diff --git a/docker/files/.env-pkl b/docker/files/.env-pkl deleted file mode 100644 index 1c3a8af..0000000 --- a/docker/files/.env-pkl +++ /dev/null @@ -1,18 +0,0 @@ -HOST=0.0.0.0 -PORT=80 -LOG_LEVEL=WARN -DEBUG=false -SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettypkl -MODULE_NAME=barker.main -PROJECT_NAME=barker -MAX_WORKERS=4 -REDIS_HOST=redis -REDIS_PORT=6379 -SECRET_KEY=bd6e5dee0f3b8a6f0db50f7aa08e91d55b2ae5ab6df126defa37e80602481002 -MIDDLEWARE_SECRET_KEY=1d34ef6597 -ALGORITHM=HS256 -JWT_TOKEN_EXPIRE_MINUTES=30 -NEW_DAY_OFFSET_MINUTES=420 -TIMEZONE_OFFSET_MINUTES=330 -ALEMBIC_LOG_LEVEL=INFO -ALEMBIC_SQLALCHEMY_LOG_LEVEL=WARN diff --git a/docker/files/build-frank.sh b/docker/files/build-frank.sh index a947138..d33a0d2 100755 --- a/docker/files/build-frank.sh +++ b/docker/files/build-frank.sh @@ -1 +1 @@ -docker build --file /home/pi/dockerfile/app/frank.Dockerfile --tag frank:latest /home/pi/dockerfile/app +docker build --file /home/{{ user }}/dockerfile/app/frank.Dockerfile --tag frank:latest /home/{{ user }}/dockerfile/app diff --git a/docker/files/frank.env b/docker/files/frank.env index 1a23145..852a115 100644 --- a/docker/files/frank.env +++ b/docker/files/frank.env @@ -1,3 +1,3 @@ REDIS_HOST=localhost REDIS_PORT=6379 -QUEUE_NAME=tanshu-home +QUEUE_NAME="{{ queue_name }}" diff --git a/docker/files/frank.sh b/docker/files/frank.sh index 213b496..b04cdea 100644 --- a/docker/files/frank.sh +++ b/docker/files/frank.sh @@ -1 +1 @@ -docker run --detach --name frank --env-file=/home/pi/frank.env --network=host --restart=no --device /dev/usb/lp0:/printer frank:latest +docker run --detach --name frank --env-file=/home/{{ user }}/frank.env --network=host --restart=no --device /dev/usb/lp0:/printer frank:latest diff --git a/docker/hosts b/docker/hosts index 022b851..b05f45c 100644 --- a/docker/hosts +++ b/docker/hosts @@ -8,7 +8,7 @@ pkl ansible_host=beacon var_file=vars/pkl.yml chd ansible_host=beacon var_file=vars/chd.yml mhl ansible_host=beacon var_file=vars/mhl.yml -# hin ansible_host=beacon var_file=vars/hin.yml +hin ansible_host=beacon var_file=vars/hin.yml [all:vars] ansible_python_interpreter=/usr/bin/python3 diff --git a/docker/playbook-frank.yml b/docker/playbook-frank.yml index 30c30ed..fde3d67 100755 --- a/docker/playbook-frank.yml +++ b/docker/playbook-frank.yml @@ -9,20 +9,20 @@ tasks: - name: Copy dockerfile - synchronize: src=app dest=/home/pi/dockerfile + synchronize: src=app dest="/home/{{ user }}/dockerfile" - name: Build frank image docker_image: name: frank:latest build: - path: /home/pi/dockerfile/app - dockerfile: /home/pi/dockerfile/app/frank.Dockerfile + path: "/home/{{ user }}/dockerfile/app" + dockerfile: "/home/{{ user }}/dockerfile/app/frank.Dockerfile" pull: yes state: present source: build - name: Check if frank .env file exists - stat: path="/home/pi/frank.env" + stat: path="/home/{{ user }}/frank.env" register: status - name: No need to upload the frank .env file @@ -32,9 +32,9 @@ when: status.stat.exists == false template: src: files/frank.env - dest: /home/pi/frank.env - group: pi - owner: pi + dest: "/home/{{ user }}/frank.env" + group: "{{ user }}" + owner: "{{ user }}" mode: 0644 - name: Create frank worker container @@ -43,7 +43,7 @@ image: frank:latest state: started restart_policy: "no" - env_file: "/home/pi/frank.env" + env_file: "/home/{{ user }}/frank.env" network_mode: "host" devices: - "{{ printer_port }}:/printer" @@ -51,17 +51,17 @@ - name: Copy docker build script template: src: files/build-frank.sh - dest: /home/pi/dockerfile/build-frank.sh - group: pi - owner: pi + dest: "/home/{{ user }}/dockerfile/build-frank.sh" + group: "{{ user }}" + owner: "{{ user }}" mode: 0644 - name: Copy docker run script template: src: files/frank.sh - dest: /home/pi/dockerfile/frank.sh - group: pi - owner: pi + dest: "/home/{{ user }}/dockerfile/frank.sh" + group: "{{ user }}" + owner: "{{ user }}" mode: 0644 - name: install frank systemd unit file diff --git a/docker/roles/upload/tasks/main.yaml b/docker/roles/upload/tasks/main.yaml index c5dd585..5cb3300 100644 --- a/docker/roles/upload/tasks/main.yaml +++ b/docker/roles/upload/tasks/main.yaml @@ -17,5 +17,5 @@ - name: Upload the .env file template: - src: "{{ env_file }}" + src: "files/.env" dest: "/var/lib/{{ host_directory }}/.env" diff --git a/docker/vars/chd.yml b/docker/vars/chd.yml index 034538d..c04007a 100644 --- a/docker/vars/chd.yml +++ b/docker/vars/chd.yml @@ -1,6 +1,9 @@ --- +name: chd +secret_key: d9e4facec94d7e0bf3d63ca03b1d78d834b158627b6593274f7fe27f6aed6db4 +middleware_key: 8d5f28b083 + http_host: "knox.greatbear.in" http_conf: "knox.greatbear.in.conf" host_port: "8337" -host_directory: "barker-chd" -env_file: "files/.env-chd" +host_directory: "barker-{{ name }}" diff --git a/docker/vars/default.yml b/docker/vars/default.yml index 032ec33..88c192f 100644 --- a/docker/vars/default.yml +++ b/docker/vars/default.yml @@ -1,5 +1,11 @@ --- +name: xxx +# openssl rand -hex 32 +secret_key: 0000000000000000000000000000000000000000000000000000000000000000 +# openssl rand -hex 5 +middleware_key: 0000000000 + http_host: "knox.hopsngrains.com" http_conf: "knox.hopsngrains.com.conf" host_port: "8338" -host_directory: "barker" +host_directory: "barker-{{ name }}" diff --git a/docker/vars/frank.yml b/docker/vars/frank.yml index 5ad71e6..7ec56e0 100644 --- a/docker/vars/frank.yml +++ b/docker/vars/frank.yml @@ -1,2 +1,4 @@ --- printer_port: "/dev/usb/lp0" +user: vari +queue_name: moz-main diff --git a/docker/vars/hin.yml b/docker/vars/hin.yml new file mode 100644 index 0000000..a11d54d --- /dev/null +++ b/docker/vars/hin.yml @@ -0,0 +1,9 @@ +--- +name: hin +secret_key: 029858927beda45d76317729824ae500d0938f04d4ca955f3afa95061c9a9298 +middleware_key: c4b0b98ff9 + +http_host: "knox.mozimo.in" +http_conf: "knox.mozimo.in.conf" +host_port: "8335" +host_directory: "barker-{{ name }}" diff --git a/docker/vars/mhl.yml b/docker/vars/mhl.yml index 981c603..2d4fc91 100644 --- a/docker/vars/mhl.yml +++ b/docker/vars/mhl.yml @@ -1,6 +1,9 @@ --- +name: mhl +secret_key: 8b7f704ad1bbee3caa683a57440a6a371937fe5f64a7712a6a15bf3165c3c598 +middleware_key: 1aa5487223 + http_host: "knox.hngmohali.com" http_conf: "knox.hngmohali.com.conf" host_port: "8336" -host_directory: "barker-mhl" -env_file: "files/.env-mhl" +host_directory: "barker-{{ name }}" diff --git a/docker/vars/pkl.yml b/docker/vars/pkl.yml index c9232a3..850145c 100644 --- a/docker/vars/pkl.yml +++ b/docker/vars/pkl.yml @@ -1,6 +1,9 @@ --- +name: pkl +secret_key: bd6e5dee0f3b8a6f0db50f7aa08e91d55b2ae5ab6df126defa37e80602481002 +middleware_key: 1d34ef6597 + http_host: "knox.hopsngrains.com" http_conf: "knox.hopsngrains.com.conf" host_port: "8338" -host_directory: "barker-pkl" -env_file: "files/.env-pkl" +host_directory: "barker-{{ name }}"