Pārlūkot izejas kodu

Local name, same as the project name

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
5b5bc5cff6

+ 1
- 1
src/freedombone-config Parādīt failu

244
     fi
244
     fi
245
 
245
 
246
     if [[ $ONION_ONLY != "no" ]]; then
246
     if [[ $ONION_ONLY != "no" ]]; then
247
-        DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
247
+        DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
248
     else
248
     else
249
         DEFAULT_DOMAIN_DETAILS_COMPLETE=
249
         DEFAULT_DOMAIN_DETAILS_COMPLETE=
250
         while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
250
         while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]

+ 3
- 1
src/freedombone-controlpanel Parādīt failu

49
 
49
 
50
 please_wait
50
 please_wait
51
 
51
 
52
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-vars
53
+
52
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
54
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
53
 for f in $UTILS_FILES
55
 for f in $UTILS_FILES
54
 do
56
 do
410
                 icann_address='-'
412
                 icann_address='-'
411
             fi
413
             fi
412
             if [[ $ONION_ONLY != 'no' ]]; then
414
             if [[ $ONION_ONLY != 'no' ]]; then
413
-                if [[ ${icann_address} != ${PROJECT_NAME}.local ]]; then
415
+                if [[ ${icann_address} != ${LOCAL_NAME}.local ]]; then
414
                     icann_address='-'
416
                     icann_address='-'
415
                 fi
417
                 fi
416
             fi
418
             fi

+ 1
- 1
src/freedombone-image Parādīt failu

93
 # An optional freedombone configuration file
93
 # An optional freedombone configuration file
94
 CONFIG_FILENAME=
94
 CONFIG_FILENAME=
95
 
95
 
96
-DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
96
+DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
97
 
97
 
98
 # Minimum number of characters in a password
98
 # Minimum number of characters in a password
99
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
99
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')

+ 1
- 1
src/freedombone-utils-config Parādīt failu

351
         domain_param=$(echo "$d" | awk -F '=' '{print $1}')
351
         domain_param=$(echo "$d" | awk -F '=' '{print $1}')
352
         if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" ]]; then
352
         if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" ]]; then
353
             domain_value=$(echo "$d" | awk -F '=' '{print $2}')
353
             domain_value=$(echo "$d" | awk -F '=' '{print $2}')
354
-            if [[ "$domain_value" != "${PROJECT_NAME}.local" ]]; then
354
+            if [[ "$domain_value" != "${LOCAL_NAME}.local" ]]; then
355
                 item_in_array "${domain_value}" "${checked_domains[@]}"
355
                 item_in_array "${domain_value}" "${checked_domains[@]}"
356
                 if [[ $? != 0 ]]; then
356
                 if [[ $? != 0 ]]; then
357
                     # test that this is a valid domain name
357
                     # test that this is a valid domain name

+ 1
- 1
src/freedombone-utils-onion Parādīt failu

161
     HTMLY_DOMAIN_NAME='htmly.local'
161
     HTMLY_DOMAIN_NAME='htmly.local'
162
     GHOST_DOMAIN_NAME='ghost.local'
162
     GHOST_DOMAIN_NAME='ghost.local'
163
     DOKUWIKI_DOMAIN_NAME='dokuwiki.local'
163
     DOKUWIKI_DOMAIN_NAME='dokuwiki.local'
164
-    DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
164
+    DEFAULT_DOMAIN_NAME="${LOCAL_NAME}.local"
165
     GIT_DOMAIN_NAME='gogs.local'
165
     GIT_DOMAIN_NAME='gogs.local'
166
 }
166
 }
167
 
167
 

+ 5
- 1
src/freedombone-utils-setup Parādīt failu

13
 # License
13
 # License
14
 # =======
14
 # =======
15
 #
15
 #
16
-# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
16
+# Copyright (C) 2014-2017 Bob Mottram <bob@freedombone.net>
17
 #
17
 #
18
 # This program is free software: you can redistribute it and/or modify
18
 # This program is free software: you can redistribute it and/or modify
19
 # it under the terms of the GNU Affero General Public License as published by
19
 # it under the terms of the GNU Affero General Public License as published by
32
     PROJECT_NAME='freedombone'
32
     PROJECT_NAME='freedombone'
33
 fi
33
 fi
34
 
34
 
35
+if [ ! $LOCAL_NAME ]; then
36
+    LOCAL_NAME=${PROJECT_NAME}
37
+fi
38
+
35
 DEFAULT_DOMAIN_NAME=
39
 DEFAULT_DOMAIN_NAME=
36
 DEFAULT_DOMAIN_CODE=
40
 DEFAULT_DOMAIN_CODE=
37
 MY_USERNAME=
41
 MY_USERNAME=

+ 3
- 0
src/freedombone-vars Parādīt failu

107
 # used to select mesh install functions when creating a mesh image
107
 # used to select mesh install functions when creating a mesh image
108
 INSTALLING_MESH=
108
 INSTALLING_MESH=
109
 
109
 
110
+# The .local avahi name
111
+LOCAL_NAME=${PROJECT_NAME}
112
+
110
 # NOTE: deliberately there is no "exit 0"
113
 # NOTE: deliberately there is no "exit 0"