Merge pull request #215 from noelmcloughlin/fixes

Updated for Suse 15.0

nginx/ng/map.jinja

@@ -64,13 +64,13 @@
             'service': 'nginx',
             'webuser': 'nginx',
             'conf_file': '/etc/nginx/nginx.conf',
-            'server_available': '/etc/nginx/conf.d',
-            'server_enabled': '/etc/nginx/conf.d',
+            'server_available': '/etc/nginx/sites-available',
+            'server_enabled': '/etc/nginx/sites-enabled',
             'snippets_dir': '/etc/nginx/snippets',
             'server_use_symlink': False,
             'pid_file': '/run/nginx.pid',
             'gpg_check': True,
-            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key',
+            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_{{ grains.osrelease }}/repodata/repomd.xml.key',
             'openssl_package': 'openssl',
         },
         'Arch': {