docfixes
diff --git a/README.rst b/README.rst
index b563efc..037ddee 100644
--- a/README.rst
+++ b/README.rst
@@ -1,21 +1,37 @@
-==================================
-artifactory
-==================================
+===========
+Artifactory
+===========
-Service artifactory description
+JFrog Artifactory is the only Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
+
Sample pillars
==============
-Single artifactory service
+Single artifactory OSS edition from OS package
.. code-block:: yaml
artifactory:
server:
enabled: true
- version: icehouse
+ edition: oss
+ version: 4
+ source:
+ engine: pkg
+
+Single artifactory pro edition from OS package
+
+.. code-block:: yaml
+
+ artifactory:
+ server:
+ enabled: true
+ edition: pro
+ version: 4
+ source:
+ engine: pkg
Development and testing
@@ -38,7 +54,8 @@
(`Serverspec <https://github.com/neillturner/kitchen-verifier-serverspec>`_,
`InSpec <https://github.com/chef/kitchen-inspec>`_, Shell, Bats, ...) prior the verification is executed.
-Usage:
+Usage
+-----
.. code-block:: shell
@@ -56,4 +73,4 @@
Read more
=========
-* links
+* https://www.jfrog.com/confluence/display/RTF/Debian+Repositories
diff --git a/artifactory/files/nginx.conf b/artifactory/files/nginx.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/artifactory/files/nginx.conf
diff --git a/artifactory/map.jinja b/artifactory/map.jinja
index 2bbd8b6..d0d6260 100644
--- a/artifactory/map.jinja
+++ b/artifactory/map.jinja
@@ -1,29 +1,13 @@
-{%- set source_engine = salt['pillar.get']('artifactory:server:source:engine') %}
+{%- set source_edition = salt['pillar.get']('artifactory:server:edition') %}
{%- load_yaml as base_defaults %}
-{%- if source_engine == 'git' %}
Debian:
pkgs:
- - python-psycopg2
- dir:
- base: /srv/artifactory/venv
- home: /var/lib/artifactory
- workspace: /srv/artifactory/workspace
+ - jfrog-artifactory-{{ source_edition }}
RedHat:
pkgs:
- - python-psycopg2
- dir:
- base: /srv/artifactory/venv
- home: /var/lib/artifactory
- workspace: /srv/artifactory/workspace
-{%- else %}
-Debian:
- pkgs:
- - artifactory
- dir:
- base: /usr/lib/artifactory
-{%- endif %}
+ - jfrog-artifactory-{{ source_edition }}
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('artifactory:server')) %}
\ No newline at end of file