diff --git a/AUTHORS.md b/AUTHORS.md
index e1234cb..2a38d10 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
-|[@myii](https://github.com/myii)|59
+|[@myii](https://github.com/myii)|60
|[@alxwr](https://github.com/alxwr)|40
|[@gravyboat](https://github.com/gravyboat)|36
|[@aboe76](https://github.com/aboe76)|32
@@ -12,7 +12,7 @@ Avatar|Contributor|Contributions
|[@javierbertoli](https://github.com/javierbertoli)|27
|[@nmadhok](https://github.com/nmadhok)|20
|[@puneetk](https://github.com/puneetk)|20
-|[@noelmcloughlin](https://github.com/noelmcloughlin)|12
+|[@noelmcloughlin](https://github.com/noelmcloughlin)|14
|[@techhat](https://github.com/techhat)|10
|[@ixs](https://github.com/ixs)|9
|[@landergate](https://github.com/landergate)|9
@@ -56,6 +56,7 @@ Avatar|Contributor|Contributions
|[@iggy](https://github.com/iggy)|1
|[@chorne-togetherwork](https://github.com/chorne-togetherwork)|1
|[@corywright](https://github.com/corywright)|1
+|[@dafyddj](https://github.com/dafyddj)|1
|[@ev0rtex](https://github.com/ev0rtex)|1
|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1
|[@fintanmm](https://github.com/fintanmm)|1
@@ -89,4 +90,4 @@ Avatar|Contributor|Contributions
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-20.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-10-05.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 911c9fe..8b7d651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
# Changelog
+# [1.0.0](https://github.com/saltstack-formulas/apache-formula/compare/v0.41.1...v1.0.0) (2020-10-05)
+
+
+### Code Refactoring
+
+* **formula:** align to template-formula & improve ci features ([47818fc](https://github.com/saltstack-formulas/apache-formula/commit/47818fc360fc87c94f51f2c2c7ff9317d4ecf875))
+
+
+### Continuous Integration
+
+* **pre-commit:** add to formula [skip ci] ([5532ed7](https://github.com/saltstack-formulas/apache-formula/commit/5532ed7a5b1c9afb5ca4348d3984c5ff357bacad))
+* **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([233111a](https://github.com/saltstack-formulas/apache-formula/commit/233111af11dd25b573928e746f19b06bcdbf19b9))
+
+
+### BREAKING CHANGES
+
+* **formula:** 'apache.sls' converted to new style 'init.ssl'
+* **formula:** "logrotate.sls" became "config/logrotate.sls"
+* **formula:** "debian_full.sls" became "config/debian_full.sls"
+* **formula:** "flags.sls" became "config/flags.sls"
+* **formula:** "manage_security" became "config/manage_security.sls"
+* **formula:** "mod_*.sls" became "config/mod_*.sls"
+* **formula:** "no_default_host.sls" became "config/no_default_host.sls"
+* **formula:** "own_default_host.sls" became "config/own_default_host.sls"
+* **formula:** "register_site.sls" became "config/register_site.sls"
+* **formula:** "server_status.sls" became "config/server_status.sls"
+* **formula:** "vhosts/" became "config/vhosts/"
+* **formula:** "mod_security/" became "config/mod_security/"
+
+NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls'
+NOT-BREAKING CHANGE: 'uninstall.sls' symlinked to 'clean.sls'
+
## [0.41.1](https://github.com/saltstack-formulas/apache-formula/compare/v0.41.0...v0.41.1) (2020-07-20)
diff --git a/FORMULA b/FORMULA
index 31396df..18d0b46 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: apache
os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD
os_family: RedHat, Debian, Suse, FreeBSD
-version: 0.41.1
+version: 1.0.0
release: 1
minimum_version: 2015.8
summary: Formula for installing Apache
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
new file mode 100644
index 0000000..74fa552
--- /dev/null
+++ b/docs/AUTHORS.rst
@@ -0,0 +1,269 @@
+.. role:: raw-html-m2r(raw)
+ :format: html
+
+
+Authors
+=======
+
+This list is sorted by the number of commits per contributor in *descending* order.
+
+.. list-table::
+ :header-rows: 1
+
+ * - Avatar
+ - Contributor
+ - Contributions
+ * - :raw-html-m2r:``
+ - `@myii `_
+ - 60
+ * - :raw-html-m2r:``
+ - `@alxwr `_
+ - 40
+ * - :raw-html-m2r:``
+ - `@gravyboat `_
+ - 36
+ * - :raw-html-m2r:``
+ - `@aboe76 `_
+ - 32
+ * - :raw-html-m2r:``
+ - `@whiteinge `_
+ - 31
+ * - :raw-html-m2r:``
+ - `@javierbertoli `_
+ - 27
+ * - :raw-html-m2r:``
+ - `@nmadhok `_
+ - 20
+ * - :raw-html-m2r:``
+ - `@puneetk `_
+ - 20
+ * - :raw-html-m2r:``
+ - `@noelmcloughlin `_
+ - 14
+ * - :raw-html-m2r:``
+ - `@techhat `_
+ - 10
+ * - :raw-html-m2r:``
+ - `@ixs `_
+ - 9
+ * - :raw-html-m2r:``
+ - `@landergate `_
+ - 9
+ * - :raw-html-m2r:``
+ - `@bradthurber `_
+ - 8
+ * - :raw-html-m2r:``
+ - `@babilen5 `_
+ - 8
+ * - :raw-html-m2r:``
+ - `@arthurlogilab `_
+ - 7
+ * - :raw-html-m2r:``
+ - `@stp-ip `_
+ - 7
+ * - :raw-html-m2r:``
+ - `@porunov `_
+ - 7
+ * - :raw-html-m2r:``
+ - `@genuss `_
+ - 6
+ * - :raw-html-m2r:``
+ - `@kadogo `_
+ - 6
+ * - :raw-html-m2r:``
+ - `@bmwiedemann `_
+ - 5
+ * - :raw-html-m2r:``
+ - `@eliasp `_
+ - 5
+ * - :raw-html-m2r:``
+ - `@multani `_
+ - 5
+ * - :raw-html-m2r:``
+ - `@rhertzog `_
+ - 4
+ * - :raw-html-m2r:``
+ - `@scambra `_
+ - 4
+ * - :raw-html-m2r:``
+ - `@daschatten `_
+ - 4
+ * - :raw-html-m2r:``
+ - `@adherzog `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@abrefort `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@arnisoph `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@opdude `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@louis-haddrell `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@Wenzel `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@abednarik `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@dexbleeker `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@vincentfretin `_
+ - 3
+ * - :raw-html-m2r:``
+ - `@bogdanr `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@carlovollebregt `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@thornycrackers `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@msciciel `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@actionjack `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@mosen `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@RyPeck `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@thatch45 `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@tibberg `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@emeygret `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@artmoni `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@alexfrosa `_
+ - 2
+ * - :raw-html-m2r:``
+ - `@jhops-ab `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@isntall `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@benjy `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@iggy `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@chorne-togetherwork `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@corywright `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@dafyddj `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@ev0rtex `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@dimitry-unified-streaming `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@fintanmm `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@fcrozat `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@SynPrime `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@jbouse `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@jerrykan `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@jcristau `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@kpostrup `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@morsik `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@madssj `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@mpeeters `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@xenophonf `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@mshade `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@fujexo `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@rmoorman `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@robruma `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@doublerr `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@netzvieh `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@skylerberg `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@wido `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@Yoda-BZH `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@abehling `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@ardin `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@mcarlton00 `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@mschiff `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@nigelsim `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@srse `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@tsenay `_
+ - 1
+ * - :raw-html-m2r:``
+ - `@ze42 `_
+ - 1
+
+
+----
+
+Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-10-05.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
new file mode 100644
index 0000000..ce8313c
--- /dev/null
+++ b/docs/CHANGELOG.rst
@@ -0,0 +1,232 @@
+
+Changelog
+=========
+
+`1.0.0 `_ (2020-10-05)
+---------------------------------------------------------------------------------------------------------
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **formula:** align to template-formula & improve ci features (\ `47818fc `_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **pre-commit:** add to formula [skip ci] (\ `5532ed7 `_\ )
+* **pre-commit:** enable/disable ``rstcheck`` as relevant [skip ci] (\ `233111a `_\ )
+
+BREAKING CHANGES
+^^^^^^^^^^^^^^^^
+
+
+* **formula:** 'apache.sls' converted to new style 'init.ssl'
+* **formula:** "logrotate.sls" became "config/logrotate.sls"
+* **formula:** "debian_full.sls" became "config/debian_full.sls"
+* **formula:** "flags.sls" became "config/flags.sls"
+* **formula:** "manage_security" became "config/manage_security.sls"
+* **formula:** "mod\ **.sls" became "config/mod*\ *.sls"
+* **formula:** "no_default_host.sls" became "config/no_default_host.sls"
+* **formula:** "own_default_host.sls" became "config/own_default_host.sls"
+* **formula:** "register_site.sls" became "config/register_site.sls"
+* **formula:** "server_status.sls" became "config/server_status.sls"
+* **formula:** "vhosts/" became "config/vhosts/"
+* **formula:** "mod_security/" became "config/mod_security/"
+
+NOT-BREAKING CHANGE: 'config.sls' became 'config/init.sls'
+NOT-BREAKING CHANGE: 'uninstall.sls' symlinked to 'clean.sls'
+
+`0.41.1 `_ (2020-07-20)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **server-status:** enable module in Debian family (\ `632802a `_\ )
+* **server-status:** manage module in debian (\ `eafa419 `_\ )
+
+Tests
+^^^^^
+
+
+* **default+modules:** add modules' tests suite (\ `b253625 `_\ )
+
+`0.41.0 `_ (2020-07-16)
+-----------------------------------------------------------------------------------------------------------
+
+Features
+^^^^^^^^
+
+
+* **vhosts/standard:** add support for ScriptAlias in standard vhost (\ `b88b437 `_\ )
+
+`0.40.0 `_ (2020-07-16)
+-----------------------------------------------------------------------------------------------------------
+
+Features
+^^^^^^^^
+
+
+* **redhat/apache-2.x.config.jinja:** allow override of default_charset (\ `648f589 `_\ )
+
+`0.39.5 `_ (2020-06-21)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **vhosts/cleanup:** check ``sites-enabled`` dir exists before listing it (\ `88373e3 `_\ ), closes `#278 `_
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **gemfile.lock:** add to repo with updated ``Gemfile`` [skip ci] (\ `61b903e `_\ )
+* **kitchen:** use ``saltimages`` Docker Hub where available [skip ci] (\ `6895fb9 `_\ )
+* **kitchen+travis:** remove ``master-py2-arch-base-latest`` [skip ci] (\ `16bb1b0 `_\ )
+* **travis:** add notifications => zulip [skip ci] (\ `2417a75 `_\ )
+* **workflows/commitlint:** add to repo [skip ci] (\ `2ce966d `_\ )
+
+`0.39.4 `_ (2020-04-02)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **mod_ssl:** update mod_ssl package variable to prevent clashes (\ `5591be2 `_\ )
+
+`0.39.3 `_ (2020-04-02)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **debian:** generate remoteip conf before a2enconf (\ `1ed69f6 `_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `275b5d5 `_\ )
+* **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `08cced2 `_\ )
+
+`0.39.2 `_ (2019-12-20)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **redhat:** add user & group lookup to configs (\ `36ad2b2 `_\ )
+
+`0.39.1 `_ (2019-12-20)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **mod_mpm:** cast to int to avoid Jinja type mismatch error (\ `21045c7 `_\ )
+
+`0.39.0 `_ (2019-12-20)
+-----------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `13be6f9 `_\ )
+* **travis:** apply changes from build config validation [skip ci] (\ `0aac479 `_\ )
+* **travis:** opt-in to ``dpl v2`` to complete build config validation (\ `19e90ea `_\ )
+* **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `6608ddf `_\ )
+* **travis:** run ``shellcheck`` during lint job [skip ci] (\ `2ff6b2f `_\ )
+* **travis:** use build config validation (beta) [skip ci] (\ `73160b2 `_\ )
+
+Features
+^^^^^^^^
+
+
+* **server-status:** allow remote servers to reach server-status page (\ `a3c0022 `_\ )
+
+`0.38.2 `_ (2019-11-07)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **apache/modules.sls:** fix duplicated ID (\ `57afd71 `_\ )
+
+`0.38.1 `_ (2019-11-05)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **mod_perl2.sls:** fix a2enmod perl2 error (\ `fba8d21 `_\ )
+* **release.config.js:** use full commit hash in commit link [skip ci] (\ `dc5593c `_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** use ``debian-10-master-py3`` instead of ``develop`` [skip ci] (\ `09d82a5 `_\ )
+* **kitchen:** use ``develop`` image until ``master`` is ready (\ ``amazonlinux``\ ) [skip ci] (\ `d0bf6f3 `_\ )
+* **kitchen+travis:** upgrade matrix after ``2019.2.2`` release [skip ci] (\ `fc0f869 `_\ )
+* **travis:** update ``salt-lint`` config for ``v0.0.10`` [skip ci] (\ `2622d48 `_\ )
+
+Performance Improvements
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **travis:** improve ``salt-lint`` invocation [skip ci] (\ `bf75770 `_\ )
+
+`0.38.0 `_ (2019-10-20)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **apache-2.2.config.jinja:** fix ``salt-lint`` errors (\ ` `_\ )
+* **apache-2.4.config.jinja:** fix ``salt-lint`` errors (\ ` `_\ )
+* **flags.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **init.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **map.jinja:** fix ``salt-lint`` errors (\ ` `_\ )
+* **mod_geoip.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **modsecurity.conf.jinja:** fix ``salt-lint`` errors (\ ` `_\ )
+* **modules.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **server_status.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **uninstall.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **vhosts/cleanup.sls:** fix ``salt-lint`` errors (\ ` `_\ )
+* **vhosts/minimal.tmpl:** fix ``salt-lint`` errors (\ ` `_\ )
+* **vhosts/proxy.tmpl:** fix ``salt-lint`` errors (\ ` `_\ )
+* **vhosts/redirect.tmpl:** fix ``salt-lint`` errors (\ ` `_\ )
+* **vhosts/standard.tmpl:** fix ``salt-lint`` errors (\ ` `_\ )
+* **yamllint:** fix all errors (\ ` `_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **formula:** use standard structure (\ ` `_\ )
+* **readme:** move to ``docs/`` directory and modify accordingly (\ ` `_\ )
+
+Features
+^^^^^^^^
+
+
+* **semantic-release:** implement for this formula (\ ` `_\ )
+
+Tests
+^^^^^
+
+
+* **mod_security_spec:** convert from Serverspec to InSpec (\ ` `_\ )