refactor files

.gitignore

@@ -1 +1,138 @@
 *.swp
+/tests/etc
+/sitegen/hooks-enabled
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources/
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.4.3 (/usr/bin/python3.4)" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sitegen.iml" filepath="$PROJECT_DIR$/.idea/sitegen.iml" />
+    </modules>
+  </component>
+</project>

.idea/sitegen.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

sitegen.completion → bash/sitegen.completion

@@ -11,4 +11,4 @@ _sitegen()
     COMPREPLY=()
   fi
 }
-complete -F _sitegen sitegen
+#complete -F _sitegen sitegen

cert-check.sh

@@ -1,23 +0,0 @@
-#! /usr/bin/env sh
-
-if [ $# -ne 2 ]
-then
-  echo "Usage: cert-check directory checkend" >&2
-  exit 64
-fi
-
-dir="$1"
-checkend="$2"
-
-for cert in ${dir}/*.crt
-do
-  openssl x509 -noout -in "${cert}" -checkend "${checkend}"
-  will_expire="$?"
-  date="$(openssl x509 -noout -in "${cert}" -enddate | cut -d= -f2)"
-  if [ "${will_expire}" -eq 1 ]
-  then
-    site=$(basename "${cert}")
-    site=$(echo "${site}" | sed -re 's/(.+).crt/\1/')
-    echo "${site}" "${date}"
-  fi
-done

cert-renew-all.sh

@@ -1,23 +0,0 @@
-#! /usr/bin/env sh
-
-if [ $# -ne 2 ]
-then
-    name=$(basename "$0")
-    echo "Usage: ${name} directory checkend" >&2
-    exit 64
-fi
-
-dir="$1"
-checkend="$2"
-
-certs=$(cert-check "${dir}" "${checkend}")
-
-echo "${certs}"
-
-sites=$(echo "${certs}" | cut -d' ' -f1)
-
-for site in ${sites}
-do
-  echo
-  generate-ssl-cert "${site}"
-done

cron/sitegen-cert-renew

@@ -0,0 +1,3 @@
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+12 00  * * 1   root    sitegen --cert-renew

fake-letsencrypt.sh

@@ -1,18 +0,0 @@
-#! /usr/bin/env sh
-
-dir="$(dirname $(readlink -f "${0}"))"
-host="${1}"
-
-if [ "${host}" = "error.com" ]
-then
-    echo "Failed to get certificate" >&2
-    exit 1
-fi
-
-leDir="${dir}/tests/etc/letsencypt/live/${host}"
-
-sleep 1
-
-mkdir -p "${leDir}"
-touch "${leDir}/cert.pem" "${leDir}/privkey.pem" "${leDir}/chain.pem"
-echo "Generation successful"

generate-ssl-cert.sh

@@ -1,21 +0,0 @@
-#! /usr/bin/env bash
-
-if [ $# -eq 0 ]
-then
-  echo "Usage: generate-ssl-cert hostname [options]" >&2
-  exit 64
-fi
-
-host="$1"
-
-letsencrypt --agree-tos --renew-by-default --standalone --standalone-supported-challenges http-01 --http-01-port 9999 --server https://acme-v01.api.letsencrypt.org/directory certonly -d $*
-
-if [ $? -ne 0 ]
-then
-  echo "Failed to generate certificate" >&2
-  exit 1
-fi
-
-ln -sf /etc/letsencrypt/live/${host}/cert.pem /etc/ssl/private/${host}.crt
-ln -sf /etc/letsencrypt/live/${host}/privkey.pem /etc/ssl/private/${host}.key
-ln -sf /etc/letsencrypt/live/${host}/chain.pem /etc/ssl/private/${host}-chain.crt

install

@@ -8,19 +8,15 @@ then
   cp -r "${dir}/sitegen" /etc/sitegen
 fi &&
 
-cp "${dir}/sitegen.sh" /usr/local/bin/sitegen &&
-cp "${dir}/sitegen.completion" /etc/bash_completion.d/sitegen &&
-
-cp "${dir}/generate-ssl-cert.sh" /usr/local/bin/generate-ssl-cert &&
-cp "${dir}/cert-check.sh" /usr/local/bin/cert-check &&
-cp "${dir}/cert-renew-all.sh" /usr/local/bin/cert-renew-all &&
+cp "${dir}/sitegen.py" /usr/local/bin/sitegen &&
+cp "${dir}/bash/sitegen.completion" /etc/bash_completion.d/sitegen &&
 
 cp "${dir}/apache/letsencrypt.conf" /etc/apache2/conf-available/letsencrypt.conf &&
 a2enconf letsencrypt &&
 service apache2 reload &&
 
-if [ ! -e /etc/cron.d/cert-renew ]
+if [ ! -e /etc/cron.d/sitegen-cert-renew ]
 then
-  echo '12 00  * * 1   root    cert-renew-all /etc/ssl/private $((60 * 60 * 24 * 31))' > /etc/cron.d/cert-renew
+  cp "${dir}/cron/sitegen-cert-renew" /etc/cron.d/sitegen-cert-renew
 fi &&
 service cron reload

sitegen/hooks-available/cert/000-print

@@ -1,13 +1,10 @@
+#! /usr/bin/env sh
 host="${1}"
 cert_file="${2}"
 key_file="${3}"
-conf_include="${4}"
-site_conf="${5}"
-site_include="${6}"
+chain_file="${4}"
 
 echo "Host: ${host}"
-echo "Root Document: ${root_dir}"
-echo "Http Configuration Source: ${conf_conf}"
-echo "Site Configuration Source: ${conf_include}"
-echo "Http Configuration Destination: ${site_conf}"
-echo "Site Configuration Destination: ${site_include}"
+echo "Certificate File: ${cert_file}"
+echo "Key File: ${key_file}"
+echo "Chain File: ${chain_file}"

sitegen/hooks-available/site/000-print

@@ -1,3 +1,4 @@
+#! /usr/bin/env sh
 host="${1}"
 root_dir="${2}"
 conf_conf="${3}"

sitegen/hooks-available/site/050-letsencrypt

@@ -1,3 +1,4 @@
+#! /usr/bin/env sh
 host="${1}"
 root_dir="${2}"
 conf_conf="${3}"

sitegen/hooks-available/site/100-chown

@@ -1,3 +1,4 @@
+#! /usr/bin/env sh
 host="${1}"
 root_dir="${2}"
 conf_conf="${3}"

sitegen/hooks-available/site/200-a2ensite

@@ -1,3 +1,4 @@
+#! /usr/bin/env sh
 host="${1}"
 root_dir="${2}"
 conf_conf="${3}"

sitegen/hooks-available/site/300-reload

@@ -1,3 +1,4 @@
+#! /usr/bin/env sh
 host="${1}"
 root_dir="${2}"
 conf_conf="${3}"

sitegen/sitegen.json

@@ -0,0 +1,9 @@
+{
+  "siteConfDir": "/etc/apache2/sites-available/",
+  "siteDir": "/var/",
+  "confDir": "/etc/sitegen/",
+  "certRenewTime": 5356800,
+  "letsencryptCommand": "letsencrypt --agree-tos --renew-by-default --standalone --standalone-supported-challenges http-01 --http-01-port 9999 --server https://acme-v01.api.letsencrypt.org/directory certonly",
+  "letsencryptDir": "/etc/letsencrypt/live/",
+  "certDir": "/etc/ssl/private/"
+}

tests/fake-letsencrypt.sh

@@ -0,0 +1,22 @@
+#! /usr/bin/env sh
+
+dir="$(dirname $(readlink -f "${0}"))"
+host="${1}"
+
+if [ "${host}" = "error.com" ]
+then
+    echo "Failed to get certificate" >&2
+    exit 1
+fi &&
+
+if [ "${host}" = "" ]
+then
+    echo "No domain" >&2
+    exit 1
+fi &&
+
+leDir="${dir}/tests/etc/letsencrypt/live/${host}"
+
+
+mkdir -p "${leDir}" &&
+scp serv3:/etc/letsencrypt/live/${host}/* tests/etc/letsencrypt/live/${host}/

tests/sitegen.json

@@ -0,0 +1,9 @@
+{
+  "siteConfDir": "./tests/etc/apache2/sites-available/",
+  "siteDir": "./tests/var/",
+  "confDir": "./sitegen/",
+  "certRenewTime": 5356800,
+  "letsencryptCommand": "./tests/fake-letsencrypt.sh",
+  "letsencryptDir": "./tests/etc/letsencrypt/live/",
+  "certDir": "./tests/etc/ssl/private/"
+}