Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
egg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
liu-puppet-modules
egg
Commits
f91cc2ef
Commit
f91cc2ef
authored
1 year ago
by
Nils Olof Paulsson
Browse files
Options
Downloads
Plain Diff
Merge branch 'devel' into 'test'
Devel See merge request
!7
parents
3b84a364
cb805e76
No related branches found
No related tags found
2 merge requests
!8
Test
,
!7
Devel
Pipeline
#120482
passed
1 year ago
Stage: puppet
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
files/egg.conf
+10
-1
10 additions, 1 deletion
files/egg.conf
files/nginx.conf
+83
-0
83 additions, 0 deletions
files/nginx.conf
manifests/nginx.pp
+5
-5
5 additions, 5 deletions
manifests/nginx.pp
with
98 additions
and
6 deletions
files/egg.conf
+
10
−
1
View file @
f91cc2ef
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
files/nginx.conf
0 → 100644
+
83
−
0
View file @
f91cc2ef
# 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
This diff is collapsed.
Click to expand it.
manifests/nginx.pp
+
5
−
5
View file @
f91cc2ef
...
...
@@ -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"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment