Skip to content
Snippets Groups Projects
Commit f5d2fdc0 authored by p.n.kramp's avatar p.n.kramp
Browse files

Reworked dataserver paths to be more configurable. Increased maximum filesize...

Reworked dataserver paths to be more configurable. Increased maximum filesize for nginx to 25GB. Upgraded to xrootd v5.0
parent 72ddbe73
No related branches found
No related tags found
No related merge requests found
...@@ -3,5 +3,6 @@ forks=20 ...@@ -3,5 +3,6 @@ forks=20
internal_poll_interval=0.001 internal_poll_interval=0.001
[ssh_connection] [ssh_connection]
pipelining=True #pipelining=True
ssh_args="-o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" #ssh_args="-o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
ssh_args= -o PasswordAuthentication=yes -o StrictHostKeyChecking=no
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
140.181.2.35 140.181.2.35
140.181.2.36 140.181.2.36
140.181.2.37 140.181.2.37
140.181.2.41
140.181.75.219 140.181.75.219
140.181.101.163 140.181.101.163
140.181.61.11 140.181.61.11
...@@ -15,3 +16,8 @@ ...@@ -15,3 +16,8 @@
140.181.63.34 140.181.63.34
141.2.213.62 141.2.213.62
141.2.213.61 141.2.213.61
10.20.1.21
140.181.117.191
193.176.86.100
140.181.60.100
87.123.199.169
--- ---
- name: install required packages
package:
name:
- cmake
- g++
- openssl
- libssl-dev
- uuid-dev
- name: Download xrootd - name: Download xrootd
git: git:
repo: https://github.com/xrootd/xrootd.git repo: https://github.com/xrootd/xrootd.git
dest: /tmp/xrootd dest: /tmp/xrootd
version: stable-4.11.x version: stable-5.0.x
environment: environment:
https_proxy: "https://{{ http_proxy }}:{{ http_port }}" https_proxy: "https://{{ http_proxy }}:{{ http_port }}"
register: xrootd register: xrootd
...@@ -15,6 +25,22 @@ ...@@ -15,6 +25,22 @@
mode: 0777 mode: 0777
when: xrootd.changed when: xrootd.changed
- name: Creates /etc/xrootd
file:
path: "/etc/xrootd"
state: directory
mode: 0744
owner: xrootd
when: xrootd.changed
- name: Creates /var/log/xrootd
file:
path: "/var/log/xrootd"
state: directory
mode: 0744
owner: xrootd
when: xrootd.changed
- name: CMake xrootd - name: CMake xrootd
command: cmake -DCMAKE_INSTALL_PATH=/usr/local/bin/ -DCMAKE_INSTALL_RPATH=/usr/local/lib/ ../ command: cmake -DCMAKE_INSTALL_PATH=/usr/local/bin/ -DCMAKE_INSTALL_RPATH=/usr/local/lib/ ../
args: args:
...@@ -22,7 +48,7 @@ ...@@ -22,7 +48,7 @@
when: xrootd.changed when: xrootd.changed
- name: Make xrootd - name: Make xrootd
command: make -j 8 command: make -j 16
args: args:
chdir: "/tmp/xrootd/build" chdir: "/tmp/xrootd/build"
when: xrootd.changed when: xrootd.changed
...@@ -40,7 +66,7 @@ ...@@ -40,7 +66,7 @@
- /usr/local/bin/xrootd - /usr/local/bin/xrootd
- name: Use config file to xrootd - name: Use config file to xrootd
copy: template:
src: "xrootd@.service" src: "xrootd@.service"
dest: /lib/systemd/system/xrootd@.service dest: /lib/systemd/system/xrootd@.service
......
--- ---
- include: ssl.yml # - include: ssl.yml
# - include: alice-xrootd.yml # - include: alice-xrootd.yml
- include: install_xrootd.yml - include: install_xrootd.yml
- include: firewalld.yml - include: firewalld.yml
...@@ -7,7 +7,7 @@ all.export / r/w ...@@ -7,7 +7,7 @@ all.export / r/w
oss.localroot /xrdmnt/ oss.localroot /xrdmnt/
if exec xrootd if exec xrootd
xrd.protocol http:{{ xrootd_port}} /usr/local/lib/libXrdHttp-4.so xrd.protocol http:{{ xrootd_port}} /usr/local/lib/libXrdHttp-5.so
http.cadir /etc/grid-security/certificates http.cadir /etc/grid-security/certificates
http.cert {{certificate_parent_dir}}{{ certificate_path }} http.cert {{certificate_parent_dir}}{{ certificate_path }}
http.key {{certificate_parent_dir}}{{ private_key_path}} http.key {{certificate_parent_dir}}{{ private_key_path}}
......
all.role server #all.role server
all.export / r/w xrd.port {{ xrootd_xrootd_port }}
oss.localroot /xrdmnt/ all.pidpath {{xrdworkdir}}
xrd.port 1094 all.adminpath {{xrdworkdir}}
all.pidpath /tmp/
all.adminpath /tmp/
cms.space 1k 2k cms.space 1k 2k
all.export / r/w
oss.localroot {{xrdmnt}}
...@@ -8,12 +8,13 @@ Documentation=http://xrootd.org/docs.html ...@@ -8,12 +8,13 @@ Documentation=http://xrootd.org/docs.html
[Service] [Service]
ExecStart=/usr/local/bin/xrootd -l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd.cf -k fifo -s /tmp/xrootd-%i.pid -n %i ExecStart=/usr/local/bin/xrootd -l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd.cf -k fifo -s /tmp/xrootd-%i.pid -n %i
User=xrootd User=xrootd
Group=xrootd #Group=xrootd
Type=simple Type=simple
Restart=on-abort Restart=on-abort
RestartSec=0 RestartSec=0
KillMode=control-group KillMode=control-group
LimitNOFILE=65536 LimitNOFILE=65536
WorkingDirectory=/tmp/xrdworkdir Restart=always
WorkingDirectory={{xrdworkdir}}
[Install] [Install]
RequiredBy=multi-user.target RequiredBy=multi-user.target
...@@ -7,7 +7,7 @@ proxy_send_timeout 300; ...@@ -7,7 +7,7 @@ proxy_send_timeout 300;
proxy_intercept_errors on; proxy_intercept_errors on;
proxy_http_version 1.1; proxy_http_version 1.1;
client_max_body_size 2048m; client_max_body_size 25000m;
client_body_buffer_size 1024m; client_body_buffer_size 1024m;
#client_body_temp_path /var/cache/nginx 1 2; #client_body_temp_path /var/cache/nginx 1 2;
#proxy_buffering off; #proxy_buffering off;
......
...@@ -62,7 +62,7 @@ AuthorizedKeysFile .ssh/authorized_keys ...@@ -62,7 +62,7 @@ AuthorizedKeysFile .ssh/authorized_keys
# To disable tunneled clear text passwords, change to no here! # To disable tunneled clear text passwords, change to no here!
#PasswordAuthentication yes #PasswordAuthentication yes
#PermitEmptyPasswords no #PermitEmptyPasswords no
PasswordAuthentication no PasswordAuthentication yes
# Change to no to disable s/key passwords # Change to no to disable s/key passwords
#ChallengeResponseAuthentication yes #ChallengeResponseAuthentication yes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment