Merge pull request #46 from meienberger/43-request-remove-requirement-for-being-user-id-1000

Remove requirement for being user id 1000

README.md

@@ -32,8 +32,6 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde
 ### Installation Requirements
 - Ubuntu 18.04 LTS or higher (or Debian 10)
 
-Make sure your User ID is `1000` (verify it by running `id -u`)
-
 ### Step 1. Download Tipi
 Run this in an empty directory where you want to install Tipi.
 

apps/filebrowser/docker-compose.yml

@@ -8,7 +8,8 @@ services:
       - PUID=1000
       - PGID=1000
     volumes:
-      - ${APP_DATA_DIR}/../..:/srv
+      - ${ROOT_FOLDER_HOST}/app-data:/srv/app-data
+      - ${ROOT_FOLDER_HOST}/media:/srv/media
       - ${APP_DATA_DIR}/data/db:/database
       - ${APP_DATA_DIR}/data/config:/config
     networks:

scripts/configure.sh

@@ -2,7 +2,6 @@
 set -e # Exit immediately if a command exits with a non-zero status.
 
 ROOT_FOLDER="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)"
-USERNAME="$(id -nu 1000)"
 
 echo
 echo "======================================"
@@ -15,11 +14,6 @@ echo "=============== TIPI ================="
 echo "======================================"
 echo
 
-# Enable passwordless sudo for $USERNAME
-if ! grep -q "${USERNAME} ALL=(ALL) NOPASSWD: ALL" /etc/sudoers; then
-  echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers
-fi
-
 sudo apt-get update
 sudo apt-get install -y jq coreutils ca-certificates curl gnupg lsb-release
 
@@ -54,15 +48,5 @@ if ! command -v docker-compose >/dev/null; then
   sudo chmod +x /usr/local/bin/docker-compose
 fi
 
-# create docker group
-if ! getent group docker >/dev/null; then
-  sudo groupadd docker
-fi
-sudo usermod -aG docker "${USERNAME}"
-
-# echo "Configuring permissions..."
-# echo
-# find "$ROOT_FOLDER" -path "$ROOT_FOLDER/app-data" -prune -o -exec chown 1000:1000 {} + || true
-
 # Create configured status
 touch "${ROOT_FOLDER}/state/configured"

scripts/start.sh

@@ -112,9 +112,6 @@ if [[ ! -f "${STATE_FOLDER}/users.json" ]]; then
   cp "${ROOT_FOLDER}/templates/users-sample.json" "${STATE_FOLDER}/users.json"
 fi
 
-chown -R 1000:1000 "${STATE_FOLDER}/apps.json"
-chown -R 1000:1000 "${STATE_FOLDER}/users.json"
-
 # Get current dns from host
 if [[ -f "/etc/resolv.conf" ]]; then
   TEMP=$(cat /etc/resolv.conf | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -n 1)
@@ -170,9 +167,6 @@ mv -f "$ENV_FILE" "$ROOT_FOLDER/.env"
 echo "Running system-info.sh..."
 bash "${ROOT_FOLDER}/scripts/system-info.sh"
 
-# Give permissions 1000:1000 to app data
-# chown -R 1000:1000 "${ROOT_FOLDER}/app-data"
-
 ## Don't run if config-only
 if [[ ! $ci == "true" ]]; then
 

scripts/stop.sh

@@ -20,8 +20,6 @@ STATE_FOLDER="${ROOT_FOLDER}/state"
 
 cd "$ROOT_FOLDER"
 
-ansible-playbook ansible/stop.yml -i ansible/hosts -e username="$USER"
-
 export DOCKER_CLIENT_TIMEOUT=240
 export COMPOSE_HTTP_TIMEOUT=240