浏览代码

non-interactive vpn install

Bob Mottram 7 年前
父节点
当前提交
fdaad4e96f
共有 1 个文件被更改,包括 6 次插入36 次删除
  1. 6
    36
      src/freedombone-app-vpn

+ 6
- 36
src/freedombone-app-vpn 查看文件

@@ -163,19 +163,8 @@ function create_user_vpn_key {
163 163
         rm /etc/openvpn/easy-rsa/keys/$username.csr
164 164
     fi
165 165
 
166
-    echo '
167
-
168
-
169
-
170
-
171
-
172
-
173
-
174
-
175
-
176
-y
177
-y
178
-' | ./build-key "$username"
166
+    sed -i 's| --interact||g' build-key
167
+    ./build-key "$username"
179 168
 
180 169
     if [ ! -f /etc/openvpn/easy-rsa/keys/$username.crt ]; then
181 170
         echo $'VPN user cert not generated'
@@ -303,29 +292,10 @@ function install_vpn {
303 292
     if [ -f /etc/openvpn/easy-rsa/keys/${OPENVPN_SERVER_NAME}.csr ]; then
304 293
         rm /etc/openvpn/easy-rsa/keys/${OPENVPN_SERVER_NAME}.csr
305 294
     fi
306
-
307
-    echo '
308
-
309
-
310
-
311
-
312
-
313
-
314
-
315
-' | ./build-ca
316
-    echo '
317
-
318
-
319
-
320
-
321
-
322
-
323
-
324
-
325
-
326
-y
327
-y
328
-' | ./build-key-server $OPENVPN_SERVER_NAME
295
+    sed -i 's| --interact||g' build-key-server
296
+    sed -i 's| --interact||g' build-ca
297
+    ./build-ca
298
+    ./build-key-server $OPENVPN_SERVER_NAME
329 299
     if [ ! -f /etc/openvpn/easy-rsa/keys/${OPENVPN_SERVER_NAME}.crt ]; then
330 300
         echo $'OpenVPN crt not found'
331 301
         exit 7823352