diff --git a/Makefile b/Makefile index 4f16126..d88e22c 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,9 @@ ifneq ($(strip $(DESTDIR)),) mkdir -p $(DESTDIR) endif - install -Dm755 getssl $(DESTDIR)/usr/bin/getssl - - install -dm755 $(DESTDIR)/usr/share/getssl - cp -r *_scripts $(DESTDIR)/usr/share/getssl + install -Dvm755 getssl $(DESTDIR)/usr/bin/getssl + install -dvm755 $(DESTDIR)/usr/share/getssl + for dir in *_scripts; do install -dv $(DESTDIR)/usr/share/getssl/$$dir; install -pv $$dir/* $(DESTDIR)/usr/share/getssl/$$dir/; done .PHONY: install diff --git a/dns_scripts/00GoDaddy-README.txt b/dns_scripts/00GoDaddy-README.txt index f53ab03..d58ba73 100644 --- a/dns_scripts/00GoDaddy-README.txt +++ b/dns_scripts/00GoDaddy-README.txt @@ -22,28 +22,20 @@ There are two prerequisites to using getssl with GoDaddy DNS: With those in hand, the installation procedure is: -1) Create a "myscripts" directory under ~/.getssl/ +1) Put JSON.sh in the getssl DNS scripts directory + Default: /usr/share/getssl/dns_scripts -2) Put JSON.sh in "myscripts" - -3) Copy (or softlink from the distribution directory) the - following files to "myscripts": - dns_godaddy dns_add_godaddy dns_del_godaddy - None of these files need to be customized. - -4) Open your config file (the global file in ~/.getssl/getssl.cfg +2) Open your config file (the global file in ~/.getssl/getssl.cfg or the per-account file in ~/.getssl/example.net/getssl.cfg -5) Set the following options: +3) Set the following options: VALIDATE_VIA_DNS="true" - DNS_ADD_COMMAND="/path/to/myscripts/dns_add_godaddy" - DNS_DEL_COMMAND="/path/to/myscripts/dns_del_godaddy" + DNS_ADD_COMMAND="/usr/share/getssl/dns_scripts/dns_add_godaddy" + DNS_DEL_COMMAND="/usr/share/getssl/dns_scripts/dns_del_godaddy" # The API key for your account/this domain export GODADDY_KEY="..." GODADDY_SECRET="..." - Note that ~user/ probably won't work in the path. - -6) Set any other options that you wish (per the standard + 4) Set any other options that you wish (per the standard directions.) Use the test CA to make sure that everything is setup correctly. diff --git a/dns_scripts/dns_add_godaddy b/dns_scripts/dns_add_godaddy index 4983ea9..f7a871c 100755 --- a/dns_scripts/dns_add_godaddy +++ b/dns_scripts/dns_add_godaddy @@ -12,7 +12,8 @@ # # Obtain JSON.sh from https://github.com/dominictarr/JSON.sh # Place it in (or softlink it to) the same directory as $GODADDY_SCRIPT, -# or specify its location with GODADDY_JSON +# or specify its location with GODADDY_JSON The default is +# /usr/share/getssl/dns_scripts/ # # Define GODADDY_KEY and GO_DADDY_SECRET in your account or domain getssl.cfg # @@ -21,7 +22,7 @@ fulldomain="$1" token="$2" -[ -z "$GODADDY_SCRIPT" ] && GODADDY_SCRIPT="~/.getssl/myscripts/dns_godaddy" +[ -z "$GODADDY_SCRIPT" ] && GODADDY_SCRIPT="/usr/share/getssl/dns_scripts/dns_godaddy" [[ "$GODADDY_SCRIPT" =~ ^~ ]] && \ eval 'GODADDY_SCRIPT=`readlink -nf ' $GODADDY_SCRIPT '`' diff --git a/dns_scripts/dns_del_godaddy b/dns_scripts/dns_del_godaddy index c261998..7ca0da9 100755 --- a/dns_scripts/dns_del_godaddy +++ b/dns_scripts/dns_del_godaddy @@ -12,7 +12,8 @@ # # Obtain JSON.sh from https://github.com/dominictarr/JSON.sh # Place it in (or softlink it to) the same directory as $GODADDY_SCRIPT, -# or specify its location with GODADDY_JSON +# or specify its location with GODADDY_JSON The default is +# /usr/share/getssl/dns_scripts/ # # Define GODADDY_KEY and GO_DADDY_SECRET in your account or domain getssl.cfg # @@ -21,7 +22,7 @@ fulldomain="$1" token="$2" -[ -z "$GODADDY_SCRIPT" ] && GODADDY_SCRIPT="~/.getssl/myscripts/dns_godaddy" +[ -z "$GODADDY_SCRIPT" ] && GODADDY_SCRIPT="/usr/share/getssl/dns_scripts/dns_godaddy" [[ "$GODADDY_SCRIPT" =~ ^~ ]] && \ eval 'GODADDY_SCRIPT=`readlink -nf ' $GODADDY_SCRIPT '`'