浏览代码

Include letsencrypt within trove

Bob Mottram 9 年前
父节点
当前提交
8f86b556c7
共有 4 个文件被更改,包括 8 次插入5 次删除
  1. 3
    0
      src/freedombone
  2. 2
    2
      src/freedombone-addcert
  3. 1
    1
      src/freedombone-client
  4. 2
    2
      src/freedombone-mesh

+ 3
- 0
src/freedombone 查看文件

95
 FRIENDS_TROVE_SERVER=
95
 FRIENDS_TROVE_SERVER=
96
 FRIENDS_TROVE_SSH_PORT=2222
96
 FRIENDS_TROVE_SSH_PORT=2222
97
 
97
 
98
+# This isn't used here, but is included for trove creation purposes
99
+LETSENCRYPT_REPO="https://github.com/letsencrypt/letsencrypt"
100
+
98
 # An optional password to log into IRC. This applies to all users
101
 # An optional password to log into IRC. This applies to all users
99
 IRC_PASSWORD=
102
 IRC_PASSWORD=
100
 
103
 

+ 2
- 2
src/freedombone-addcert 查看文件

48
 DH_KEYLENGTH=2048
48
 DH_KEYLENGTH=2048
49
 INSTALL_DIR=/root/build
49
 INSTALL_DIR=/root/build
50
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
50
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
51
-LETSENCRYPT_REPO='https://github.com/letsencrypt/letsencrypt'
51
+LETSENCRYPT_REPO="https://github.com/letsencrypt/letsencrypt"
52
 MY_EMAIL_ADDRESS=
52
 MY_EMAIL_ADDRESS=
53
 
53
 
54
 function show_help {
54
 function show_help {
184
 
184
 
185
     # obtain the repo
185
     # obtain the repo
186
     if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
186
     if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
187
-        git clone $LETSENCRYPT_REPO
187
+        git clone $LETSENCRYPT_REPO ${INSTALL_DIR}/letsencrypt
188
         if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
188
         if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
189
             exit 76283
189
             exit 76283
190
         fi
190
         fi

+ 1
- 1
src/freedombone-client 查看文件

130
               mkdir ~/develop
130
               mkdir ~/develop
131
           fi
131
           fi
132
           cd ~/develop
132
           cd ~/develop
133
-          git clone $TOXID_REPO
133
+          git clone $TOXID_REPO ~/develop/toxid
134
       fi
134
       fi
135
       cd ~/develop/toxid
135
       cd ~/develop/toxid
136
       sudo make install
136
       sudo make install

+ 2
- 2
src/freedombone-mesh 查看文件

65
         mkdir ~/develop
65
         mkdir ~/develop
66
     fi
66
     fi
67
     cd ~/develop
67
     cd ~/develop
68
-    git clone $TOXCORE_REPO
68
+    git clone $TOXCORE_REPO ~/develop/toxcore
69
     cd ~/develop/toxcore
69
     cd ~/develop/toxcore
70
     autoreconf -i
70
     autoreconf -i
71
     ./configure --enable-daemon
71
     ./configure --enable-daemon
144
         return
144
         return
145
     fi
145
     fi
146
     cd ~/develop
146
     cd ~/develop
147
-    git clone $TOXID_REPO
147
+    git clone $TOXID_REPO ~/develop/toxid
148
     cd ~/develop/toxid
148
     cd ~/develop/toxid
149
     make
149
     make
150
     sudo make install
150
     sudo make install