sync cli

typos
checkouts
2021-03-16 22:20:54 -04:00 · 2021-03-16 20:16:56 -04:00 · 2021-03-16 17:04:45 -04:00 · 2021-03-16 16:52:46 -04:00 · 2021-03-12 18:04:21 +00:00 · 2021-03-12 18:04:21 +00:00
55 changed files with 984 additions and 666 deletions
@@ -17,8 +17,8 @@ include:
 docker_build:
  stage: test
  script:
+    - apk add bash
    - apk add docker-compose
-    - scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
-    - cp compose/production/traefik/traefik.toml.template compose/production/traefik/traefik.toml
+    - bash scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
    - docker-compose -f base.yml build

@@ -1,6 +1,12 @@
 # Mistborn
 A secure platform for easily standing up and managing your own cloud services: including firewall, ad-blocking, and multi-factor Wireguard VPN access

+![Mistborn Wireguard](https://gitlab.com/cyber5k/public/-/raw/master/graphics/home.mistborn_wireguard_.png)*Wireguard Management in Mistborn*
+
+As featured in [Linux Magazine](https://www.linux-magazine.com/Issues/2020/240/Mistborn/(language)/eng-US) (Linux Pro Magazine in North America) in November 2020
+
+![Mistborn Featured in Linux Magazine](https://gitlab.com/cyber5k/public/-/raw/master/graphics/linux-magazine-cover-nov-2020.jpg "Mistborn featured in Linux Magazine November 2020")
+
 # Table of Contents
 [[_TOC_]]

@@ -20,6 +26,8 @@ Ideal for teams who:
 - want to limit or stop data collecting services
 - want to prevent being detected/blocked for using a proxy or VPN service

+See the [Mistborn Network Security](https://gitlab.com/cyber5k/mistborn/-/wikis/Mistborn-Network-Security) wiki page to see the network scan results for Mistborn.
+
 Mistborn depends on these core open source technologies:
 - [Docker](https://www.docker.com/why-docker): containerization
 - [Wireguard](https://www.wireguard.com): secure VPN access
@@ -42,13 +50,19 @@ Within Mistborn is a panel to enable and manage these free extra services (off b
 - [Jellyfin](https://jellyfin.org): The Free Media Software System.
 - [Tor](https://www.torproject.org): The Onion Router. One tool in the arsenal of online security and privacy.
 - [Jitsi](https://jitsi.org): Multi-platform open-source video conferencing
+- [Guacamole](https://guacamole.apache.org): A clientless remote desktop gateway that supports standard protocols like VNC, RDP, and SSH.

 # Quickstart
 Tested Operating Systems (in order of thoroughness):
 - Ubuntu 20.04 LTS
 - Ubuntu 18.04 LTS
 - Debian 10 (Buster)
- Raspbian Buster
+- Raspberry Pi OS (formerly Raspbian) Buster
+
+**Note:** Install operating system updates and restart. Raspberry Pi OS particularly needs to be restarted after kernel updates (kernel modules for the currently running kernel may be missing).
+
+Tested Browsers:
+- Firefox

 The default tests are run on DigitalOcean Droplets: 2GB RAM, 1 CPU, 50GB hard disk.

@@ -56,22 +70,22 @@ The Mistborn docker images exist for these architectures:

 | Mistborn Docker Images (hub.docker.com)        | Architectures       |
 |------------------------------------------------|---------------------|
-| mistborn (django, celery{worker,beat}, flower) | amd64, arm64, armv7 |
-| dnscrypt-proxy                                 | amd64, arm64, armv7 |
+| mistborn (django, celery{worker,beat})         | amd64, arm64, arm/v7 |
+| dnscrypt-proxy                                 | amd64, arm64, arm/v7 |

 Recommended System Specifications:

 | Use Case               | Description                                                                   | RAM   | Hard Disk |
 |------------------------|-------------------------------------------------------------------------------|-------|-----------|
-| Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 1 GB  | 15 GB     |
-| Default                | Bare bones + Cockpit                                                          | 2 GB  | 15 GB     |
-| Low-resource services  | Default + Bitwarden, Tor, Syncthing                                           | 3 GB  | 20 GB     |
-| High-resource services | Default + Jitsi, Nextcloud, Jellyfin, Rocket.Chat, Home Assistant, OnlyOffice | 4 GB+ | 25 GB+    |
+| Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 2 GB  | 15 GB     |
+| Default                | Bare bones + Cockpit                                                          | 2 GB+ | 15 GB     |
+| Low-resource services  | Default + Bitwarden, Tor, Syncthing                                           | 4 GB  | 20 GB     |
+| High-resource services | Default + Jitsi, Nextcloud, Jellyfin, Rocket.Chat, Home Assistant, OnlyOffice | 6 GB+ | 25 GB+    |

 Starting from base installation
 ```
 git clone https://gitlab.com/cyber5k/mistborn.git
-sudo bash ./mistborn/scripts/install.sh
+sudo -E bash ./mistborn/scripts/install.sh
 ```

 Get default admin Wireguard profile
@@ -92,6 +106,8 @@ Mistborn protects your data in a variety of ways:
 - The Mistborn firewall blocks unsolicited incoming internet packets
 - Pi-hole running on Mistborn blocks outgoing internet requests to configurable blocked domains (ads, malicious/phishing domains, etc.) 

+See the [Mistborn Network Security](https://gitlab.com/cyber5k/mistborn/-/wikis/Mistborn-Network-Security) wiki page to see more network diagrams and the network scan results for Mistborn.
+
 # Coppercloud
 Pihole provides a way to block outgoing DNS requests for given lists of blocked domains. Coppercloud provides a way to block outgoing network calls of all types to given lists of IP addresses (IPv4 only for now). This is especially useful for blocking outgoing telemetry (data and state sharing) to owners of software running on all of your devices.

@@ -106,19 +122,33 @@ We were getting frustrated at being forced to choose between being connected to

 *Netflix blocking my connections that it sees coming from a DigitalOcean droplet*

-In Mistborn, Gateways are upstream from the VPN server so connections to third-party services (e.g. Netflix, Hulu, etc.) will appear to be coming from the public IP address of the Gateway. I setup a Gateway at home (Mistborn on DigitalOcean) then all Wireguard profiles created with this Gateway will appear to be coming from my house and are not blocked. No port-forwarding required (assuming Mistborn is publicly accessible).
+In Mistborn, Gateways are upstream from the VPN server so connections to third-party services (e.g. Netflix, Hulu, etc.) will appear to be coming from the public IP address of the Gateway. I setup a Gateway at home (Raspberry Pi with `wireguard` and `openresolv` installed) and with our Mistborn on DigitalOcean, all Wireguard profiles created with this Gateway will appear to be coming from my house and are not blocked. No port-forwarding required (assuming Mistborn is publicly accessible).

 ![Mistborn Gateway Diagram](https://gitlab.com/cyber5k/public/-/raw/master/graphics/gateway_network.png)

 The Gateway adds an extra network hop. DNS is still resolved in Mistborn so pihole is still blocking ads.

+# Remote Desktop
+Remote desktops enable multiple users to share desktop resources and data. Remote desktops also enable groups to prevent sensitive data from ever entering an endpoint devices such as a smartphone. For reference, some United States Government regulations require controls to protect Controlled Unclassified Information (CUI) that are not feasible to implement on all endpoint devices and remote desktops prevent the data from entering the device (see NIST SP 800-171 3.1.19, CMMC AC.3.022).
+
+Mistborn enables remote desktop access via the Apache Guacamole extra service, which supports VNC, RDP, SSH, and other protocols. 
+
+![Guacamole Recent Connections](https://gitlab.com/cyber5k/public/-/raw/master/graphics/guacamole_connections.png)
+
+Guacamole implements its own users and groups access controls to manage access to individual desktops. All Mistborn users must be authenticated with Mistborn (via Wireguard only or MFA) to access the Guacamole interface.
+
+# Client to client communication
+By default direct communication between network clients is blocked. Mistborn clients can all talk to Mistborn and communicate via shared services (Jitsi, Nextcloud, etc). Direct client to client communication can be enabled via the "client-to-client" toggle.
+
+![System Settings](https://gitlab.com/cyber5k/public/-/raw/master/graphics/system_settings_dropdown.png)
+
 # Installation
-Mistborn is regularly tested on Ubuntu 18.04 LTS (DigitalOcean droplet with 2 GB RAM). It has also been successfully used on Debian Buster and Raspbian Buster systems (though not regularly tested). Additionally tested on Ubuntu 20.04 LTS.
+Mistborn is regularly tested on Ubuntu 20.04 LTS (DigitalOcean droplet with 2 GB RAM). It has also been successfully used on Debian Buster and Raspbian Buster systems (though not regularly tested). Make sure to install OS updates and restart before installing Mistborn (Wireguard installs differently on recent kernels).

 Clone the git repository and run the install script:
 ```
 git clone https://gitlab.com/cyber5k/mistborn.git
-sudo bash ./mistborn/scripts/install.sh
+sudo -E bash ./mistborn/scripts/install.sh
 ```

 Running `install.sh` will do the following:
@@ -129,8 +159,8 @@ Running `install.sh` will do the following:
 - install Docker
 - install OpenSSH
 - install Wireguard
- install Cockpit
- create a `cockpit` system user
+- install Cockpit (optional)
+- create a `cockpit` system user (if Cockpit is installed)
 - configure unattended-upgrades
 - generate a self-signed TLS certificate/key (WebRTC functionality requires TLS)
 - create and populate traefik.toml
@@ -152,7 +182,7 @@ See the environment variables needed in `./scripts/noninteractive/.install_bareb
 This will perform a noninteractive install with the default environment variables set in `.install_barebones`.
 ```
 git clone https://gitlab.com/cyber5k/mistborn.git
-sudo bash -c "source ./mistborn/scripts/noninteractive/.install_barebones && ./mistborn/scripts/install.sh"
+sudo -E bash -c "source ./mistborn/scripts/noninteractive/.install_barebones && ./mistborn/scripts/install.sh"
 ```

 # Post-Installation
@@ -233,8 +263,10 @@ Internet access is blocked via iptables until authentication is completed for an

 ![Mistborn Multi Factor Authentication - Token Prompt](https://gitlab.com/cyber5k/public/-/raw/master/graphics/mfa_token_enter.png)*Mistborn Multi Factor Authentication - Token Prompt*

-### MFA Mistborn Service Access
-Mistborn service access is blocked via traefik until Mistborn authentication is complete. You will not be able to access the web pages for pihole, cockpit, or any extra services until authentication is complete for an MFA profile. Attempting to visit one of these pages will redirect you to [http://home.mistborn](http://home.mistborn) where you must complete the authentication process. Click "Sign Out" to re-block access until authentication completes again.
+### MFA Mistborn Service Access - Fixed on 4 December 2020
+Mistborn service access is blocked via traefik until Mistborn authentication is complete. You will not be able to access the web pages for pihole, cockpit, or any extra services until authentication is complete for an MFA profile. Attempting to visit one of these pages will produce a "Mistborn: Not authorized" HTTP 403. Click "Sign Out" to re-block access until authentication completes again.
+
+![Mistborn Multi Factor Authentication - Not Authorized](https://gitlab.com/cyber5k/public/-/raw/master/graphics/mfa_not_authorized.png)*Mistborn Multi Factor Authentication - Not Authorized (Login Incomplete)*

 ### Notes
 - **Sessions**: Traefik checks the authenticated sessions on the server side to determine whether to allow access to the Mistborn service web pages. If an open session exists for your Mistborn IP address then access will be granted. You may close all sessions by clicking "Sign Out" on the Mistborn home page. Expired sessions are regularly cleaned by the Mistborn system (celery periodic task).
@@ -255,6 +287,7 @@ Mistborn uses the following domains (that can be reached by all Wireguard client
 | Syncthing | syncthing.mistborn | Off |
 | OnlyOffice | onlyoffice.mistborn | Off |
 | Jitsi | jitsi.mistborn | Off |
+| Guacamole | guac.mistborn | Off |

 # Default Credentials
 These are the default credentials to use in the services you choose to use:
@@ -264,6 +297,9 @@ These are the default credentials to use in the services you choose to use:
 | Pihole |  | {{default mistborn password}} |
 | Cockpit | cockpit | {{default mistborn password}} |
 | Nextcloud | mistborn | {{default mistborn password}} |
+| Guacamole | mistborn | {{default mistborn password }} |
+
+You can find the credentials sent to the Docker containers in: `/opt/mistborn/.envs/.production/`

 # Gateway Setup
 Mistborn will generate the Wireguard configuration script for the Gateway. From a base Ubuntu/Debian/Raspbian operating system the following packages are recommended to be installed beforehand:
@@ -308,11 +344,11 @@ But wait, there's more! You can:
 | Jitsi Meet     | [Jitsi Meet](https://play.google.com/store/apps/details?id=org.jitsi.meet)                         | [Jitsi Meet](https://apps.apple.com/us/app/jitsi-meet/id1165103905)                |
 | Bitwarden      | [Bitwarden](https://play.google.com/store/apps/details?id=com.x8bit.bitwarden)                     | [Bitwarden](https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744) |
 | Jellyfin       | [Jellyfin](https://play.google.com/store/apps/details?id=org.jellyfin.mobile)                      | [Jellyfin](https://apps.apple.com/us/app/jellyfin-mobile/id1480192618)             |
-| Home Assistant | [Home Assistant](https://play.google.com/store/apps/details?id=io.homeassistant.companion.android) |                                                                                    |
+| Home Assistant | [Home Assistant](https://play.google.com/store/apps/details?id=io.homeassistant.companion.android) | [Home Assistant](https://apps.apple.com/us/app/home-assistant/id1099568401)                                                                                   |
 | Rocket.Chat    | [Rocket.Chat](https://play.google.com/store/apps/details?id=chat.rocket.android)                   | [Rocket.Chat](https://apps.apple.com/us/app/rocket-chat/id1148741252)              |

 ## TLS Certificate
-Some apps require TLS (HTTPS). All traffic to Mistborn domains already occurs over Wireguard but to keep apps running, a TLS certificate exists for Mistborn and can be imported into your device's trusted credentials in the security settings.
+Some apps require TLS (HTTPS). All traffic to Mistborn domains already occurs over Wireguard but to keep apps running, a TLS certificate exists for Mistborn and can be imported into your device's trusted credentials in the security settings. This certificate is checked every day and will be re-generated when expiration is less than 30 days away.

 The TLS certificate can be found here:
 ```
@@ -341,17 +377,48 @@ If Mistborn is installed via SSH then an iptables rule is added allowing externa

 SSH is permitted from any device connected to Mistborn by Wireguard.

-Password authentication in enabled. Mistborn disables password authentication for root. Fail2ban blocks IPs with excessive failed login attempts.
+Password authentication in enabled. Fail2ban blocks IPs with excessive failed login attempts.

 You can SSH using the Mistborn domain when connected by Wireguard:
 ```
 ssh user@home.mistborn
 ```

+## How do I change the upstream DNSCrypt servers?
+The upstream servers used by dnscrypt-proxy are set in:  
+
+`base.yml`:
+```
+services:
+...
+  dnscrypt-proxy:
+  ...
+    environment:
+    ...
+      - DNSCRYPT_SERVER_NAMES=[...]
+```
+
+The available options are here: https://download.dnscrypt.info/dnscrypt-resolvers/v2/public-resolvers.md
+
 # Troubleshooting

 Once you're connected to Wireguard you should see .mistborn domains and the internet should work as expected. Be sure to use http (http://home.mistborn). Wireguard is the encrypted channel so there's usually no need to bother with TLS certs (WebRTC functionality and some mobile apps require TLS so it is available). Here are some things to check if you have issues:

+Check if you can ping an external IP address:
+```
+ping 1.1.1.1
+```
+
+Check if you can resolve local DNS queries:
+```
+dig home.mistborn
+```
+
+Check if you can resolve external DNS queries:
+```
+dig cyber5k.com
+```
+
 See if any docker containers are stopped:
 ```
 sudo docker container ls -a
@@ -378,6 +445,9 @@ The `dev/` folder contains a script for completing a hard reset: destroying and
 sudo ./dev/rebuild.sh
 ```

+## Troubleshooting Wireguard
+Ensure that your public IP address in your client profile (e.g. `Endpoint = <Mistborn public IP address>:<random port>`) is actually publicly available (not in 10.0.0.0/8, 172.16.0.0/12, or 192.168.0.0/16) if you are attempting to access Mistborn across the internet.
+
 ## Troubleshooting Extra Services
 Each extra service has its own systemd process which can be monitored:
 ```
@@ -387,6 +457,7 @@ sudo journalctl -xfu Mistborn-syncthing
 sudo journalctl -xfu Mistborn-jellyfin
 sudo journalctl -xfu Mistborn-nextcloud
 sudo journalctl -xfu Mistborn-jitsi
+sudo journalctl -xfu Mistborn-guacamole
 sudo journalctl -xfu Mistborn-rocketchat
 sudo journalctl -xfu Mistborn-onlyoffice
 sudo journalctl -xfu Mistborn-tor
@@ -426,6 +497,9 @@ Run updates and restart before installing Mistborn (`sudo apt-get update && sudo
 These are some notes regarding the technical design and implementations of Mistborn. Feel free to contact me for additional details.

 ## Attack Surface
+
+See the [Mistborn Network Security](https://gitlab.com/cyber5k/mistborn/-/wikis/Mistborn-Network-Security) wiki entry.
+
 - **Wireguard**: Wireguard is the only way in to Mistborn. When new Wireguard profiles are generated they are attached to a random UDP port. Wireguard does not respond to unauthenticated traffic. External probes on the active Wireguard listening ports are not logged and do not appear on the Metrics page.
 - **SSH**: If Mistborn is installed over SSH (most common) then an iptables rule is added allowing future SSH connections from the same source IP address. All other external SSH is blocked. Internal SSH (over the Wireguard tunnels) is allowed. Password authentication is allowed. The SSH key for the `mistborn` user is only accepted from internal source IP addresses. Fail2ban is also installed.
 - **Traefik**: Iptables closes web ports (TCP 80 and 443) from external access and additonally all web interfaces are behind the Traefik reverse-proxy. All web requests (e.g. home.mistborn) must be resolved by Mistborn DNS (Pihole/dnsmasq) and originate from a Wireguard tunnel.
@@ -434,29 +508,36 @@ These are some notes regarding the technical design and implementations of Mistb
 ## Firewall
 - **IPtables**: Iptables rules and chains are manipulated directly. If UFW is present it is disabled. IPtables-persistent is used to save a simple set of secure default rules (most importantly setting the INPUT and FORWARD policies to DROP and allowing ESTABLISHED and RELATED traffic) that will be effective immediately upon system startup. Additional rules and chains are created by Docker on startup. Mistborn also creates some iptables chains during installation that are saved in the persistent rules. Mistborn iptables chains and rules are designed to work with Docker's with logic that is easy to follow. A power cycle will always result in a working state.
 - **PostUp/PostDown**: Wireguard configuration files on Mistborn include PostUp and PostDown directives that set routes and iptables rules for each Wireguard client individually.
- **Wireguard**: There is a one-to-one mapping between each Wireguard client and server instance listening on Mistborn. By design Wireguard clients cannot talk directly to each other but can use shared services and resources on Mistborn (e.g. Syncthing, Nextcloud, Jitisi, etc.)
+- **Wireguard**: There is a one-to-one mapping between each Wireguard client and server instance listening on Mistborn. By default Wireguard clients cannot talk directly to each other but can use shared services and resources on Mistborn (e.g. Syncthing, Nextcloud, Jitisi, etc). Toggling the "client-to-client" option will enable direct client-to-client communication.
 - **Metrics**: In addition to the iptables INPUT policy set to DROP, an iptables chain exists that logs the packet meta data before dropping it. Mistborn redirects packets that will be dropped to this chain instead. A summary of the data about these dropped packets (unsolicited network traffic) can be found on the Metrics page.
 - **Coppercloud**: Coppercloud works by populating ipsets with the ipset module in iptables to DROP (blacklist) or ACCEPT (whitelist) a given set of IP addresses. Upon system startup a celery task will compile the IP addresses, create the ipsets, and iptables rules.

 ## Additonal Notes
 - Interface names are not hardcoded anywhere in Mistborn. Two commands that are used in different circumstances to determine the default network interface and the interface that would route a public IP address are: `ip -o -4 route show to default` and `ip -o -4 route get 1.1.1.1`.
 - The "Update" button will pull updated Docker images for mistborn, postgresql, redis, pihole, and dnscrypt. Those services will then be restarted.
- The generated TLS certificate has an RSA modulus of 4096 bits, is signed with SHA-256, and is good for 10 years. The nanny at Apple has decided to restrict the kinds of certificates iOS users may choose to manually trust and so you may have issues with TLS on an Apple device for now.
+- The generated TLS certificate has an RSA modulus of 4096 bits, is signed with SHA-256, and is good for 397 days. The certificate is checked daily and will regenerate when expiration is within 30 days.
 - Outbound UDP on port 53 is blocked. All DNS requests should be handled by the dnscrypt_proxy service and if any client, service, etc. tries to circumvent that it is blocked.
 - Unattended upgrades are set to automatically install operating system security updates.
+- Ownership of mistborn files is set to the system mistborn user and access to environment variables is disabled for users other than the owner.

-# Roadmap
+# Roadmap (not necessarily in order)
 Many features and refinements are in the works at various stages including:

- Option to upload metrics information to Cyber5K to refine each Mistborn instance's firewall
- Option to email default admin Wireguard config file
- Adding more extra services (e.g. Gitlab, Game Servers, etc.)
- Cyber5K marketplace to share Gateway access (to fixed IP addresses or domains, and for a fixed amount of time)
- Mistborn managing wireless interfaces for local access points (stripped down RaspAP)
- Optional periodic backup of local Mistborn config files and credentials to Cyber5K
+- Plugins for Extra Services (enabling third-party development)
+- Plugin repository
+- IPv6 support
+- Integration with RaspAP to enable managing an Access Point for local network connections
 - Internal network scan tool and feedback
 - Anomaly detection in network traffic

+# Featured In
+
+- [Linux Magazine](https://www.linux-magazine.com/Issues/2020/240/Mistborn/(language)/eng-US) November 2020 (featuring Mistborn version from early May 2020)
+- [Awesome Open Source](https://www.youtube.com/watch?v=hekP0_crotw) July 2020 (featuring Mistborn version from early July 2020)
+
+# Follow
+You can find recent bugfixes, functional additions, some extra documentation and more at the Cyber5K Patreon page: [https://www.patreon.com/cyber5k](https://www.patreon.com/cyber5k)
+
 # Contact

 Contact me at [steven@cyber5k.com](mailto:steven@cyber5k.com)
@@ -465,4 +546,5 @@ Contact me at [steven@cyber5k.com](mailto:steven@cyber5k.com)

 Please consider supporting the project via:
 - [Paypal.me](https://paypal.me/cyber5k)
+- [Buy me a drink](https://www.buymeacoffee.com/cyber5k)
 - [Patreon](https://www.patreon.com/cyber5k)
@@ -12,9 +12,18 @@ services:
    depends_on:
      - postgres
      - redis
+    ports:
+      - "10.2.3.1:5000:5000/tcp" # auth access
    labels:
      - "traefik.enable=true"
-      - "traefik.port=5000"
+      - "traefik.http.routers.django-http.rule=Host(`home.mistborn`)"
+      - "traefik.http.routers.django-http.entrypoints=web"
+      - "traefik.http.routers.django-http.middlewares=mistborn_headers@file"
+      - "traefik.http.routers.django-https.rule=Host(`home.mistborn`)"
+      - "traefik.http.routers.django-https.entrypoints=websecure"
+      - "traefik.http.routers.django-https.middlewares=mistborn_headers@file"
+      - "traefik.http.routers.django-https.tls.certresolver=basic"
+      - "traefik.http.services.django-service.loadbalancer.server.port=5000"
    env_file:
      - ./.envs/.production/.django
      - ./.envs/.production/.postgres
@@ -38,20 +47,41 @@ services:
    restart: unless-stopped

  traefik:
-    build:
-      context: .
-      dockerfile: ./compose/production/traefik/Dockerfile
-    image: mistborn_production_traefik
+    #build:
+    #  context: .
+    #  dockerfile: ./compose/production/traefik/Dockerfile
+    #image: mistborn_production_traefik
+    image: traefik:v2.2
    container_name: mistborn_production_traefik
    depends_on:
      - django
    volumes:
-      - production_traefik:/etc/traefik/acme
+      #- production_traefik:/etc/traefik/acme
+      - ./compose/production/traefik/dynamic.toml:/dynamic.toml:ro
      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ../mistborn_volumes/base/tls:/tls
-    ports:
-      - "0.0.0.0:80:80/tcp"
-      - "0.0.0.0:443:443/tcp"
+      - ../mistborn_volumes/base/tls:/tls:ro
+    network_mode: host
+      #ports:
+    #  - "0.0.0.0:80:80/tcp"
+    #  - "0.0.0.0:443:443/tcp"
+    #  #- "0.0.0.0:8080:8080/tcp" # dashboard
+    command:
+      ## API settings
+      #- --api.insecure=true
+      #- --api.dashboard=true
+      #- --api.debug=true
+      ## Logs
+      - --log.level=ERROR
+      ## Providers
+      - --providers.docker=true
+      - --providers.docker.exposedbydefault=false
+      - --providers.file.filename=/dynamic.toml
+      #- --providers.docker.network=default
+      ## Entrypoints
+      - --entrypoints.web.address=:80
+      - --entrypoints.websecure.address=:443
+      ## Certificates
+      #- --serversTransport.insecureSkipVerify=true
    restart: unless-stopped

  redis:
@@ -115,27 +145,36 @@ services:
    restart: unless-stopped
    

-  flower:
-    image: "cyber5k/mistborn:${MISTBORN_TAG}"
-    container_name: mistborn_production_flower
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
-    ports:
-      - "5555:5555/tcp"
-    command: /start-flower
-    restart: unless-stopped
+  #flower:
+  #  image: "cyber5k/mistborn:${MISTBORN_TAG}"
+  #  container_name: mistborn_production_flower
+  #  env_file:
+  #    - ./.envs/.production/.django
+  #    - ./.envs/.production/.postgres
+  #  ports:
+  #    - "5555:5555/tcp"
+  #  command: /start-flower
+  #  restart: unless-stopped
  
  pihole:
   container_name: mistborn_production_pihole
   image: pihole/pihole:latest
   env_file:
-     - /opt/mistborn_volumes/base/base.txt
+     - ./.envs/.production/.pihole
   ports:
     - "${MISTBORN_DNS_BIND_IP}:53:53/tcp"
     - "${MISTBORN_DNS_BIND_IP}:53:53/udp"
   labels:
      - "traefik.enable=true"
+      - "traefik.http.routers.pihole-http.rule=Host(`pihole.mistborn`)"
+      - "traefik.http.routers.pihole-http.entrypoints=web"
+      - "traefik.http.routers.pihole-http.middlewares=mistborn_auth@file,add-pihole-admin"
+      - "traefik.http.routers.pihole-https.rule=Host(`pihole.mistborn`)"
+      - "traefik.http.routers.pihole-https.entrypoints=websecure"
+      - "traefik.http.routers.pihole-https.middlewares=mistborn_auth@file,add-pihole-admin"
+      - "traefik.http.routers.pihole-https.tls.certresolver=basic"
+      - "traefik.http.middlewares.add-pihole-admin.addPrefix.prefix=/admin"
+      - "traefik.http.services.pihole-service.loadbalancer.server.port=80"
   environment:
     - ServerIP=10.2.0.3
     - DNS1='10.2.0.2#5054' # docs say port 5054, was 54; use network_mode: host to see which port is used
@@ -144,8 +183,6 @@ services:
     - DNSMASQ_LISTENING=all
   #  TZ: 'America/New York'
   # Volumes store your data between container upgrades
-   env_file:
-     - ./.envs/.production/.pihole
   volumes:
     - ../mistborn_volumes/base/pihole/etc-pihole:/etc/pihole/
     - ../mistborn_volumes/base/pihole/etc-dnsmasqd:/etc/dnsmasq.d/
@@ -7,7 +7,7 @@ RUN apk update \

 EXPOSE 9150

-ADD ./compose/production/tor/torrc /etc/tor/torrc
+ADD ./torrc /etc/tor/torrc

 USER tor
 CMD /usr/bin/tor -f /etc/tor/torrc
@@ -1,5 +1,5 @@
-FROM traefik:alpine
+FROM traefik:v2.2
 RUN mkdir -p /etc/traefik/acme
 RUN touch /etc/traefik/acme/acme.json
 RUN chmod 600 /etc/traefik/acme/acme.json
-COPY ./compose/production/traefik/traefik.toml /etc/traefik
+#COPY ./compose/production/traefik/dynamic.toml /etc/traefik
@@ -0,0 +1,31 @@
+[tls.stores]
+  [tls.stores.default]
+    [tls.stores.default.defaultCertificate]
+      certFile = "/tls/cert.crt"
+      keyFile = "/tls/cert.key"
+
+[tls.options]
+  [tls.options.default]
+    minVersion = "VersionTLS12"
+
+[http.services]
+  [http.services.cockpit.loadBalancer]
+    [[http.services.cockpit.loadBalancer.servers]]
+      url = "http://10.2.3.1:9090"
+
+[http.routers]
+  [http.routers.cockpit]
+    rule = "Host(`cockpit.mistborn`)"
+    service = "cockpit"
+    entrypoints = ["web", "websecure"]
+    middlewares = ["mistborn_auth"]
+
+[http.middlewares]
+  [http.middlewares.mistborn_auth.forwardAuth]
+    address = "http://10.2.3.1:5000/auth/"
+    trustForwardHeader = true
+    [http.middlewares.mistborn_auth.forwardAuth.tls]
+      insecureSkipVerify = true
+  
+  [http.middlewares.mistborn_headers.headers]
+    hostsProxyHeaders = ['X-CSRFToken']
@@ -1,257 +0,0 @@
-#debug = true
-
-logLevel = "ERROR" #DEBUG, INFO, WARN, ERROR, FATAL, PANIC
-InsecureSkipVerify = true 
-
-defaultEntryPoints = ["http", "https"]
-#defaultEntryPoints = ["http"]
-
-# Entrypoints, http and https
-[entryPoints]
-  # http should be redirected to https
-  [entryPoints.http]
-  address = ":80"
-    #[entryPoints.http.redirect]
-    #entryPoint = "https"
-  # https is the default
-  [entryPoints.https]
-  address = ":443"
-    [entryPoints.https.tls]
-    [entryPoints.https.tls.defaultCertificate]
-      certFile = "/tls/cert.crt"
-      keyFile = "/tls/cert.key"
-
-## Enable ACME (Let's Encrypt): automatic SSL
-#[acme]
-## Email address used for registration
-#email = "steven@cyber5k.com"
-#storage = "/etc/traefik/acme/acme.json"
-#entryPoint = "https"
-#onDemand = false
-#OnHostRule = true
-#  # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge
-#  [acme.httpChallenge]
-#  entryPoint = "http"
-
-[file]
-[backends]
-  [backends.django]
-    [backends.django.servers.server1]
-      url = "http://django:5000"
-  
-  [backends.pihole]
-    [backends.pihole.servers.server1]
-      url = "http://pihole:80"
-
-  [backends.homeassistant]
-    [backends.homeassistant.servers.server1]
-      url = "http://homeassistant:8123"
-
-  [backends.syncthing]
-    [backends.syncthing.servers.server1]
-      url = "http://syncthing:8384"
-
-  [backends.rocketchat]
-    [backends.rocketchat.servers.server1]
-      url = "http://rocketchat:3000"
-  
-  [backends.nextcloud]
-    [backends.nextcloud.servers.server1]
-      url = "http://nextcloud:80"
-  
-  [backends.onlyoffice]
-    [backends.onlyoffice.servers.server1]
-      url = "http://onlyoffice-community-server:80"
-  
-  [backends.bitwarden]
-    [backends.bitwarden.servers.server1]
-      url = "http://bitwarden:80"
-  
-  [backends.jellyfin]
-    [backends.jellyfin.servers.server1]
-      url = "http://jellyfin:8096"
-  
-  [backends.jitsi]
-    [backends.jitsi.servers.server1]
-      url = "http://jitsi-web:80"
-  
-  [backends.raspap]
-    [backends.raspap.servers.server1]
-      url = "http://raspap:80"
-  
-  [backends.cockpit]
-    [backends.cockpit.servers.server1]
-      url = "http://10.2.3.1:9090"
-  
-[frontends]
-  [frontends.django]
-    backend = "django"
-    passHostHeader = true
-    [frontends.django.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.django.routes.dr1]
-      #rule = "Host:mistborn.cyber5k.com"
-      rule = "Host:home.mistborn"
-  
-  [frontends.pihole]
-    backend = "pihole"
-    passHostHeader = true
-    [frontends.pihole.auth]
-      [frontends.pihole.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.pihole.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.pihole.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.pihole.routes.dr1]
-      rule = "Host:pihole.mistborn"
-  
-  [frontends.homeassistant]
-    backend = "homeassistant"
-    passHostHeader = true
-    [frontends.homeassistant.auth]
-      [frontends.homeassistant.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.homeassistant.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.homeassistant.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.homeassistant.routes.dr1]
-      rule = "Host:homeassistant.mistborn"
-
-  [frontends.syncthing]
-    backend = "syncthing"
-    passHostHeader = true
-    [frontends.syncthing.auth]
-      [frontends.syncthing.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.syncthing.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.syncthing.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.syncthing.routes.dr1]
-      rule = "Host:syncthing.mistborn"
-
-  [frontends.rocketchat]
-    backend = "rocketchat"
-    passHostHeader = true
-    [frontends.rocketchat.auth]
-      [frontends.rocketchat.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.rocketchat.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.rocketchat.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.rocketchat.routes.dr1]
-      rule = "Host:chat.mistborn"
-  
-  [frontends.nextcloud]
-    backend = "nextcloud"
-    passHostHeader = true
-    [frontends.nextcloud.auth]
-      [frontends.nextcloud.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.nextcloud.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.nextcloud.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.nextcloud.routes.dr1]
-      rule = "Host:nextcloud.mistborn"
-  
-  [frontends.onlyoffice]
-    backend = "onlyoffice"
-    passHostHeader = true
-    [frontends.onlyoffice.auth]
-      [frontends.onlyoffice.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.onlyoffice.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.onlyoffice.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.onlyoffice.routes.dr1]
-      rule = "Host:onlyoffice.mistborn"
-  
-  [frontends.bitwarden]
-    backend = "bitwarden"
-    passHostHeader = true
-    [frontends.bitwarden.auth]
-      [frontends.bitwarden.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.bitwarden.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.bitwarden.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.bitwarden.routes.dr1]
-      rule = "Host:bitwarden.mistborn"
-  
-  [frontends.jellyfin]
-    backend = "jellyfin"
-    passHostHeader = true
-    [frontends.jellyfin.auth]
-      [frontends.jellyfin.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.jellyfin.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.jellyfin.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.jellyfin.routes.dr1]
-      rule = "Host:jellyfin.mistborn"
-  
-  [frontends.jitsi]
-    backend = "jitsi"
-    passHostHeader = true
-    [frontends.jitsi.auth]
-      [frontends.jitsi.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.jitsi.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.jitsi.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.jitsi.routes.dr1]
-      rule = "Host:jitsi.mistborn"
-
-  [frontends.raspap]
-    backend = "raspap"
-    passHostHeader = true
-    [frontends.raspap.auth]
-      [frontends.raspap.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.raspap.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.raspap.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.raspap.routes.dr1]
-      rule = "Host:raspap.mistborn"
-  
-  [frontends.cockpit]
-    backend = "cockpit"
-    passHostHeader = true
-    [frontends.cockpit.auth]
-      [frontends.cockpit.auth.forward]
-        address = "https://home.mistborn/auth/"
-        trustForwardHeader = false
-        [frontends.cockpit.auth.forward.tls]
-          insecureSkipVerify = true
-    [frontends.cockpit.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.cockpit.routes.dr1]
-      rule = "Host:cockpit.mistborn"
-  
-## Connection to docker host system (docker.sock)
-#[docker]
-#endpoint = "unix:///var/run/docker.sock"
-#domain = "localhost"
-#watch = true
-## This will hide all docker containers that don't have explicitly  
-## set label to "enable"
-#exposedbydefault = false
@@ -10,7 +10,14 @@ services:
      - ../../mistborn_volumes/extra/bitwarden:/data
    labels:
      - "traefik.enable=true"
-      - "traefik.port=80"
+      # - "traefik.http.routers.bitwarden-http.rule=Host(`bitwarden.mistborn`)"
+      # - "traefik.http.routers.bitwarden-http.entrypoints=web"
+      # - "traefik.http.routers.bitwarden-http.middlewares=mistborn_auth@file"
+      # - "traefik.http.routers.bitwarden-https.rule=Host(`bitwarden.mistborn`)"
+      # - "traefik.http.routers.bitwarden-https.entrypoints=websecure"
+      # - "traefik.http.routers.bitwarden-https.middlewares=mistborn_auth@file"
+      # - "traefik.http.routers.bitwarden-https.tls.certresolver=basic"
+      # - "traefik.http.services.bitwarden-service.loadbalancer.server.port=80"
    ports:
      - 3012:3012/tcp
    restart: unless-stopped
@@ -0,0 +1,72 @@
+version: '3'
+
+# services
+services:
+  # guacd
+  guacd:
+    container_name: mistborn_production_guacd
+    image: guacamole/guacd
+    networks:
+      guacnetwork:
+    restart: unless-stopped
+    volumes:
+    - ../../mistborn_volumes/extra/guacamole/drive:/drive:rw
+    - ../../mistborn_volumes/extra/guacamole/record:/record:rw
+
+
+  # postgres
+  guac_postgres:
+    container_name: mistborn_production_guac_postgres
+    env_file:
+    - ../.envs/.production/.guacamole
+    environment:
+      PGDATA: /var/lib/postgresql/data/guacamole
+    image: postgres
+    networks:
+      guacnetwork:
+    restart: unless-stopped
+    volumes:
+    - ../../mistborn_volumes/extra/guacamole/init:/docker-entrypoint-initdb.d:ro
+    - ../../mistborn_volumes/extra/guacamole/data:/var/lib/postgresql/data:rw
+
+
+  # guacamole
+  guacamole:
+    container_name: mistborn_production_guacamole
+    labels:
+    - "traefik.enable=true"
+    - "traefik.http.routers.guacamole-http.rule=Host(`guac.mistborn`)"
+    - "traefik.http.routers.guacamole-http.entrypoints=web"
+    - "traefik.http.routers.guacamole-http.middlewares=mistborn_auth@file,add-guacamole"
+    - "traefik.http.routers.guacamole-https.rule=Host(`guac.mistborn`)"
+    - "traefik.http.routers.guacamole-https.entrypoints=websecure"
+    - "traefik.http.routers.guacamole-https.middlewares=mistborn_auth@file,add-guacamole"
+    - "traefik.http.routers.guacamole-https.tls.certresolver=basic"
+    - "traefik.http.middlewares.add-guacamole.addPrefix.prefix=/guacamole"
+    - "traefik.http.services.guacamole-service.loadbalancer.server.port=8080"
+    depends_on:
+    - guacd
+    - guac_postgres
+    environment:
+      GUACD_HOSTNAME: guacd
+      GUACD_PORT: 4822
+      #GUACAMOLE_HOME: /config
+    env_file:
+    - ../.envs/.production/.guacamole
+    image: guacamole/guacamole
+    links:
+    - guacd
+    networks:
+      guacnetwork:
+    #ports:
+## enable next line if not using nginx
+##    - 8080:8080/tcp # Guacamole is on :8080/guacamole, not /.
+## enable next line when using nginx
+    #- 8080/tcp
+    restart: unless-stopped
+
+# networks
+# create a network 'guacnetwork' in mode 'bridged'
+networks:
+  guacnetwork:
+    driver: bridge
@@ -10,7 +10,14 @@ services:
      - TZ=America/New_York
    labels:
      - "traefik.enable=true"
-      - "traefik.port=8123"
+      - "traefik.http.routers.homeassistant-http.rule=Host(`homeassistant.mistborn`)"
+      - "traefik.http.routers.homeassistant-http.entrypoints=web"
+      - "traefik.http.routers.homeassistant-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.homeassistant-https.rule=Host(`homeassistant.mistborn`)"
+      - "traefik.http.routers.homeassistant-https.entrypoints=websecure"
+      - "traefik.http.routers.homeassistant-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.homeassistant-https.tls.certresolver=basic"
+      - "traefik.http.services.homeassistant-service.loadbalancer.server.port=8123"
    restart: unless-stopped 

 networks:
@@ -14,7 +14,14 @@ services:
      - ../../mistborn_volumes/extra/nextcloud:/media:ro
    labels:
      - "traefik.enable=true"
-      - "traefik.port=8096"
+      - "traefik.http.routers.jellyfin-http.rule=Host(`jellyfin.mistborn`)"
+      - "traefik.http.routers.jellyfin-http.entrypoints=web"
+      - "traefik.http.routers.jellyfin-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.jellyfin-https.rule=Host(`jellyfin.mistborn`)"
+      - "traefik.http.routers.jellyfin-https.entrypoints=websecure"
+      - "traefik.http.routers.jellyfin-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.jellyfin-https.tls.certresolver=basic"
+      - "traefik.http.services.jellyfin-service.loadbalancer.server.port=8096"
    restart: unless-stopped

 networks:
@@ -3,67 +3,131 @@ version: '3'
 services:
    # Frontend
    jitsi-web:
-        image: jitsi/web
+        image: jitsi/web:latest
+        restart: unless-stopped
        #ports:
            #- '${HTTP_PORT}:80'
            #- '${HTTPS_PORT}:443'
        labels:
            - "traefik.enable=true"
-            - "traefik.port=${HTTP_PORT}"
+            - "traefik.http.routers.jitsi-http.rule=Host(`jitsi.mistborn`)"
+            - "traefik.http.routers.jitsi-http.entrypoints=web"
+            - "traefik.http.routers.jitsi-http.middlewares=mistborn_auth@file"
+            - "traefik.http.routers.jitsi-https.rule=Host(`jitsi.mistborn`)"
+            - "traefik.http.routers.jitsi-https.entrypoints=websecure"
+            - "traefik.http.routers.jitsi-https.middlewares=mistborn_auth@file"
+            - "traefik.http.routers.jitsi-https.tls.certresolver=basic"
+            - "traefik.http.services.jitsi-service.loadbalancer.server.port=${HTTP_PORT}"
        volumes:
-            - ${CONFIG}/web:/config
-            - ${CONFIG}/web/letsencrypt:/etc/letsencrypt
-            - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts
+            - ${CONFIG}/web:/config:Z
+            - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts:Z
        env_file:
            - ../.envs/.production/.jitsi
        environment:
-            - ENABLE_AUTH
-            - ENABLE_GUESTS
            - ENABLE_LETSENCRYPT
            - ENABLE_HTTP_REDIRECT
-            - ENABLE_TRANSCRIPTIONS
+            - ENABLE_XMPP_WEBSOCKET
            - DISABLE_HTTPS
-            - JICOFO_AUTH_USER
            - LETSENCRYPT_DOMAIN
            - LETSENCRYPT_EMAIL
+            - LETSENCRYPT_USE_STAGING
            - PUBLIC_URL
-            - XMPP_DOMAIN
+            - TZ
+            - AMPLITUDE_ID
+            - ANALYTICS_SCRIPT_URLS
+            - ANALYTICS_WHITELISTED_EVENTS
+            - BRIDGE_CHANNEL
+            - BRANDING_DATA_URL
+            - CALLSTATS_CUSTOM_SCRIPT_URL
+            - CALLSTATS_ID
+            - CALLSTATS_SECRET
+            - CHROME_EXTENSION_BANNER_JSON
+            - CONFCODE_URL
+            - CONFIG_EXTERNAL_CONNECT
+            - DEPLOYMENTINFO_ENVIRONMENT
+            - DEPLOYMENTINFO_ENVIRONMENT_TYPE
+            - DEPLOYMENTINFO_USERREGION
+            - DIALIN_NUMBERS_URL
+            - DIALOUT_AUTH_URL
+            - DIALOUT_CODES_URL
+            - DROPBOX_APPKEY
+            - DROPBOX_REDIRECT_URI
+            - ENABLE_AUDIO_PROCESSING
+            - ENABLE_AUTH
+            - ENABLE_CALENDAR
+            - ENABLE_FILE_RECORDING_SERVICE
+            - ENABLE_FILE_RECORDING_SERVICE_SHARING
+            - ENABLE_GUESTS
+            - ENABLE_IPV6
+            - ENABLE_LIPSYNC
+            - ENABLE_NO_AUDIO_DETECTION
+            - ENABLE_P2P
+            - ENABLE_PREJOIN_PAGE
+            - ENABLE_RECORDING
+            - ENABLE_REMB
+            - ENABLE_REQUIRE_DISPLAY_NAME
+            - ENABLE_SIMULCAST
+            - ENABLE_STATS_ID
+            - ENABLE_STEREO
+            - ENABLE_SUBDOMAINS
+            - ENABLE_TALK_WHILE_MUTED
+            - ENABLE_TCC
+            - ENABLE_TRANSCRIPTIONS
+            - ETHERPAD_PUBLIC_URL
+            - ETHERPAD_URL_BASE
+            - GOOGLE_ANALYTICS_ID
+            - GOOGLE_API_APP_CLIENT_ID
+            - INVITE_SERVICE_URL
+            - JICOFO_AUTH_USER
+            - MATOMO_ENDPOINT
+            - MATOMO_SITE_ID
+            - MICROSOFT_API_APP_CLIENT_ID
+            - NGINX_RESOLVER
+            - NGINX_WORKER_PROCESSES
+            - NGINX_WORKER_CONNECTIONS
+            - PEOPLE_SEARCH_URL
+            - RESOLUTION
+            - RESOLUTION_MIN
+            - RESOLUTION_WIDTH
+            - RESOLUTION_WIDTH_MIN
+            - START_AUDIO_ONLY
+            - START_AUDIO_MUTED
+            - START_BITRATE
+            - START_VIDEO_MUTED
+            - TESTING_CAP_SCREENSHARE_BITRATE
+            - TESTING_OCTO_PROBABILITY
            - XMPP_AUTH_DOMAIN
            - XMPP_BOSH_URL_BASE
+            - XMPP_DOMAIN
            - XMPP_GUEST_DOMAIN
            - XMPP_MUC_DOMAIN
            - XMPP_RECORDER_DOMAIN
-            - ETHERPAD_URL_BASE
-            - TZ
-            - JIBRI_BREWERY_MUC
-            - JIBRI_PENDING_TIMEOUT
-            - JIBRI_XMPP_USER
-            - JIBRI_XMPP_PASSWORD
-            - JIBRI_RECORDER_USER
-            - JIBRI_RECORDER_PASSWORD
-            - ENABLE_RECORDING
+            - TOKEN_AUTH_URL
        networks:
            default:
            meet.jitsi:
                aliases:
                    - ${XMPP_DOMAIN}
-        restart: unless-stopped 

    # XMPP server
    jitsi-prosody:
-        image: jitsi/prosody
+        image: jitsi/prosody:latest
+        restart: unless-stopped
        expose:
            - '5222'
            - '5347'
            - '5280'
        volumes:
-            - ${CONFIG}/prosody:/config
+            - ${CONFIG}/prosody/config:/config:Z
+            - ${CONFIG}/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z
        env_file:
            - ../.envs/.production/.jitsi
        environment:
            - AUTH_TYPE
            - ENABLE_AUTH
            - ENABLE_GUESTS
+            - ENABLE_LOBBY
+            - ENABLE_XMPP_WEBSOCKET
            - GLOBAL_MODULES
            - GLOBAL_CONFIG
            - LDAP_URL
@@ -88,6 +152,7 @@ services:
            - XMPP_MUC_MODULES
            - XMPP_INTERNAL_MUC_MODULES
            - XMPP_RECORDER_DOMAIN
+            - XMPP_CROSS_DOMAIN
            - JICOFO_COMPONENT_SECRET
            - JICOFO_AUTH_USER
            - JICOFO_AUTH_PASSWORD
@@ -108,25 +173,28 @@ services:
            - JWT_AUTH_TYPE
            - JWT_TOKEN_AUTH_MODULE
            - LOG_LEVEL
+            - PUBLIC_URL
            - TZ
        networks:
            meet.jitsi:
                aliases:
                    - ${XMPP_SERVER}
-        restart: unless-stopped 

    # Focus component
    jitsi-jicofo:
-        image: jitsi/jicofo
+        image: jitsi/jicofo:latest
+        restart: unless-stopped
        volumes:
-            - ${CONFIG}/jicofo:/config
+            - ${CONFIG}/jicofo:/config:Z
        env_file:
            - ../.envs/.production/.jitsi
        environment:
+            - AUTH_TYPE
            - ENABLE_AUTH
            - XMPP_DOMAIN
            - XMPP_AUTH_DOMAIN
            - XMPP_INTERNAL_MUC_DOMAIN
+            - XMPP_MUC_DOMAIN
            - XMPP_SERVER
            - JICOFO_COMPONENT_SECRET
            - JICOFO_AUTH_USER
@@ -134,6 +202,7 @@ services:
            - JICOFO_RESERVATION_REST_BASE_URL
            - JVB_BREWERY_MUC
            - JIGASI_BREWERY_MUC
+            - JIGASI_SIP_URI
            - JIBRI_BREWERY_MUC
            - JIBRI_PENDING_TIMEOUT
            - TZ
@@ -141,16 +210,16 @@ services:
            - jitsi-prosody
        networks:
            meet.jitsi:
-        restart: unless-stopped 

    # Video bridge
    jitsi-jvb:
-        image: jitsi/jvb
+        image: jitsi/jvb:latest
+        restart: unless-stopped
        ports:
            - '${JVB_PORT}:${JVB_PORT}/udp'
            - '${JVB_TCP_PORT}:${JVB_TCP_PORT}'
        volumes:
-            - ${CONFIG}/jvb:/config
+            - ${CONFIG}/jvb:/config:Z
        env_file:
            - ../.envs/.production/.jitsi
        environment:
@@ -164,14 +233,19 @@ services:
            - JVB_PORT
            - JVB_TCP_HARVESTER_DISABLED
            - JVB_TCP_PORT
+            - JVB_TCP_MAPPED_PORT
            - JVB_STUN_SERVERS
            - JVB_ENABLE_APIS
+            - JVB_WS_DOMAIN
+            - JVB_WS_SERVER_ID
+            - PUBLIC_URL
            - TZ
        depends_on:
            - jitsi-prosody
        networks:
            meet.jitsi:
-        restart: unless-stopped 
+                aliases:
+                    - jvb.meet.jitsi

 # Custom network so all services can communicate using a FQDN
 networks:
@@ -9,7 +9,14 @@ services:
      - ../.envs/.production/.nextcloud
    labels:
      - "traefik.enable=true"
-      - "traefik.port=80"
+      - "traefik.http.routers.nextcloud-http.rule=Host(`nextcloud.mistborn`)"
+      - "traefik.http.routers.nextcloud-http.entrypoints=web"
+      - "traefik.http.routers.nextcloud-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.nextcloud-https.rule=Host(`nextcloud.mistborn`)"
+      - "traefik.http.routers.nextcloud-https.entrypoints=websecure"
+      - "traefik.http.routers.nextcloud-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.nextcloud-https.tls.certresolver=basic"
+      - "traefik.http.services.nextcloud-service.loadbalancer.server.port=80"
    volumes:
      - ../../mistborn_volumes/extra/nextcloud:/var/www/html
    environment:
@@ -1,102 +1,27 @@
 version: '3'

 services:
-  onlyoffice-mysql-server:
-    container_name: mistborn_onlyoffice_mysql_server
-    image: mysql:5.7.21
-    environment:
-      - MYSQL_ROOT_PASSWORD=my-secret-pw
-    volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-conf:/etc/mysql/conf.d
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-entrypoint:/docker-entrypoint-initdb.d
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-data:/var/lib/mysql
-    networks:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.2
-    restart: unless-stopped
-
-  onlyoffice-document-server:
-    container_name: mistborn_onlyoffice_document_server
+  onlyoffice:
+    container_name: mistborn_production_onlyoffice
    image: onlyoffice/documentserver:latest
    volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-data:/var/www/onlyoffice/Data
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-logs:/var/log/onlyoffice
+      - ../../mistborn_volumes/extra/onlyoffice/logs:/var/log/onlyoffice
+      - ../../mistborn_volumes/extra/onlyoffice/cache:/var/lib/onlyoffice
    env_file:
      - ../.envs/.production/.onlyoffice
-    ports:
-      - "80:80/tcp"
-    networks:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.3
-    restart: unless-stopped 
-
-  #onlyoffice-mail-server:
-  #  container_name: mistborn_onlyoffice_mail_server
-  #  privileged: true
-  #  image: onlyoffice/mailserver:latest
-  #  volumes:
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-data:/var/vmail
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-certs:/etc/pki/tls/mailserver
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-logs:/var/log
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-mysql:/var/lib/mysql
-  #  hostname: mistborn
-  #  networks:
-  #    onlyoffice_net:
-  #      ipv4_address: 10.2.2.4
-  #  ports:
-  #    - "25:25/tcp"
-  #    - "143:143/tcp"
-  #    - "587:587/tcp"
-  #  restart: unless-stopped 
-
-  onlyoffice-community-server:
-    container_name: mistborn_onlyoffice_community_server
-    image: onlyoffice/communityserver:latest
-    environment:
-      - DOCUMENT_SERVER_PORT_80_TCP_ADDR=mistborn_onlyoffice_document_server
-  #    - MAIL_SERVER_DB_HOST=mistborn_onlyoffice_mail_server
-      - ONLYOFFICE_CORE_MACHINEKEY=core_secret
-      - MYSQL_SERVER_ROOT_PASSWORD=my-secret-pw
-      - MYSQL_SERVER_DB_NAME=onlyoffice 
-      - MYSQL_SERVER_HOST=mistborn_onlyoffice_mysql_server 
-      - MYSQL_SERVER_USER=onlyoffice_user
-      - MYSQL_SERVER_PASS=onlyoffice_pass 
-  #    - MAIL_SERVER_API_PORT=8081
-  #    - MAIL_SERVER_API_HOST=onlyoffice-mail-server
-  #    - MAIL_SERVER_DB_HOST=onlyoffice-mysql-server
-  #    - MAIL_SERVER_DB_PORT=3306
-  #    - MAIL_SERVER_DB_NAME=onlyoffice_mailserver
-  #    - MAIL_SERVER_DB_USER=onlyoffice_mailserver_user
-  #    - MAIL_SERVER_DB_PASS=onlyoffice_mailserver_user_pass
-    depends_on:
-      - onlyoffice-mysql-server
-      - onlyoffice-document-server 
-  #    - onlyoffice-mail-server 
-    volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-data:/var/www/onlyoffice/Data
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-mysql:/var/lib/mysql
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-logs:/var/log/onlyoffice
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-data:/var/www/onlyoffice/DocumentServerData
    labels:
      - "traefik.enable=true"
-      - "traefik.port=80"
-    networks:
-      default:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.5
-    ports:
-      #- "10.2.2.5:80:80/tcp"
-      - "5222:5222/tcp"
+      - "traefik.http.routers.onlyoffice-http.rule=Host(`onlyoffice.mistborn`)"
+      - "traefik.http.routers.onlyoffice-http.entrypoints=web"
+      - "traefik.http.routers.onlyoffice-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.onlyoffice-https.rule=Host(`onlyoffice.mistborn`)"
+      - "traefik.http.routers.onlyoffice-https.entrypoints=websecure"
+      - "traefik.http.routers.onlyoffice-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.onlyoffice-https.tls.certresolver=basic"
+      - "traefik.http.services.onlyoffice-service.loadbalancer.server.port=80"
    restart: unless-stopped 

-
 networks:
  default:
    external:
      name: mistborn_default
-
-  onlyoffice_net:
-    driver: overlay
-    ipam:
-      config:
-        - subnet: 10.2.2.0/24
@@ -10,7 +10,14 @@ services:
    container_name: mistborn_production_raspap
    labels:
      - "traefik.enable=true"
-      - "traefik.port=80"
+      - "traefik.http.routers.raspap-http.rule=Host(`raspap.mistborn`)"
+      - "traefik.http.routers.raspap-http.entrypoints=web"
+      - "traefik.http.routers.raspap-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.raspap-https.rule=Host(`raspap.mistborn`)"
+      - "traefik.http.routers.raspap-https.entrypoints=websecure"
+      - "traefik.http.routers.raspap-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.raspap-https.tls.certresolver=basic"
+      - "traefik.http.services.raspap-service.loadbalancer.server.port=80"
    env_file:
      - ../.envs/.production/.pihole
    command: /start
@@ -17,7 +17,14 @@ services:
      - Accounts_UseDNSDomainCheck=False
    labels:
      - "traefik.enable=true"
-      - "traefik.port=3000"
+      - "traefik.http.routers.chat-http.rule=Host(`chat.mistborn`)"
+      - "traefik.http.routers.chat-http.entrypoints=web"
+      - "traefik.http.routers.chat-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.chat-https.rule=Host(`chat.mistborn`)"
+      - "traefik.http.routers.chat-https.entrypoints=websecure"
+      - "traefik.http.routers.chat-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.chat-https.tls.certresolver=basic"
+      - "traefik.http.services.chat-service.loadbalancer.server.port=3000"
    depends_on:
      - mongo
    #ports:
@@ -28,8 +35,8 @@ services:
    container_name: mistborn_production_rocketchat_mongo
    restart: unless-stopped
    volumes:
-     - ../volumes/extra/rocketchat/data/db:/data/db
-     - ../volumes/extra/rocketchat/data/dump:/dump
+     - ../../mistborn_volumes/extra/rocketchat/data/db:/data/db
+     - ../../mistborn_volumes/extra/rocketchat/data/dump:/dump
    command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1

  # this container's job is just run the command to initialize the replica set.
@@ -54,10 +61,10 @@ services:
    depends_on:
      - rocketchat
    volumes:
-      - ../volumes/extra/rocketchat/hubot/scripts:/home/hubot/scripts
+      - ../../mistborn_volumes/extra/rocketchat/hubot/scripts:/home/hubot/scripts
  # this is used to expose the hubot port for notifications on the host on port 3001, e.g. for hubot-jenkins-notifier
    ports:
-      - 3001:8080/tcp
+      - "${MISTBORN_BIND_IP}:3001:8080/tcp"

 networks:
  default:
@@ -19,7 +19,14 @@ services:
      - 21027:21027/udp # protocol discovery
    labels:
      - "traefik.enable=true"
-      - "traefik.port=8384"
+      - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.mistborn`)"
+      - "traefik.http.routers.syncthing-http.entrypoints=web"
+      - "traefik.http.routers.syncthing-http.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.mistborn`)"
+      - "traefik.http.routers.syncthing-https.entrypoints=websecure"
+      - "traefik.http.routers.syncthing-https.middlewares=mistborn_auth@file"
+      - "traefik.http.routers.syncthing-https.tls.certresolver=basic"
+      - "traefik.http.services.syncthing-service.loadbalancer.server.port=8384"
    restart: unless-stopped

 networks:
@@ -3,8 +3,8 @@ version: '3'
 services:
  tor-client:
    build:
-      context: ..
-      dockerfile: ./compose/production/tor/Dockerfile
+      context: ../compose/production/tor
+      dockerfile: ./Dockerfile
    image: mistborn_production_tor
    container_name: mistborn_production_tor
    ports:
@@ -1,61 +1,116 @@
+# shellcheck disable=SC2034
+
+# Security
+#
+# Set these to strong passwords to avoid intruders from impersonating a service account
+# The service(s) won't start unless these are specified
+# Running ./gen-passwords.sh will update .env with strong passwords
+# You may skip the Jigasi and Jibri passwords if you are not using those
+# DO NOT reuse passwords
+#
+
+# XMPP component password for Jicofo
+JICOFO_COMPONENT_SECRET=
+
+# XMPP password for Jicofo client connections
+JICOFO_AUTH_PASSWORD=
+
+# XMPP password for JVB client connections
+JVB_AUTH_PASSWORD=
+
+# XMPP password for Jigasi MUC client connections
+JIGASI_XMPP_PASSWORD=
+
+# XMPP recorder password for Jibri client connections
+JIBRI_RECORDER_PASSWORD=
+
+# XMPP password for Jibri client connections
+JIBRI_XMPP_PASSWORD=
+
+
 #
 # Basic configuration options
 #

-# Directory where all configuration will be stored.
+# Directory where all configuration will be stored
 #CONFIG=~/.jitsi-meet-cfg
 CONFIG=../.envs/.production/.jitsi-cfg

-# Exposed HTTP port.
+# Exposed HTTP port
 HTTP_PORT=80

-# Exposed HTTPS port.
-HTTPS_PORT=8443
+# Exposed HTTPS port
+HTTPS_PORT=443

-# System time zone.
-TZ=Europe/Amsterdam
+# System time zone
+TZ=UTC

-# Public URL for the web service.
-#PUBLIC_URL=https://meet.example.com
+# Public URL for the web service (required)
+PUBLIC_URL=https://jitsi.mistborn

-# IP address of the Docker host. See the "Running on a LAN environment" section
-# in the README.
+# IP address of the Docker host
+# See the "Running behind NAT or on a LAN environment" section in the Handbook:
+# https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-docker#running-behind-nat-or-on-a-lan-environment
+#DOCKER_HOST_ADDRESS=192.168.1.1
 DOCKER_HOST_ADDRESS=10.2.3.1

+# Control whether the lobby feature should be enabled or not
+#ENABLE_LOBBY=1
+
+# Show a prejoin page before entering a conference
+#ENABLE_PREJOIN_PAGE=0

 #
 # Let's Encrypt configuration
 #

-# Enable Let's Encrypt certificate generation.
+# Enable Let's Encrypt certificate generation
 #ENABLE_LETSENCRYPT=1

-# Domain for which to generate the certificate.
+# Domain for which to generate the certificate
 #LETSENCRYPT_DOMAIN=meet.example.com

-# E-Mail for receiving important account notifications (mandatory).
+# E-Mail for receiving important account notifications (mandatory)
 #LETSENCRYPT_EMAIL=alice@atlanta.net

+# Use the staging server (for avoiding rate limits while testing)
+#LETSENCRYPT_USE_STAGING=1
+

 #
 # Etherpad integration (for document sharing)
 #

-# Set etherpad-lite URL (uncomment to enable).
+# Set etherpad-lite URL in docker local network (uncomment to enable)
 #ETHERPAD_URL_BASE=http://etherpad.meet.jitsi:9001

+# Set etherpad-lite public URL (uncomment to enable)
+#ETHERPAD_PUBLIC_URL=https://etherpad.my.domain
+
+# Name your etherpad instance!
+ETHERPAD_TITLE="Video Chat"
+
+# The default text of a pad
+ETHERPAD_DEFAULT_PAD_TEXT="Welcome to Web Chat!\n\n"
+
+# Name of the skin for etherpad
+ETHERPAD_SKIN_NAME="colibris"
+
+# Skin variants for etherpad
+ETHERPAD_SKIN_VARIANTS="super-light-toolbar super-light-editor light-background full-width-editor"
+

 #
 # Basic Jigasi configuration options (needed for SIP gateway support)
 #

-# SIP URI for incoming / outgoing calls.
+# SIP URI for incoming / outgoing calls
 #JIGASI_SIP_URI=test@sip2sip.info

 # Password for the specified SIP account as a clear text
 #JIGASI_SIP_PASSWORD=passw0rd

-# SIP server (use the SIP account domain if in doubt).
+# SIP server (use the SIP account domain if in doubt)
 #JIGASI_SIP_SERVER=sip2sip.info

 # SIP server port
@@ -65,13 +120,13 @@ DOCKER_HOST_ADDRESS=10.2.3.1
 #JIGASI_SIP_TRANSPORT=UDP

 #
-# Authentication configuration (see README for details)
+# Authentication configuration (see handbook for details)
 #

-# Enable authentication.
+# Enable authentication
 #ENABLE_AUTH=1

-# Enable guest access.
+# Enable guest access
 #ENABLE_GUESTS=1

 # Select authentication type: internal, jwt or ldap
@@ -80,38 +135,38 @@ DOCKER_HOST_ADDRESS=10.2.3.1
 # JWT authentication
 #

-# Application identifier.
+# Application identifier
 #JWT_APP_ID=my_jitsi_app_id

-# Application secret known only to your token.
+# Application secret known only to your token
 #JWT_APP_SECRET=my_jitsi_app_secret

-# (Optional) Set asap_accepted_issuers as a comma separated list.
+# (Optional) Set asap_accepted_issuers as a comma separated list
 #JWT_ACCEPTED_ISSUERS=my_web_client,my_app_client

-# (Optional) Set asap_accepted_audiences as a comma separated list.
+# (Optional) Set asap_accepted_audiences as a comma separated list
 #JWT_ACCEPTED_AUDIENCES=my_server1,my_server2


 # LDAP authentication (for more information see the Cyrus SASL saslauthd.conf man page)
 #

-# LDAP url for connection.
+# LDAP url for connection
 #LDAP_URL=ldaps://ldap.domain.com/

 # LDAP base DN. Can be empty
 #LDAP_BASE=DC=example,DC=domain,DC=com

-# LDAP user DN. Do not specify this parameter for the anonymous bind.
+# LDAP user DN. Do not specify this parameter for the anonymous bind
 #LDAP_BINDDN=CN=binduser,OU=users,DC=example,DC=domain,DC=com

-# LDAP user password. Do not specify this parameter for the anonymous bind.
+# LDAP user password. Do not specify this parameter for the anonymous bind
 #LDAP_BINDPW=LdapUserPassw0rd

 # LDAP filter. Tokens example:
-# %1-9 - if the input key is user@mail.domain.com, then %1 is com, %2 is domain and %3 is mail.
-# %s - %s is replaced by the complete service string.
-# %r - %r is replaced by the complete realm string.
+# %1-9 - if the input key is user@mail.domain.com, then %1 is com, %2 is domain and %3 is mail
+# %s - %s is replaced by the complete service string
+# %r - %r is replaced by the complete realm string
 #LDAP_FILTER=(sAMAccountName=%u)

 # LDAP authentication method
@@ -123,16 +178,16 @@ DOCKER_HOST_ADDRESS=10.2.3.1
 # LDAP TLS using
 #LDAP_USE_TLS=1

-# List of SSL/TLS ciphers to allow.
+# List of SSL/TLS ciphers to allow
 #LDAP_TLS_CIPHERS=SECURE256:SECURE128:!AES-128-CBC:!ARCFOUR-128:!CAMELLIA-128-CBC:!3DES-CBC:!CAMELLIA-128-CBC

 # Require and verify server certificate
 #LDAP_TLS_CHECK_PEER=1

-# Path to CA cert file. Used when server sertificate verify is enabled.
+# Path to CA cert file. Used when server certificate verify is enabled
 #LDAP_TLS_CACERT_FILE=/etc/ssl/certs/ca-certificates.crt

-# Path to CA certs directory. Used when server sertificate verify is enabled.
+# Path to CA certs directory. Used when server certificate verify is enabled
 #LDAP_TLS_CACERT_DIR=/etc/ssl/certs

 # Wether to use starttls, implies LDAPv3 and requires ldap:// instead of ldaps://
@@ -143,7 +198,7 @@ DOCKER_HOST_ADDRESS=10.2.3.1
 # Advanced configuration options (you generally don't need to change these)
 #

-# Internal XMPP domain.
+# Internal XMPP domain
 XMPP_DOMAIN=meet.jitsi

 # Internal XMPP server
@@ -152,18 +207,22 @@ XMPP_SERVER=xmpp.meet.jitsi
 # Internal XMPP server URL
 XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280

-# Internal XMPP domain for authenticated services.
+# Internal XMPP domain for authenticated services
 XMPP_AUTH_DOMAIN=auth.meet.jitsi

-# XMPP domain for the MUC.
+# XMPP domain for the MUC
 XMPP_MUC_DOMAIN=muc.meet.jitsi

-# XMPP domain for the internal MUC used for jibri, jigasi and jvb pools.
+# XMPP domain for the internal MUC used for jibri, jigasi and jvb pools
 XMPP_INTERNAL_MUC_DOMAIN=internal-muc.meet.jitsi

-# XMPP domain for unauthenticated users.
+# XMPP domain for unauthenticated users
 XMPP_GUEST_DOMAIN=guest.meet.jitsi

+# Comma separated list of domains for cross domain policy or "true" to allow all
+# The PUBLIC_URL is always allowed
+#XMPP_CROSS_DOMAIN=true
+
 # Custom Prosody modules for XMPP_DOMAIN (comma separated)
 XMPP_MODULES=

@@ -173,17 +232,14 @@ XMPP_MUC_MODULES=
 # Custom Prosody modules for internal MUC component (comma separated)
 XMPP_INTERNAL_MUC_MODULES=

-# MUC for the JVB pool.
+# MUC for the JVB pool
 JVB_BREWERY_MUC=jvbbrewery

-# XMPP user for JVB client connections.
+# XMPP user for JVB client connections
 JVB_AUTH_USER=jvb

-# XMPP password for JVB client connections.
-JVB_AUTH_PASSWORD=passw0rd
-
-# STUN servers used to discover the server's public IP.
-JVB_STUN_SERVERS=stun.l.google.com:19302,stun1.l.google.com:19302,stun2.l.google.com:19302
+# STUN servers used to discover the server's public IP
+JVB_STUN_SERVERS=meet-jit-si-turnrelay.jitsi.net:443

 # Media port for the Jitsi Videobridge
 JVB_PORT=10000
@@ -191,36 +247,32 @@ JVB_PORT=10000
 # TCP Fallback for Jitsi Videobridge for when UDP isn't available
 JVB_TCP_HARVESTER_DISABLED=true
 JVB_TCP_PORT=4443
+JVB_TCP_MAPPED_PORT=4443

-# A comma separated list of APIs to enable when the JVB is started. The default is none.
+# A comma separated list of APIs to enable when the JVB is started [default: none]
 # See https://github.com/jitsi/jitsi-videobridge/blob/master/doc/rest.md for more information
 #JVB_ENABLE_APIS=rest,colibri

-# XMPP component password for Jicofo.
-JICOFO_COMPONENT_SECRET=s3cr37
-
-# XMPP user for Jicofo client connections. NOTE: this option doesn't currently work due to a bug.
+# XMPP user for Jicofo client connections.
+# NOTE: this option doesn't currently work due to a bug
 JICOFO_AUTH_USER=focus

-# XMPP password for Jicofo client connections.
-JICOFO_AUTH_PASSWORD=passw0rd
-
 # Base URL of Jicofo's reservation REST API
 #JICOFO_RESERVATION_REST_BASE_URL=http://reservation.example.com

-# XMPP user for Jigasi MUC client connections.
+# Enable Jicofo's health check REST API (http://<jicofo_base_url>:8888/about/health)
+#JICOFO_ENABLE_HEALTH_CHECKS=true
+
+# XMPP user for Jigasi MUC client connections
 JIGASI_XMPP_USER=jigasi

-# XMPP password for Jigasi MUC client connections.
-JIGASI_XMPP_PASSWORD=passw0rd
-
-# MUC name for the Jigasi pool.
+# MUC name for the Jigasi pool
 JIGASI_BREWERY_MUC=jigasibrewery

-# Minimum port for media used by Jigasi.
+# Minimum port for media used by Jigasi
 JIGASI_PORT_MIN=20000

-# Maximum port for media used by Jigasi.
+# Maximum port for media used by Jigasi
 JIGASI_PORT_MAX=20050

 # Enable SDES srtp
@@ -235,20 +287,21 @@ JIGASI_PORT_MAX=20050
 # Health-check interval
 #JIGASI_HEALTH_CHECK_INTERVAL=300000
 #
-# Enable Jigasi transcription.
+# Enable Jigasi transcription
 #ENABLE_TRANSCRIPTIONS=1

-# Jigasi will recordord an audio when transcriber is on. Default false.
+# Jigasi will record audio when transcriber is on [default: false]
 #JIGASI_TRANSCRIBER_RECORD_AUDIO=true

-# Jigasi will send transcribed text to the chat when transcriber is on. Default false.
+# Jigasi will send transcribed text to the chat when transcriber is on [default: false]
 #JIGASI_TRANSCRIBER_SEND_TXT=true

-# Jigasi post to the chat an url with transcription file. Default false.
+# Jigasi will post an url to the chat with transcription file [default: false]
 #JIGASI_TRANSCRIBER_ADVERTISE_URL=true

 # Credentials for connect to Cloud Google API from Jigasi
-# Please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol section "Before you begin" from 1 to 5 paragraph.
+# Please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol
+# section "Before you begin" paragraph 1 to 5
 # Copy the values from the json to the related env vars
 #GC_PROJECT_ID=
 #GC_PRIVATE_KEY_ID=
@@ -263,25 +316,19 @@ JIGASI_PORT_MAX=20050
 # XMPP domain for the jibri recorder
 XMPP_RECORDER_DOMAIN=recorder.meet.jitsi

-# XMPP recorder user for Jibri client connections.
+# XMPP recorder user for Jibri client connections
 JIBRI_RECORDER_USER=recorder

-# XMPP recorder password for Jibri client connections.
-JIBRI_RECORDER_PASSWORD=passw0rd
-
-# Directory for recordings inside Jibri container.
+# Directory for recordings inside Jibri container
 JIBRI_RECORDING_DIR=/config/recordings

-# The finalizing script. Will run after recording is complete.
+# The finalizing script. Will run after recording is complete
 JIBRI_FINALIZE_RECORDING_SCRIPT_PATH=/config/finalize.sh

-# XMPP user for Jibri client connections.
+# XMPP user for Jibri client connections
 JIBRI_XMPP_USER=jibri

-# XMPP password for Jibri client connections.
-JIBRI_XMPP_PASSWORD=passw0rd
-
-# MUC name for the Jibri pool.
+# MUC name for the Jibri pool
 JIBRI_BREWERY_MUC=jibribrewery

 # MUC connection timeout
@@ -294,14 +341,26 @@ JIBRI_PENDING_TIMEOUT=90
 # So if there are any prefixes in the jid (like jitsi meet, which
 # has its participants join a muc at conference.xmpp_domain) then
 # list that prefix here so it can be stripped out to generate
-# the call url correctly.
+# the call url correctly
 JIBRI_STRIP_DOMAIN_JID=muc

-# Directory for logs inside Jibri container.
+# Directory for logs inside Jibri container
 JIBRI_LOGS_DIR=/config/logs

-# Disable HTTPS. This can be useful if TLS connections are going to be handled outside of this setup.
+# Disable HTTPS: handle TLS connections outside of this setup
 DISABLE_HTTPS=1

-# Redirects HTTP traffic to HTTPS. Only works with the standard HTTPS port (443).
+# Redirect HTTP traffic to HTTPS
+# Necessary for Let's Encrypt, relies on standard HTTPS port (443)
 #ENABLE_HTTP_REDIRECT=1
+
+# Enable IPv6
+# Provides means to disable IPv6 in environments that don't support it (get with the times, people!)
+#ENABLE_IPV6=1
+
+# Container restart policy
+# Defaults to unless-stopped
+RESTART_POLICY=unless-stopped
+
+# Authenticate using external service or just focus external auth window if there is one already.
+# TOKEN_AUTH_URL=https://auth.meet.example.com/{room}
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+SERVICE="$1"
+
+export MISTBORN_HOME=/opt/mistborn
+export SERVICE_ENV_INSTALLER="${MISTBORN_HOME}/scripts/subinstallers/extra/${SERVICE}.sh"
+export SERVICE_ENV_FILE="${MISTBORN_HOME}/.envs/.production/.${SERVICE}"
+
+# read in global variables
+set -a
+source ${MISTBORN_HOME}/.env
+source ${MISTBORN_HOME}/.envs/.production/.django
+source ${MISTBORN_HOME}/.envs/.production/.postgres
+source ${MISTBORN_HOME}/.envs/.production/.pihole
+set +a
+
+if [[ -f "${SERVICE_ENV_INSTALLER}" ]]; then
+
+    if [[ -f "${SERVICE_ENV_FILE}" ]]; then
+        echo "Environment file already exists."
+    else
+
+        # create env file for service
+        echo "Creating environment file"
+        source $SERVICE_ENV_INSTALLER $SERVICE_ENV_FILE
+        chown mistborn:mistborn $SERVICE_ENV_FILE
+        chmod 600 $SERVICE_ENV_FILE
+
+    fi
+
+else
+    echo "No subinstaller found."
+fi
@@ -1,16 +1,32 @@
 #!/bin/bash

+#### ENV file
+
 VAR_FILE=/opt/mistborn/.env

+# load env variables
+
 source /opt/mistborn/scripts/subinstallers/platform.sh

+# setup env file
+echo "" | sudo tee ${VAR_FILE}
+sudo chown mistborn:mistborn ${VAR_FILE}
+sudo chmod 600 ${VAR_FILE}
+
+# MISTBORN_DNS_BIND_IP
+
 MISTBORN_DNS_BIND_IP="10.2.3.1"
 #if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
 #    MISTBORN_DNS_BIND_IP="10.2.3.1"
 #fi

-echo "MISTBORN_DNS_BIND_IP=${MISTBORN_DNS_BIND_IP}" | sudo tee ${VAR_FILE}
-sudo chown mistborn:mistborn ${VAR_FILE}
+echo "MISTBORN_DNS_BIND_IP=${MISTBORN_DNS_BIND_IP}" | sudo tee -a ${VAR_FILE}
+
+# MISTBORN_BIND_IP
+
+echo "MISTBORN_BIND_IP=10.2.3.1" | sudo tee -a ${VAR_FILE}
+
+# MISTBORN_TAG

 GIT_BRANCH=$(git -C /opt/mistborn symbolic-ref --short HEAD || echo "master")
 MISTBORN_TAG="latest"
@@ -19,3 +35,30 @@ if [ "$GIT_BRANCH" != "master" ]; then
 fi

 echo "MISTBORN_TAG=$MISTBORN_TAG" | sudo tee -a ${VAR_FILE}
+
+#### SERVICE files
+
+# copy current service files to systemd (overwriting as needed)
+sudo cp /opt/mistborn/scripts/services/Mistborn* /etc/systemd/system/
+
+# set script user and owner
+sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/User=root/User=$USER/"
+#sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/ root:root / $USER:$USER /"
+
+# reload in case the iface is not immediately set
+sudo systemctl daemon-reload
+
+#### install and base services
+iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}' | tr -d '[:space:]')
+## cannot be empty
+while [[ -z "$iface" ]]; do
+    sleep 2
+    iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}' | tr -d '[:space:]')
+done
+
+# default interface
+sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/DIFACE/$iface/"
+
+echo "DIFACE=${iface}" | sudo tee -a ${VAR_FILE}
+
+sudo systemctl daemon-reload
@@ -59,19 +59,24 @@ echo -e "| |  | | \__ \ |_| |_) | (_) | |  | | | |"
 echo -e "|_|  |_|_|___/\__|_.__/ \___/|_|  |_| |_|"
 echo -e ""

-# INPUT default admin password
-if [ -z "${MISTBORN_DEFAULT_PASSWORD}" ]; then
-    read -p "(Mistborn) Set default admin password: " -s MISTBORN_DEFAULT_PASSWORD
-    echo
-else
-    echo "MISTBORN_DEFAULT_PASSWORD is already set"
-fi
+sudo rm -rf /opt/mistborn 2>/dev/null || true
+
+# clone to /opt and change directory
+echo "Cloning $GIT_BRANCH branch from mistborn repo"
+sudo git clone https://gitlab.com/cyber5k/mistborn.git -b $GIT_BRANCH /opt/mistborn
+sudo chown -R $USER:$USER /opt/mistborn
+pushd .
+cd /opt/mistborn
+git submodule update --init --recursive
+
+# MISTBORN_DEFAULT_PASSWORD
+source ./scripts/subinstallers/passwd.sh

 # Install Cockpit?
 if [ -z "${MISTBORN_INSTALL_COCKPIT}" ]; then
-    read -p "Install Cockpit (a somewhat resource-heavy system management graphical user interface)? [Y/n]: " MISTBORN_INSTALL_COCKPIT
+    read -p "Install Cockpit (a somewhat resource-heavy system management graphical user interface -- NOT RECOMMENDED on Raspberry Pi)? [y/N]: " MISTBORN_INSTALL_COCKPIT
    echo
-    MISTBORN_INSTALL_COCKPIT=${MISTBORN_INSTALL_COCKPIT:-Y}
+    MISTBORN_INSTALL_COCKPIT=${MISTBORN_INSTALL_COCKPIT:-N}
 fi

 # SSH keys
@@ -85,16 +90,6 @@ else
    echo "SSH key exists for $USER"
 fi

-sudo rm -rf /opt/mistborn 2>/dev/null || true
-
-# clone to /opt and change directory
-echo "Cloning $GIT_BRANCH branch from mistborn repo"
-sudo git clone https://gitlab.com/cyber5k/mistborn.git -b $GIT_BRANCH /opt/mistborn
-sudo chown -R $USER:$USER /opt/mistborn
-pushd .
-cd /opt/mistborn
-git submodule update --init --recursive
-
 # initial load update package list
 sudo apt-get update

@@ -117,10 +112,10 @@ fi

 # SSH Server
 sudo -E apt-get install -y openssh-server
-sudo sed -i 's/#PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
-sudo sed -i 's/PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
-sudo sed -i 's/#PermitRootLogin.*/PermitRootLogin prohibit-password/' /etc/ssh/sshd_config
-sudo sed -i 's/PermitRootLogin.*/PermitRootLogin prohibit-password/' /etc/ssh/sshd_config
+#sudo sed -i 's/#PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+#sudo sed -i 's/PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+#sudo sed -i 's/#PermitRootLogin.*/PermitRootLogin prohibit-password/' /etc/ssh/sshd_config
+#sudo sed -i 's/PermitRootLogin.*/PermitRootLogin prohibit-password/' /etc/ssh/sshd_config
 sudo sed -i 's/#Port.*/Port 22/' /etc/ssh/sshd_config
 sudo sed -i 's/Port.*/Port 22/' /etc/ssh/sshd_config
 sudo systemctl enable ssh
@@ -132,8 +127,11 @@ sudo -E apt-get install -y dnsutils fail2ban
 # Install kernel headers
 if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
    sudo -E apt install -y linux-headers-$(uname -r)
-elif [ "$DISTRO" == "raspbian" ]; then
+elif [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
    sudo -E apt install -y raspberrypi-kernel-headers
+else
+    echo "Unsupported OS: $DISTRO"
+    exit 1
 fi

 # Wireugard
@@ -163,8 +161,6 @@ sudo pip3 install -e ./modules/mistborn-cli

 # Mistborn
 # final setup vars
-iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}')
-figlet "Mistborn default NIC: $iface"

 #IPV4_PUBLIC=$(ip -o -4 route show default | egrep -o 'dev [^ ]*' | awk '{print $2}' | xargs ip -4 addr show | grep 'inet ' | awk '{print $2}' | grep -o "^[0-9.]*"  | tr -cd '\11\12\15\40-\176' | head -1) # tail -1 to get last
 IPV4_PUBLIC="10.2.3.1"
@@ -185,18 +181,13 @@ sudo systemctl restart unattended-upgrades

 # setup Mistborn services

-# install and start base services
-# default interface
-sudo cp ./scripts/services/Mistborn* /etc/systemd/system/
-sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/User=root/User=$USER/"
-#sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/ root:root / $USER:$USER /"
-sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/DIFACE/$iface/"
-
 #if [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
 #    # remove systemd-resolved lines
 #    sudo sed -i '/.*systemd-resolved/d' /etc/systemd/system/Mistborn-base.service
 #fi

+sudo cp ./scripts/services/Mistborn-setup.service /etc/systemd/system/
+
 # setup local volumes for pihole
 sudo mkdir -p ../mistborn_volumes/
 sudo chown -R root:root ../mistborn_volumes/
@@ -205,12 +196,12 @@ sudo mkdir -p ../mistborn_volumes/base/pihole/etc-dnsmasqd
 sudo mkdir -p ../mistborn_volumes/extra

 # Traefik final setup (cockpit)
-cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml
+#cp ./compose/production/traefik/traefikv2.toml.template ./compose/production/traefik/traefik.toml

 # setup tls certs 
 source ./scripts/subinstallers/openssl.sh
-sudo rm -rf ../mistborn_volumes/base/tls
-sudo mv ./tls ../mistborn_volumes/base/
+#sudo rm -rf ../mistborn_volumes/base/tls
+#sudo mv ./tls ../mistborn_volumes/base/

 # enable and run setup to generate .env
 sudo systemctl enable Mistborn-setup.service
@@ -220,6 +211,17 @@ sudo systemctl start Mistborn-setup.service
 sudo docker-compose -f base.yml pull || true
 sudo docker-compose -f base.yml build

+## disable systemd-resolved stub listener (creates symbolic link to /etc/resolv.conf)
+if [ -f /etc/systemd/resolved.conf ]; then
+    sudo sed -i 's/#DNSStubListener.*/DNSStubListener=no/' /etc/systemd/resolved.conf
+    sudo sed -i 's/DNSStubListener.*/DNSStubListener=no/' /etc/systemd/resolved.conf
+fi
+
+## delete symlink if exists
+if [ -L /etc/resolv.conf ]; then
+    sudo rm /etc/resolv.conf
+fi
+
 ## disable other DNS services
 sudo systemctl stop systemd-resolved 2>/dev/null || true
 sudo systemctl disable systemd-resolved 2>/dev/null || true
@@ -241,6 +243,7 @@ sudo resolvconf -u 1>/dev/null 2>&1

 echo "backup up original volumes folder"
 sudo mkdir -p ../mistborn_backup
+sudo chmod 700 ../mistborn_backup
 sudo tar -czf ../mistborn_backup/mistborn_volumes_backup.tar.gz ../mistborn_volumes 1>/dev/null 2>&1

 # clean docker
@@ -0,0 +1,9 @@
+#!/bin/bash 
+
+set -e
+
+export DEBIAN_FRONTEND=noninteractive
+
+sudo systemctl stop Mistborn-base
+sudo systemctl restart Mistborn-setup
+sudo systemctl restart Mistborn-base
@@ -1,7 +1,9 @@
 [Unit]
 Description=Mistborn Base
 Requires=docker.service
+Requires=netfilter-persistent.service
 After=docker.service
+After=netfilter-persistent.service

 [Service]
 Restart=always
@@ -2,6 +2,7 @@
 Description=Mistborn Bitwarden Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,13 +10,13 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/bitwarden.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml down

 ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/bitwarden.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/bitwarden.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml down
 # Post stop
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP

@@ -0,0 +1,22 @@
+[Unit]
+Description=Mistborn Guacamole
+Requires=Mistborn-base.service
+After=Mistborn-base.service
+PartOf=Mistborn-base.service
+
+[Service]
+Restart=always
+User=root
+Group=docker
+PermissionsStartOnly=true
+# Shutdown container (if running) when unit is stopped
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml down
+
+# Start container when unit is started
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml up --build
+# Stop container when unit is stopped
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml down
+# Post stop
+
+[Install]
+WantedBy=multi-user.target
@@ -2,6 +2,7 @@
 Description=Mistborn Home Assistant 
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,12 +10,12 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/homeassistant.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml down

 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/homeassistant.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/homeassistant.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml down
 # Post stop

 [Install]
@@ -2,6 +2,7 @@
 Description=Mistborn Jellyfin Service
 Requires=Mistborn-nextcloud.service
 After=Mistborn-nextcloud.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,12 +10,12 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jellyfin.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml down

 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jellyfin.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jellyfin.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml down
 # Post stop

 [Install]
@@ -2,26 +2,25 @@
 Description=Mistborn Jitsi Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
 User=root
 Group=docker
 PermissionsStartOnly=true
-EnvironmentFile=/opt/mistborn/.envs/.production/.jitsi

 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_up.sh

-ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p udp --dport $JVB_PORT -j MISTBORN_LOG_DROP
-ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport $JVB_TCP_PORT -j MISTBORN_LOG_DROP
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jitsi-meet.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml up --build
+
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down
 # Post stop
-ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport $JVB_PORT -j MISTBORN_LOG_DROP
-ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport $JVB_TCP_PORT -j MISTBORN_LOG_DROP
+ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh

 [Install]
 WantedBy=multi-user.target
@@ -2,19 +2,20 @@
 Description=Mistborn Nextcloud Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
-User=www-data
+User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/nextcloud.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml down

 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/nextcloud.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/nextcloud.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml down
 # Post stop

 [Install]
@@ -2,6 +2,7 @@
 Description=Mistborn OnlyOffice Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,22 +10,13 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml down
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml build
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 25 -j MISTBORN_LOG_DROP
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 143 -j MISTBORN_LOG_DROP
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 587 -j MISTBORN_LOG_DROP
-ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 5222 -j MISTBORN_LOG_DROP
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml down

 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml up
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml down
 # Post stop
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 25 -j MISTBORN_LOG_DROP
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 143 -j MISTBORN_LOG_DROP
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 587 -j MISTBORN_LOG_DROP
-ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 5222 -j MISTBORN_LOG_DROP

 [Install]
 WantedBy=multi-user.target
@@ -2,6 +2,7 @@
 Description=Mistborn Rocket Chat Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,13 +10,13 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/rocketchat.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml down

 ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/rocketchat.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/rocketchat.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml down
 # Post stop
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP

@@ -4,6 +4,7 @@ Before=Mistborn-base.service

 [Service]
 Type=oneshot
+User=mistborn
 ExecStart=/opt/mistborn/scripts/env/setup.sh

 [Install]
@@ -2,6 +2,7 @@
 Description=Mistborn Syncthing Service
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,14 +10,14 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/syncthing.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml down

 ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p udp --dport 21027 -j MISTBORN_LOG_DROP
 ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/syncthing.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/syncthing.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml down
 # Post stop
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport 21027 -j MISTBORN_LOG_DROP
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP
@@ -2,6 +2,7 @@
 Description=Mistborn Tor Service 
 Requires=Mistborn-base.service
 After=Mistborn-base.service
+PartOf=Mistborn-base.service

 [Service]
 Restart=always
@@ -9,13 +10,13 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/tor.yml down
+ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml down

 ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/tor.yml up --build
+ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml up --build
 # Stop container when unit is stopped
-ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/tor.yml down
+ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml down
 # Post stop
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [[ -f "/opt/mistborn_volumes/extra/guacamole/init/initdb.sql" ]]; then
+    echo "initdb.sql exists. Proceeding."
+    exit 0
+fi
+
+mkdir -p /opt/mistborn_volumes/extra/guacamole/init/ >/dev/null 2>&1
+chmod -R +x /opt/mistborn_volumes/extra/guacamole/init/
+docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > /opt/mistborn_volumes/extra/guacamole/init/initdb.sql
+
+# grab values in initdb.sql to replace
+HEXSTRINGS=($(egrep -o [0-9a-fA-F]{64} /opt/mistborn_volumes/extra/guacamole/init/initdb.sql))
+
+# reset default password in init.db
+SALT=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice('0123456789ABCDEF') for x in range(64)]))")
+GUAC_PASSWORD_HASHED=$(echo -n "${MISTBORN_DEFAULT_PASSWORD}${SALT}" | sha256sum | awk '{print $1}' | tr a-z A-Z)
+
+sed -i "s/${HEXSTRINGS[1]}/$SALT/" /opt/mistborn_volumes/extra/guacamole/init/initdb.sql
+sed -i "s/${HEXSTRINGS[0]}/$GUAC_PASSWORD_HASHED/" /opt/mistborn_volumes/extra/guacamole/init/initdb.sql
+sed -i "s/guacadmin/mistborn/g" /opt/mistborn_volumes/extra/guacamole/init/initdb.sql
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+iptables -w -D DOCKER-USER -i $DIFACE -p udp --dport $JVB_PORT -j MISTBORN_LOG_DROP
+iptables -w -D DOCKER-USER -i $DIFACE -p tcp --dport $JVB_TCP_PORT -j MISTBORN_LOG_DROP
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+iptables -w -I DOCKER-USER -i $DIFACE -p udp --dport $JVB_PORT -j MISTBORN_LOG_DROP
+iptables -w -I DOCKER-USER -i $DIFACE -p tcp --dport $JVB_TCP_PORT -j MISTBORN_LOG_DROP
@@ -10,18 +10,17 @@ elif [ "$DISTRO" == "debian" ]; then
    && echo "buster-backports already in sources" \
    || echo 'deb http://deb.debian.org/debian buster-backports main' | sudo tee -a /etc/apt/sources.list.d/backports.list
    
-
-elif [ "$DISTRO" == "raspbian" ]; then
-    
+elif [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
    echo "Raspbian repos contain cockpit"
-
 fi
    
 sudo -E apt-get install -y cockpit

-if $(sudo apt-cache show cockpit-docker > /dev/null 2>&1) ; then
+if [ $(sudo apt-cache show cockpit-docker > /dev/null 2>&1) ]; then
    # no longer supported upstream in Ubuntu 20.04
    sudo -E apt-get install -y cockpit-docker
+elif [ $(sudo apt-cache show cockpit-podman > /dev/null 2>&1) ]; then
+    sudo -E apt-get install -y cockpit-podman
 fi

 sudo cp ./scripts/conf/cockpit.conf /etc/cockpit/cockpit.conf
@@ -16,5 +16,5 @@ fi

 # set docker-compose path used in Mistborn
 if [ ! -f /usr/local/bin/docker-compose ]; then
-    sudo ln -s $(which docker-compose) /usr/local/bin/docker-compose
+    sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose
 fi
@@ -15,7 +15,7 @@ if [ "$DISTRO" == "ubuntu" ]; then
    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 elif [ "$DISTRO" == "debian" ]; then
    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-elif [ "$DISTRO" == "raspbian" ]; then
+elif [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add -
 fi

@@ -31,7 +31,7 @@ elif [ "$DISTRO" == "debian" ]; then
   "deb https://download.docker.com/linux/debian \
   $(lsb_release -cs) \
   stable"
-elif [ "$DISTRO" == "raspbian" ]; then
+elif [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
    echo "deb [arch=armhf] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
     $(lsb_release -cs) stable" | \
    sudo tee /etc/apt/sources.list.d/docker.list
@@ -43,7 +43,7 @@ sudo apt-get update

 if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
    sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io
-elif [ "$DISTRO" == "raspbian" ]; then
+elif [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
    sudo -E apt install -y --no-install-recommends \
    docker-ce \
    cgroupfs-mount
@@ -59,10 +59,11 @@ echo "Installing Docker Compose"
 #    sudo chmod +x /usr/local/bin/docker-compose
 #elif [ "$DISTRO" == "raspbian" ]; then
 # Install required packages
-sudo -E apt install -y python-backports.ssl-match-hostname
+#sudo -E apt install -y python-backports.ssl-match-hostname

 # Install Docker Compose from pip
 # This might take a while
-sudo pip3 install docker-compose
+# cryptography >=3.4 requires rust to compile, and no rust compiler is readily available for ARM
+sudo pip3 install cryptography==3.3.2 docker-compose
 #fi

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# generate bitwarden .env files
+BITWARDEN_PROD_FILE="$1"
+echo "WEBSOCKET_ENABLED=true" > $BITWARDEN_PROD_FILE
+echo "SIGNUPS_ALLOWED=true" >> $BITWARDEN_PROD_FILE
+
+echo "MISTBORN_SERVICE_DOMAIN=bitwarden.mistborn" >> $BITWARDEN_PROD_FILE
+echo "MISTBORN_SERVICE_NAME=bitwarden" >> $BITWARDEN_PROD_FILE
+echo "MISTBORN_SERVICE_PORT=80" >> $BITWARDEN_PROD_FILE
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Guacamole
+GUAC_PROD_FILE="$1"
+GUAC_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
+echo "POSTGRES_HOST=guac_postgres" > $GUAC_PROD_FILE
+echo "POSTGRES_HOSTNAME=guac_postgres" > $GUAC_PROD_FILE
+echo "POSTGRES_PORT=5432" >> $GUAC_PROD_FILE
+echo "POSTGRES_DB=guacamole_db" >> $GUAC_PROD_FILE
+echo "POSTGRES_DATABASE=guacamole_db" >> $GUAC_PROD_FILE
+echo "POSTGRES_USER=guac_user" >> $GUAC_PROD_FILE
+echo "POSTGRES_PASSWORD=$GUAC_PASSWORD" >> $GUAC_PROD_FILE
+echo "MISTBORN_DEFAULT_PASSWORD=$MISTBORN_DEFAULT_PASSWORD" >> $GUAC_PROD_FILE
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# JITSI
+JITSI_PROD_FILE="$1"
+cp ${MISTBORN_HOME}/scripts/conf/jitsi.env $JITSI_PROD_FILE
+mkdir -p ${MISTBORN_HOME}/.envs/.production/.jitsi-cfg/{web/letsencrypt,transcripts,prosody,jicofo,jvb}
+sed -i "s/JICOFO_COMPONENT_SECRET.*/JICOFO_COMPONENT_SECRET=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
+sed -i "s/JICOFO_AUTH_PASSWORD.*/JICOFO_AUTH_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
+sed -i "s/JVB_AUTH_PASSWORD.*/JVB_AUTH_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
+sed -i "s/JIGASI_XMPP_PASSWORD.*/JIGASI_XMPP_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
+sed -i "s/JIBRI_RECORDER_PASSWORD.*/JIBRI_RECORDER_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
+sed -i "s/JIBRI_XMPP_PASSWORD.*/JIBRI_XMPP_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")/" "$JITSI_PROD_FILE"
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# generate nextcloud .env files
+NEXTCLOUD_PROD_FILE="$1"
+#NEXTCLOUD_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
+NEXTCLOUD_PASSWORD="${MISTBORN_DEFAULT_PASSWORD}"
+echo "NEXTCLOUD_ADMIN_USER=mistborn" > $NEXTCLOUD_PROD_FILE
+echo "NEXTCLOUD_ADMIN_PASSWORD=$NEXTCLOUD_PASSWORD" >> $NEXTCLOUD_PROD_FILE
+echo "NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.mistborn" >> $NEXTCLOUD_PROD_FILE
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# generate onlyoffice .env files
+ONLYOFFICE_PROD_FILE="$1"
+JWT_SECRET="${MISTBORN_DEFAULT_PASSWORD}"
+echo "JWT_ENABLED=true" > $ONLYOFFICE_PROD_FILE
+echo "JWT_SECRET=$JWT_SECRET" >> $ONLYOFFICE_PROD_FILE
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# generate rocketchat .env files
+ROCKETCHAT_PROD_FILE="$1"
+#ROCKETCHAT_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
+ROCKETCHAT_PASSWORD="${MISTBORN_DEFAULT_PASSWORD}"
+echo "ROCKETCHAT_USER=bot" > $ROCKETCHAT_PROD_FILE
+echo "ROCKETCHAT_ROOM=GENERAL" >> $ROCKETCHAT_PROD_FILE
+echo "BOT_NAME=bot" >> $ROCKETCHAT_PROD_FILE
+echo "ROCKETCHAT_PASSWORD=$ROCKETCHAT_PASSWORD" >> $ROCKETCHAT_PROD_FILE
+
+# docker environment
+echo "MISTBORN_BIND_IP=${MISTBORN_BIND_IP}" >> $ROCKETCHAT_PROD_FILE
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash

 figlet "Mistborn: Container Credentials"

 # generate production .env file for Django
 mkdir -p ./.envs/.production
+chmod 700 ./.envs
 DJANGO_PROD_FILE="./.envs/.production/.django"
 DJANGO_SECRET_KEY=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(50)]))")
 #CELERY_FLOWER_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
@@ -22,6 +23,7 @@ echo "#SENTRY_DNS=" >> $DJANGO_PROD_FILE
 echo "MISTBORN_INSTALL_COCKPIT=$MISTBORN_INSTALL_COCKPIT" >> $DJANGO_PROD_FILE
 echo "MISTBORN_PORTAL_IP=10.2.3.1" >> $DJANGO_PROD_FILE
 echo "MISTBORN_PORTAL_PORT=5000" >> $DJANGO_PROD_FILE
+chmod 600 $DJANGO_PROD_FILE

 # generate production .env file for postgresql
 POSTGRES_PROD_FILE="./.envs/.production/.postgres"
@@ -31,6 +33,7 @@ echo "POSTGRES_PORT=5432" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_DB=mistborn" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_USER=prod" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $POSTGRES_PROD_FILE
+chmod 600 $POSTGRES_PROD_FILE


 # generate production .env file for pihole
@@ -39,36 +42,4 @@ PIHOLE_PROD_FILE="./.envs/.production/.pihole"
 WEBPASSWORD="$1"
 echo "TZ=\"America/New York\"" > $PIHOLE_PROD_FILE
 echo "WEBPASSWORD=$WEBPASSWORD" >> $PIHOLE_PROD_FILE
-
-# generate rocketchat .env files
-ROCKETCHAT_PROD_FILE="./.envs/.production/.rocketchat"
-#ROCKETCHAT_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
-ROCKETCHAT_PASSWORD="$1"
-echo "ROCKETCHAT_USER=bot" > $ROCKETCHAT_PROD_FILE
-echo "ROCKETCHAT_ROOM=GENERAL" >> $ROCKETCHAT_PROD_FILE
-echo "BOT_NAME=bot" >> $ROCKETCHAT_PROD_FILE
-echo "ROCKETCHAT_PASSWORD=$ROCKETCHAT_PASSWORD" >> $ROCKETCHAT_PROD_FILE
-
-# generate nextcloud .env files
-NEXTCLOUD_PROD_FILE="./.envs/.production/.nextcloud"
-#NEXTCLOUD_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
-NEXTCLOUD_PASSWORD="$1"
-echo "NEXTCLOUD_ADMIN_USER=mistborn" > $NEXTCLOUD_PROD_FILE
-echo "NEXTCLOUD_ADMIN_PASSWORD=$NEXTCLOUD_PASSWORD" >> $NEXTCLOUD_PROD_FILE
-echo "NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.mistborn" >> $NEXTCLOUD_PROD_FILE
-
-# generate onlyoffice .env files
-ONLYOFFICE_PROD_FILE="./.envs/.production/.onlyoffice"
-JWT_SECRET="$1"
-echo "JWT_ENABLED=true" > $ONLYOFFICE_PROD_FILE
-echo "JWT_SECRET=$JWT_SECRET" >> $ONLYOFFICE_PROD_FILE
-
-# generate bitwarden .env files
-BITWARDEN_PROD_FILE="./.envs/.production/.bitwarden"
-echo "WEBSOCKET_ENABLED=true" > $BITWARDEN_PROD_FILE
-echo "SIGNUPS_ALLOWED=true" >> $BITWARDEN_PROD_FILE
-
-# JITSI
-JITSI_PROD_FILE="./.envs/.production/.jitsi"
-cp ./scripts/conf/jitsi.env $JITSI_PROD_FILE
-mkdir -p ./.envs/.production/.jitsi-cfg/{web/letsencrypt,transcripts,prosody,jicofo,jvb}
+chmod 600 $PIHOLE_PROD_FILE
@@ -113,6 +113,11 @@ fi

 # IP forwarding
 sudo sed -i 's/.*net.ipv4.ip_forward.*/net.ipv4.ip_forward=1/' /etc/sysctl.conf
+
+# VM Overcommit Memory
+sudo grep -i "vm.overcommit_memory" /etc/sysctl.conf && sudo sed -i 's/.*vm.overcommit_memory.*/vm.overcommit_memory=1/' /etc/sysctl.conf || echo "vm.overcommit_memory=1" | sudo tee -a /etc/sysctl.conf
+
+# Force re-read of sysctl.conf
 sudo sysctl -p /etc/sysctl.conf

 # rsyslog to create /var/log/iptables.log
@@ -1,6 +1,6 @@
 #!/bin/bash

-KEY_FOLDER="./tls/"
+KEY_FOLDER="/opt/mistborn_volumes/base/tls/"
 CRT_FILE="cert.crt"
 KEY_FILE="cert.key"

@@ -11,11 +11,15 @@ KEY_PATH="$KEY_FOLDER/$KEY_FILE"
 sudo -E apt-get install -y openssl

 # make folder
-mkdir -p $KEY_FOLDER
+sudo -E mkdir -p $KEY_FOLDER
+
+# clean old crt and key
+sudo -E rm -f ${KEY_FOLDER}/*

 # generate crt and key
-openssl req -x509 -sha256 -nodes -days 3650 -newkey rsa:4096 -keyout $KEY_PATH -out $CRT_PATH -subj "/C=US/ST=New York/L=New York/O=cyber5k/OU=mistborn/CN=*.mistborn/emailAddress=mistborn@localhost"
+sudo -E openssl req -x509 -sha256 -nodes -days 397 -newkey rsa:4096 -keyout $KEY_PATH -out $CRT_PATH -addext "subjectAltName=DNS:*.mistborn,DNS:home.mistborn,DNS:jitsi.mistborn,DNS:bitwarden.mistborn,DNS:chat.mistborn,DNS:homeassistant.mistborn,DNS:jellyfin.mistborn,DNS:syncthing.mistborn,DNS:nextcloud.mistborn,DNS:onlyoffice.mistborn" -addext extendedKeyUsage=serverAuth -subj "/C=US/ST=New York/L=New York/O=cyber5k/OU=mistborn/CN=*.mistborn/emailAddress=mistborn@localhost"

 # set permissions
+sudo -E chown -R mistborn:mistborn ${KEY_FOLDER}
 chmod 644 $CRT_PATH
 chmod 600 $KEY_PATH
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# INPUT default admin password
+while [ -z "${MISTBORN_DEFAULT_PASSWORD}" ] || [ ${MISTBORN_DEFAULT_PASSWORD} =~ ^[A-Za-z0-9_]+$ ]; do
+    echo
+    echo "(Mistborn) The default admin password may only container alphanumeric characters and _"
+    read -p "(Mistborn) Set default admin password: " -s MISTBORN_DEFAULT_PASSWORD
+    echo
+
+done
+
+echo
+echo "MISTBORN_DEFAULT_PASSWORD is set"
+echo
@@ -9,18 +9,19 @@ if ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ; then
    echo "Adding Wireguard PPAs"

    # Wireguard
-    if [ "$DISTRO" == "raspbian" ]; then
+    if [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
        echo "Adding Wireguard repo keys"
        sudo -E apt-get install -y dirmngr
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8B48AD6246925553
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7638D0442B90D010
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 648ACFD622F3D138 
    fi

    if [ "$DISTRO" == "ubuntu" ]; then
        # Ubuntu	
        sudo add-apt-repository -y ppa:wireguard/wireguard
-    elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
+    elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
        # Debian
        sudo bash -c 'echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list'
        sudo bash -c "printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable"
@@ -10,19 +10,14 @@ sudo git -C /opt/mistborn submodule update --init --recursive
 # ensure mistborn-cli is installed
 sudo pip3 install -e /opt/mistborn/modules/mistborn-cli

-# handle updates to Mistborn systemd scripts
-iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}')
-sudo cp /opt/mistborn/scripts/services/Mistborn* /etc/systemd/system/
-sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/User=root/User=mistborn/"
-sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/DIFACE/$iface/"
-
 # handle updates to traefik
-sudo cp /opt/mistborn/compose/production/traefik/traefik.toml.template /opt/mistborn/compose/production/traefik/traefik.toml
-
-sudo systemctl daemon-reload
-sudo systemctl enable Mistborn-setup.service
-sudo systemctl restart Mistborn-setup.service
+#sudo cp /opt/mistborn/compose/production/traefik/traefik.toml.template /opt/mistborn/compose/production/traefik/traefik.toml

 sudo mistborn-cli pullbuild

+sudo docker container prune -f
+sudo docker image prune -f
+
+sudo systemctl stop Mistborn-base
+sudo systemctl restart Mistborn-setup
 sudo systemctl restart Mistborn-base
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+
+SERVICE="$1"
+shift
+
+export MISTBORN_HOME="/opt/mistborn"
+export MISTBORN_SERVICE_FILE=${MISTBORN_HOME}/.envs/.production/.${SERVICE}
+export MISTBORN_SERVICE_INIT=${MISTBORN_HOME}/scripts/services/${SERVICE}/init.sh
+
+# check and create file if needed
+${MISTBORN_HOME}/scripts/env/check_env_file.sh ${SERVICE}
+
+# read in variables
+set -a
+source ${MISTBORN_HOME}/.env
+
+if [[ -f "${MISTBORN_SERVICE_FILE}" ]]; then
+    echo "Loading service variables"
+    source ${MISTBORN_SERVICE_FILE}
+else
+    echo "No service variables to load. Proceeding."
+fi
+set +a
+
+# call traefik-extra
+if [[ ! -z "${MISTBORN_SERVICE_NAME}" ]] && \
+   [[ ! -z "${MISTBORN_SERVICE_DOMAIN}" ]] && \
+   [[ ! -z "${MISTBORN_SERVICE_PORT}" ]]; then
+
+    echo "Populating traefik routes"
+
+    mistborn-cli traefik-extra \
+        --domain-name ${MISTBORN_SERVICE_DOMAIN} \
+        --service-name ${MISTBORN_SERVICE_NAME} \
+        --web-port ${MISTBORN_SERVICE_PORT}
+else
+    echo "Not populating traefik routes"
+fi
+
+# init script
+if [[ -f "${MISTBORN_SERVICE_INIT}" ]]; then
+    echo "Running init script"
+    ${MISTBORN_SERVICE_INIT}
+else
+    echo "No init script. Proceeding."
+fi
+
+exec "$@"
Author	SHA1	Message	Date
Steven Foerster	d1523b914a	sync cli	2021-03-16 22:20:54 -04:00
Steven Foerster	195d4923d7	typos	2021-03-16 20:16:56 -04:00
Steven Foerster	4b268de68c	checkouts	2021-03-16 17:04:45 -04:00
Steven Foerster	a57c529c73	refactor	2021-03-16 16:52:46 -04:00
Steven Foerster	445cf2678e	Merge branch '150-passwd' into 'master' Resolve "Mistborn default password parsing" Closes #150 See merge request cyber5k/mistborn!70	2021-03-12 18:04:21 +00:00
Steven Foerster	ce5dfb10fa	Resolve "Mistborn default password parsing"	2021-03-12 18:04:21 +00:00
Steven Foerster	d0a70d60a6	Merge branch '144-parsing' into 'master' parsing Closes #144 See merge request cyber5k/mistborn!69	2021-03-06 02:12:33 +00:00
Steven Foerster	84961c793f	parsing	2021-03-05 20:36:13 -05:00
Steven Foerster	9cb037d27f	Merge branch '142-updates' into 'master' Resolve "Updates - handle added extra services" Closes #142 See merge request cyber5k/mistborn!68	2021-03-03 17:21:46 +00:00
Steven Foerster	49bad9c7ba	Resolve "Updates - handle added extra services"	2021-03-03 17:21:45 +00:00
Steven Foerster	65ecd7ae7b	Merge branch '140-updates' into 'master' updates Closes #140 See merge request cyber5k/mistborn!67	2021-02-28 05:51:18 +00:00
Steven Foerster	b44a543172	updates	2021-02-28 00:33:15 -05:00
Steven Foerster	1669161d5d	Merge branch '139-guac' into 'master' Resolve "Guacamole details and prefix" Closes #139 See merge request cyber5k/mistborn!65	2021-02-27 17:48:43 +00:00
Steven Foerster	c2f42d6794	Resolve "Guacamole details and prefix"	2021-02-27 17:48:43 +00:00
Steven Foerster	53b5381150	Merge branch '137-guac' into 'master' Resolve "Add Apache Guacamole service" Closes #137 See merge request cyber5k/mistborn!64	2021-02-27 00:50:22 +00:00
Steven Foerster	442b43f472	Resolve "Add Apache Guacamole service"	2021-02-27 00:50:21 +00:00
Steven Foerster	c7d81b6ad3	Merge branch '136-cryptography' into 'master' Resolve "Error while installing Mistborn" Closes #136 See merge request cyber5k/mistborn!63	2021-02-17 04:26:58 +00:00
Steven Foerster	35b7a2f335	Resolve "Error while installing Mistborn"	2021-02-17 04:26:58 +00:00
Steven Foerster	a9771130ef	Merge branch '125-pihole-dnspooq' into 'master' Resolve "Update pihole: dnspooq" Closes #125 See merge request cyber5k/mistborn!62	2021-01-21 00:23:16 +00:00
Steven Foerster	d311c45ef5	Resolve "Update pihole: dnspooq"	2021-01-21 00:23:16 +00:00
Steven Foerster	fe9ba2714e	Merge branch '124-gpg' into 'master' use port 80 Closes #124 See merge request cyber5k/mistborn!61	2021-01-21 00:17:04 +00:00
Steven Foerster	5980955cc5	use port 80	2021-01-19 19:23:38 -05:00
Steven Foerster	6f9bada0dd	Merge branch '116-cockpit' into 'master' Resolve "E: Package 'cockpit-docker' has no installation candidate" Closes #116 See merge request cyber5k/mistborn!60	2021-01-18 15:14:44 +00:00
Steven Foerster	78c3ccf9de	Resolve "E: Package 'cockpit-docker' has no installation candidate"	2021-01-18 15:14:44 +00:00
Steven Foerster	434472d2fe	Merge branch '119-tls-ios' into 'master' Resolve "Jitsi - "You have beend disconnected" - Only on iOS devices, PC's fine" Closes #119 See merge request cyber5k/mistborn!59	2021-01-18 13:51:30 +00:00
Steven Foerster	a6f3430fc7	Resolve "Jitsi - "You have beend disconnected" - Only on iOS devices, PC's fine"	2021-01-18 13:51:30 +00:00
Steven Foerster	19c8a08308	Merge branch '122-pihole-version' into 'master' pihole version v5.3.4 Closes #122 See merge request cyber5k/mistborn!58	2021-01-16 21:06:42 +00:00
Steven Foerster	4a78fe1122	pihole version v5.3.4	2021-01-16 15:56:14 -05:00
Steven Foerster	06eff60808	Merge branch '112-service-restarts' into 'master' Resolve "Service Restarts" Closes #112 See merge request cyber5k/mistborn!57	2021-01-01 03:31:48 +00:00
Steven Foerster	edaff5575b	Resolve "Service Restarts"	2021-01-01 03:31:48 +00:00
Steven Foerster	2e82a1b805	Merge branch '107-jitsi' into 'master' Resolve "version control jitsi containers" Closes #107 See merge request cyber5k/mistborn!56	2020-12-11 02:25:46 +00:00
Steven Foerster	e958b64283	Resolve "version control jitsi containers"	2020-12-11 02:25:45 +00:00
Steven Foerster	480f62bc0d	Merge branch '105-jitsi' into 'master' Resolve "Jitsi Bouncing Error" Closes #105 See merge request cyber5k/mistborn!55	2020-12-10 00:31:55 +00:00
Steven Foerster	649b88977b	Resolve "Jitsi Bouncing Error"	2020-12-10 00:31:55 +00:00
Steven Foerster	09c3932e8d	Merge branch '104-security-scan' into 'master' security scan links Closes #104 See merge request cyber5k/mistborn!54	2020-12-06 03:33:30 +00:00
Steven Foerster	d3450f5ab3	security scan links	2020-12-05 22:28:22 -05:00
Steven Foerster	7b099f4069	Merge branch '103-tor-jitsi' into 'master' Resolve "Bug: Tor unable to start after Jitsi starts" Closes #103 See merge request cyber5k/mistborn!53	2020-12-06 00:41:15 +00:00
Steven Foerster	5596024be3	Resolve "Bug: Tor unable to start after Jitsi starts"	2020-12-06 00:41:15 +00:00
Steven Foerster	455bf6787c	Merge branch '102-bind-ip-chat' into 'master' Resolve "Defense in depth: bind IPs" Closes #102 See merge request cyber5k/mistborn!52	2020-12-06 00:35:21 +00:00
Steven Foerster	0a7644827e	Resolve "Defense in depth: bind IPs"	2020-12-06 00:35:21 +00:00
Steven Foerster	07f0b07d83	Merge branch '101-MFA-cockpit' into 'master' Resolve "Bugfix: MFA authentication routing for cockpit" Closes #101 See merge request cyber5k/mistborn!51	2020-12-05 04:14:50 +00:00
Steven Foerster	92e62620ee	Resolve "Bugfix: MFA authentication routing for cockpit"	2020-12-05 04:14:50 +00:00
Steven Foerster	de0d5747a3	Merge branch '100-MFA-traefik' into 'master' Resolve "Multi-Factor Authentication integration with Traefik" Closes #100 See merge request cyber5k/mistborn!50	2020-12-05 03:21:45 +00:00
Steven Foerster	51af2bbed9	Resolve "Multi-Factor Authentication integration with Traefik"	2020-12-05 03:21:44 +00:00
Steven Foerster	5e77276727	Merge branch '99-docs' into 'master' Resolve "Documentation: Linux Magazine" Closes #99 See merge request cyber5k/mistborn!49	2020-12-04 16:05:09 +00:00
Steven Foerster	d832a6821a	Resolve "Documentation: Linux Magazine"	2020-12-04 16:05:09 +00:00
Steven Foerster	35618623a9	Merge branch '98-diface' into 'master' Resolve "Bugfix: handling empty DIFACE" Closes #98 See merge request cyber5k/mistborn!48	2020-11-23 03:59:34 +00:00
Steven Foerster	c7c7a897d9	Resolve "Bugfix: handling empty DIFACE"	2020-11-23 03:59:34 +00:00
Steven Foerster	c632385ab5	Merge branch '94-docs' into 'master' Resolve "Some Bugs: Root PasswordLogin not disabled as espected, unable to resolve hostnames" Closes #94 See merge request cyber5k/mistborn!47	2020-11-10 20:25:44 +00:00
Steven Foerster	b7c63cb3a7	Resolve "Some Bugs: Root PasswordLogin not disabled as espected, unable to resolve hostnames"	2020-11-10 20:25:44 +00:00
Steven Foerster	d401a1137c	Merge branch '95-dns-stub' into 'master' Resolve "DNS not resolving after reboot" Closes #95 See merge request cyber5k/mistborn!46	2020-11-08 01:12:57 +00:00
Steven Foerster	5a306d91ee	Resolve "DNS not resolving after reboot"	2020-11-08 01:12:57 +00:00
Steven Foerster	e6de9a1e90	Merge branch '93-netfilter-persistent' into 'master' systemd require netfilter-persistent Closes #93 See merge request cyber5k/mistborn!44	2020-10-22 01:54:51 +00:00
Steven Foerster	fe26bcbd16	systemd require netfilter-persistent	2020-10-21 21:34:02 -04:00
Steven Foerster	1fa3a6d9e3	adding project support link	2020-09-23 10:23:24 -04:00
Steven Foerster	a80a52f0fd	Merge branch '82-public-ip' into 'master' syncing with docker image: public IP selection Closes #82 See merge request cyber5k/mistborn!43	2020-09-20 02:05:58 +00:00
Steven Foerster	4b8f82a93f	syncing with docker image: public IP selection	2020-09-19 11:31:47 -04:00
Steven Foerster	3fefb5b10c	Merge branch '84-docs' into 'master' Resolve "Unable to create wireguard config after successful installation on Azure" Closes #84 See merge request cyber5k/mistborn!42	2020-09-16 21:27:55 +00:00
Steven Foerster	221377c01f	Resolve "Unable to create wireguard config after successful installation on Azure"	2020-09-16 21:27:55 +00:00
Steven Foerster	bb2b4ffdcc	Merge branch '83-rocketchat-volumes' into 'master' rocketchat: mounting correct volumes Closes #83 See merge request cyber5k/mistborn!41	2020-09-15 19:47:56 +00:00
Steven Foerster	a29f77b34e	rocketchat: mounting correct volumes	2020-09-15 14:50:22 -04:00
Steven Foerster	4f5127fabc	Merge branch '79-jitsi-auth' into 'master' generate random passwords for jitsi internal use Closes #79 See merge request cyber5k/mistborn!40	2020-09-15 12:42:35 +00:00
Steven Foerster	083dcccdf5	mimic behavior of gen_passwords	2020-09-15 08:26:16 -04:00
Steven Foerster	b752f1410d	Merge branch '71-env' into 'master' Resolve "Mistborn and wireguard fail after restart and nextcloud" Closes #71 See merge request cyber5k/mistborn!39	2020-08-24 01:54:02 +00:00
Steven Foerster	c2143d278a	Resolve "Mistborn and wireguard fail after restart and nextcloud"	2020-08-24 01:54:02 +00:00
Steven Foerster	585a78ac1b	Merge branch '65-traefik' into 'master' traefik forward auth Closes #65 See merge request cyber5k/mistborn!38	2020-08-18 20:15:55 +00:00
Steven Foerster	9da4cfd43e	traefik forward auth	2020-08-18 20:15:55 +00:00
Steven Foerster	e7be5ae0c1	Merge branch '66-install' into 'master' unsupported OS Closes #66 See merge request cyber5k/mistborn!37	2020-08-09 13:48:06 +00:00
Steven Foerster	8d1de1695b	unsupported OS	2020-08-09 09:28:15 -04:00
Steven Foerster	33c8d6c231	Merge branch '61-traefik' into 'master' Resolve "Migrate to Traefik v2" Closes #61 See merge request cyber5k/mistborn!36	2020-08-08 23:23:28 +00:00
Steven Foerster	98e90af2d7	Resolve "Migrate to Traefik v2"	2020-08-08 23:23:28 +00:00
Steven Foerster	936822d777	pass environment during installation	2020-08-05 16:41:25 -04:00
Steven Foerster	a34d9c5cac	Merge branch '62-raspios' into 'master' Resolve "Raspberry Pi OS bugs" Closes #62 See merge request cyber5k/mistborn!35	2020-08-04 01:20:34 +00:00
Steven Foerster	2ac26e9a34	Resolve "Raspberry Pi OS bugs"	2020-08-04 01:20:33 +00:00
Steven Foerster	c96df527e6	Merge branch '38-tls' into 'master' Resolve "Stricter TLS requirements for iOS" Closes #38 See merge request cyber5k/mistborn!34	2020-07-31 02:00:53 +00:00
Steven Foerster	b417f466c8	Resolve "Stricter TLS requirements for iOS"	2020-07-31 02:00:53 +00:00