Ver Fonte

Use autoconfiguration

Johannes Zellner há 9 anos atrás
pai
commit
28348497a2
2 ficheiros alterados com 10 adições e 28 exclusões
  1. 4 1
      logo.svg
  2. 6 27
      start.sh

+ 4 - 1
logo.svg

@@ -15,7 +15,10 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="logo.svg">
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/nebulon/projects/yellowtent/apps/nodebb-app/logo.png"
+   inkscape:export-xdpi="93.050003"
+   inkscape:export-ydpi="93.050003">
   <defs
      id="defs4" />
   <sodipodi:namedview

+ 6 - 27
start.sh

@@ -6,34 +6,17 @@ export NODE_ENV=production
 
 if [[ -z "$(ls -A /app/data)" ]]; then
     echo "First run"
-
-    uuid="$(uuid)"
-
-    cat > /app/data/config.json <<EOF
-{
-    "url": "https://${HOSTNAME}",
-    "secret": "$(uuid)",
-    "database": "mongo",
-    "mongo": {
-        "host": "${MONGODB_HOST}",
-        "port": "${MONGODB_PORT}",
-        "username": "${MONGODB_USERNAME}",
-        "password": "${MONGODB_PASSWORD}",
-        "database": "${MONGODB_DATABASE}"
-    }
-}
-EOF
 fi
 
-chown -R cloudron:cloudron /app/data
-
 cd /app/code
 
 setup="{
+    \"url\": \"https://${HOSTNAME}\",
     \"admin:username\": \"admin\",
-    \"admin:password:\": \"password\",
+    \"admin:password\": \"password\",
     \"admin:password:confirm\": \"password\",
-    \"admin:email\": \"admin@cloudron.io\"
+    \"admin:email\": \"admin@cloudron.io\",
+    \"database\": \"mongo\",
     \"mongo\": true,
     \"mongo:host\": \"${MONGODB_HOST}\",
     \"mongo:port\": \"${MONGODB_PORT}\",
@@ -42,9 +25,5 @@ setup="{
     \"mongo:database\": \"${MONGODB_DATABASE}\"
 }"
 
-# node app --setup ${setup}
-
-# npm run-script migrate (this is done automatically as part of prestart script
-# /usr/local/bin/gosu cloudron:cloudron npm start
-
-read
+node app --setup "${setup}"
+exec node app