localhost

src/freedombone-app-etesync

@@ -46,8 +46,8 @@ ETESYNC_ONION_PORT=9860
 ETESYNC_REPO="https://github.com/etesync/server-skeleton"
 ETESYNC_COMMIT='8f50a69b39bef7f421590e3de26b822df0ceaf6e'
 ETESYNC_PORT_INTERNAL=8292
-ETESYNC_PUID=1000
-ETESYNC_PGID=1000
+#ETESYNC_PUID=1000
+#ETESYNC_PGID=1000
 
 # These parameters are used by the FreedomBox mobile app and web UI
 ETESYNC_SHORT_DESCRIPTION='End-to-End Encrypted Journaled Sync'
@@ -392,7 +392,7 @@ function install_etesync {
           echo '    client_max_body_size 75M;';
           echo '    location / {';
           echo '        include     /etc/nginx/uwsgi_params;';
-          echo "        uwsgi_pass  etesync:${ETESYNC_PORT_INTERNAL};";
+          echo "        uwsgi_pass  localhost:${ETESYNC_PORT_INTERNAL};";
           echo '    }';
           echo '';
           echo '    location /static {';
@@ -422,7 +422,7 @@ function install_etesync {
       echo '    client_max_body_size 75M;';
       echo '    location / {';
       echo '        include     /etc/nginx/uwsgi_params;';
-      echo "        uwsgi_pass  etesync:${ETESYNC_PORT_INTERNAL};";
+      echo "        uwsgi_pass  localhost:${ETESYNC_PORT_INTERNAL};";
       echo '    }';
       echo '';
       echo '    location /static {';
@@ -430,8 +430,8 @@ function install_etesync {
       echo '    }';
       echo '}'; } >> "$etesync_nginx_site"
 
-    groupadd -r -g ${ETESYNC_PGID} etesync
-    useradd -d "$ETESYNC_PATH" -r -M -s /bin/sh -g $ETESYNC_PGID -u $ETESYNC_PUID etesync
+    groupadd -r etesync
+    useradd -d "$ETESYNC_PATH" -r -M -s /bin/sh -g etesync etesync
 
     { echo '[Unit]';
       echo 'Description=etesync';
@@ -473,7 +473,7 @@ function install_etesync {
     python3 "${ETESYNC_PATH}/manage.py" collectstatic --no-input
     chown -R www-data:www-data "/var/www/$ETESYNC_DOMAIN_NAME/htdocs"
 
-    chown -R $ETESYNC_PUID:$ETESYNC_PGID "$ETESYNC_DATA_PATH"
+    chown -R etesync:etesync "$ETESYNC_DATA_PATH"
 
     echo "from django.contrib.auth.models import User; User.objects.create_superuser('$MY_USERNAME', '$MY_EMAIL_ADDRESS', '$ETESYNC_ADMIN_PASSWORD')" | python3 manage.py shell