Merge 496eef8 into 9e1f46e

Dockerfile

@@ -7,20 +7,20 @@ RUN apt-get update && \
 	rm -rf /var/lib/apt/lists/* && \
 	sed -i 's/session    required     pam_loginuid.so/#session    required     pam_loginuid.so/' /etc/pam.d/cron
 
-# Install letsencrypt.sh & dns-lexicon
-RUN git clone --depth 1 https://github.com/lukas2511/letsencrypt.sh.git /srv/letsencrypt && \
+# Install dehydrated (letsencrypt client) & dns-lexicon
+RUN git clone --depth 1 https://github.com/lukas2511/dehydrated.git /srv/dehydrated && \
 	pip install requests[security] dns-lexicon
 
-# Copy over letsencrypt and & cron files
-COPY ./examples/letsencrypt.default.sh /srv/letsencrypt/letsencrypt.default.sh
+# Copy over dehydrated and & cron files
+COPY ./examples/dehydrated.default.sh /srv/dehydrated/dehydrated.default.sh
 COPY ./examples/crontab /etc/crontab
-COPY ./examples/cron.sh /srv/letsencrypt/cron.sh
+COPY ./examples/cron.sh /srv/dehydrated/cron.sh
 
-# Configure Letsencrypt and Cron
+# Configure dehydrated and Cron
 # FIXME: This should be replaced with *your* domain name using a volume mount
-RUN echo "test.intranet.example.com" > /srv/letsencrypt/domains.txt && \
-	chmod +x /srv/letsencrypt/cron.sh && \
+RUN echo "test.intranet.example.com" > /srv/dehydrated/domains.txt && \
+	chmod +x /srv/dehydrated/cron.sh && \
 	crontab /etc/crontab && \
 	touch /var/log/cron
 
-CMD [ "/srv/letsencrypt/cron.sh" ]
+CMD [ "/srv/dehydrated/cron.sh" ]

README.md

@@ -161,10 +161,10 @@ So instead of specifying `--auth-username` and `--auth-token` flags when calling
 you could instead set the `LEXICON_CLOUDFLARE_USERNAME` and `LEXICON_CLOUDFLARE_TOKEN` environmental variables.
 
 ### Letsencrypt Instructions
-Lexicon has an example [letsencrypt.sh hook file](examples/letsencrypt.default.sh) that you can use for any supported provider. 
+Lexicon has an example [dehydrated hook file](examples/dehydrated.default.sh) that you can use for any supported provider.
 All you need to do is set the PROVIDER env variable. 
 
-	PROVIDER=cloudflare letsencrypt.sh --cron --hook letsencrypt.default.sh --challenge dns-01
+	PROVIDER=cloudflare dehydrated --cron --hook dehydrated.default.sh --challenge dns-01
 
 
 ## TroubleShooting & Useful Tools

examples/crontab

@@ -1,2 +1,2 @@
-@reboot root env - `cat /etc/environment` /srv/letsencrypt/letsencrypt.sh --cron --hook /srv/letsencrypt/letsencrypt.default.sh --challenge dns-01 >> /var/log/cron 2>&1
-@monthly root env - `cat /etc/environment` /srv/letsencrypt/letsencrypt.sh --cron --hook /srv/letsencrypt/letsencrypt.default.sh --challenge dns-01 >> /var/log/cron 2>&1
+@reboot root env - `cat /etc/environment` /srv/dehydrated/dehydrated --cron --hook /srv/dehydrated/dehydrated.default.sh --challenge dns-01 >> /var/log/cron 2>&1
+@monthly root env - `cat /etc/environment` /srv/dehydrated/dehydrated --cron --hook /srv/dehydrated/dehydrated.default.sh --challenge dns-01 >> /var/log/cron 2>&1

setup.py

@@ -81,7 +81,7 @@
     ],
 
     # What does your project relate to?
-    keywords='dns lexicon dns-lexicon letsencrypt ' + ' '.join(providers),
+    keywords='dns lexicon dns-lexicon dehydrated letsencrypt ' + ' '.join(providers),
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().