Merge branch 'devel' into 'test'

Devel

See merge request !7

files/egg.conf

@@ -20,7 +20,16 @@ server {
 
 server {
         listen 80;
-        server_name  ntadigital.it.liu.se egg.it.liu.se;
+        server_name ntadigital.it.liu.se;
+
+        location / {
+            return 301 http://egg.it.liu.se;
+        }
+}
+
+server {
+        listen 80;
+        server_name egg.it.liu.se;
 
         client_max_body_size 0;
 

files/nginx.conf

+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 4096;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+#    server {
+#        listen       80;
+#        listen       [::]:80;
+#        server_name  _;
+#        root         /usr/share/nginx/html;
+#
+#        # Load configuration files for the default server block.
+#        include /etc/nginx/default.d/*.conf;
+#
+#        error_page 404 /404.html;
+#        location = /404.html {
+#        }
+#
+#        error_page 500 502 503 504 /50x.html;
+#        location = /50x.html {
+#        }
+#    }
+
+# Settings for a TLS enabled server.
+#
+#    server {
+#        listen       443 ssl http2;
+#        listen       [::]:443 ssl http2;
+#        server_name  _;
+#        root         /usr/share/nginx/html;
+#
+#        ssl_certificate "/etc/pki/nginx/server.crt";
+#        ssl_certificate_key "/etc/pki/nginx/private/server.key";
+#        ssl_session_cache shared:SSL:1m;
+#        ssl_session_timeout  10m;
+#        ssl_ciphers PROFILE=SYSTEM;
+#        ssl_prefer_server_ciphers on;
+#
+#        # Load configuration files for the default server block.
+#        include /etc/nginx/default.d/*.conf;
+#
+#        error_page 404 /404.html;
+#            location = /40x.html {
+#        }
+#
+#        error_page 500 502 503 504 /50x.html;
+#            location = /50x.html {
+#        }
+#    }
+
+}
\ No newline at end of file

manifests/nginx.pp

@@ -6,11 +6,11 @@ class egg::nginx () {
     ensure => 'installed',
   }
   # inserf conf. files here
-  # file { '/etc/nginx/nginx.conf':
-  #   ensure => 'file',
-  #   source => "puppet:///modules/${module_name}/nginx.conf",
-  #   notify => Service['nginx'],
-  # }
+  file { '/etc/nginx/nginx.conf':
+    ensure => 'file',
+    source => "puppet:///modules/${module_name}/nginx.conf",
+    notify => Service['nginx'],
+  }
   file { '/etc/nginx/conf.d/egg.conf':
     ensure  => 'present',
     source  => "puppet:///modules/${module_name}/egg.conf",