소스 검색

Move to debian packaged certbot

Bob Mottram 8 년 전
부모
커밋
47db991abf
2개의 변경된 파일6개의 추가작업 그리고 19개의 파일을 삭제
  1. 6
    16
      src/freedombone-addcert
  2. 0
    3
      src/freedombone-utils-web

+ 6
- 16
src/freedombone-addcert 파일 보기

57
 DH_KEYLENGTH=2048
57
 DH_KEYLENGTH=2048
58
 INSTALL_DIR=/root/build
58
 INSTALL_DIR=/root/build
59
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
59
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
60
-LETSENCRYPT_REPO="https://github.com/certbot/certbot"
61
 MY_EMAIL_ADDRESS=
60
 MY_EMAIL_ADDRESS=
62
 FRIENDS_MIRRORS_SERVER=
61
 FRIENDS_MIRRORS_SERVER=
63
 FRIENDS_MIRRORS_PASSWORD=
62
 FRIENDS_MIRRORS_PASSWORD=
196
         fi
195
         fi
197
     fi
196
     fi
198
 
197
 
199
-    if [ ! -d $INSTALL_DIR ]; then
200
-        mkdir -p $INSTALL_DIR
201
-    fi
202
-    cd $INSTALL_DIR
203
-
204
-    # obtain the repo
205
-    if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
206
-        git_clone $LETSENCRYPT_REPO ${INSTALL_DIR}/letsencrypt
207
-        if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
208
-            exit 76283
198
+    if [ ! -f /usr/bin/certbot ]; then
199
+        apt-get -y install certbot -t jessie-backports
200
+        if [ ! -f /usr/bin/certbot ]; then
201
+            echo $'LetsEncrypt certbot failed to install'
202
+            exit 762830
209
         fi
203
         fi
210
-    else
211
-        cd ${INSTALL_DIR}/letsencrypt
212
-        git_pull $LETSENCRYPT_REPO
213
     fi
204
     fi
214
 
205
 
215
     # stop the web server
206
     # stop the web server
216
     systemctl stop nginx
207
     systemctl stop nginx
217
 
208
 
218
-    cd ${INSTALL_DIR}/letsencrypt
219
-    ./letsencrypt-auto certonly --server $LETSENCRYPT_SERVER --standalone -d $LETSENCRYPT_HOSTNAME --renew-by-default --agree-tos --email $MY_EMAIL_ADDRESS
209
+    certbot certonly --server $LETSENCRYPT_SERVER --standalone -d $LETSENCRYPT_HOSTNAME --renew-by-default --agree-tos --email $MY_EMAIL_ADDRESS
220
     if [ ! "$?" = "0" ]; then
210
     if [ ! "$?" = "0" ]; then
221
         echo $"Failed to install letsencrypt for domain $LETSENCRYPT_HOSTNAME"
211
         echo $"Failed to install letsencrypt for domain $LETSENCRYPT_HOSTNAME"
222
         systemctl start nginx
212
         systemctl start nginx

+ 0
- 3
src/freedombone-utils-web 파일 보기

31
 # default search engine for command line browser
31
 # default search engine for command line browser
32
 DEFAULT_SEARCH='https://searx.laquadrature.net'
32
 DEFAULT_SEARCH='https://searx.laquadrature.net'
33
 
33
 
34
-# This isn't used here, but is included for mirrors creation purposes
35
-LETSENCRYPT_REPO="https://github.com/letsencrypt/letsencrypt"
36
-
37
 # Whether Let's Encrypt is enabled for all sites
34
 # Whether Let's Encrypt is enabled for all sites
38
 LETSENCRYPT_ENABLED="no"
35
 LETSENCRYPT_ENABLED="no"
39
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
36
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'