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

ansible.cfg

@@ -3,5 +3,6 @@ forks=20
 internal_poll_interval=0.001
 
 [ssh_connection]
-pipelining=True
-ssh_args="-o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+#pipelining=True
+#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

configs/allowed-sources.txt

@@ -5,6 +5,7 @@
 140.181.2.35
 140.181.2.36
 140.181.2.37
+140.181.2.41
 140.181.75.219
 140.181.101.163
 140.181.61.11
@@ -15,3 +16,8 @@
 140.181.63.34
 141.2.213.62
 141.2.213.61
+10.20.1.21
+140.181.117.191
+193.176.86.100
+140.181.60.100
+87.123.199.169

roles/dataserver/tasks/install_xrootd.yml

 ---
+  
+ - name: install required packages
+   package:
+     name:
+      - cmake
+      - g++
+      - openssl
+      - libssl-dev
+      - uuid-dev
+  
  - name: Download xrootd
    git:
     repo: https://github.com/xrootd/xrootd.git
     dest: /tmp/xrootd
-    version: stable-4.11.x
+    version: stable-5.0.x
    environment:
      https_proxy: "https://{{ http_proxy }}:{{ http_port }}"
    register: xrootd
@@ -15,6 +25,22 @@
     mode: 0777
    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
    command: cmake -DCMAKE_INSTALL_PATH=/usr/local/bin/ -DCMAKE_INSTALL_RPATH=/usr/local/lib/ ../
    args:
@@ -22,7 +48,7 @@
    when: xrootd.changed
 
  - name: Make xrootd
-   command: make -j 8
+   command: make -j 16
    args:
     chdir: "/tmp/xrootd/build"
    when: xrootd.changed
@@ -40,7 +66,7 @@
      - /usr/local/bin/xrootd
 
  - name: Use config file to xrootd
-   copy:
+   template:
     src: "xrootd@.service"
     dest: /lib/systemd/system/xrootd@.service
 

roles/dataserver/tasks/main.yml

 ---
-  - include: ssl.yml
+#  - include: ssl.yml
 #  - include: alice-xrootd.yml
   - include: install_xrootd.yml
   - include: firewalld.yml

roles/dataserver/templates/server_http.cf.j2

@@ -7,7 +7,7 @@ all.export / r/w
 oss.localroot /xrdmnt/
 
 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.cert {{certificate_parent_dir}}{{ certificate_path }}
 http.key {{certificate_parent_dir}}{{ private_key_path}}

roles/dataserver/templates/server_xrootd.cf.j2

-all.role server
-all.export / r/w
-oss.localroot /xrdmnt/
-xrd.port 1094
-all.pidpath /tmp/
-all.adminpath /tmp/
+#all.role server
+xrd.port {{ xrootd_xrootd_port }}
+all.pidpath {{xrdworkdir}}
+all.adminpath {{xrdworkdir}}
 cms.space 1k 2k
+all.export / r/w
+oss.localroot {{xrdmnt}}

roles/dataserver/files/xrootd@.service → roles/dataserver/templates/xrootd@.service

@@ -8,12 +8,13 @@ Documentation=http://xrootd.org/docs.html
 [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
 User=xrootd
-Group=xrootd
+#Group=xrootd
 Type=simple
 Restart=on-abort
 RestartSec=0
 KillMode=control-group
 LimitNOFILE=65536
-WorkingDirectory=/tmp/xrdworkdir
+Restart=always
+WorkingDirectory={{xrdworkdir}}
 [Install]
 RequiredBy=multi-user.target

roles/nginx/templates/proxy.conf

@@ -7,7 +7,7 @@ proxy_send_timeout 300;
 proxy_intercept_errors on;
 proxy_http_version 1.1;
 
-client_max_body_size        2048m;
+client_max_body_size        25000m;
 client_body_buffer_size 1024m;
 #client_body_temp_path /var/cache/nginx 1 2;
 #proxy_buffering off;

roles/sshconfig/files/config

@@ -62,7 +62,7 @@ AuthorizedKeysFile .ssh/authorized_keys
 # To disable tunneled clear text passwords, change to no here!
 #PasswordAuthentication yes
 #PermitEmptyPasswords no
-PasswordAuthentication no
+PasswordAuthentication yes
 
 # Change to no to disable s/key passwords
 #ChallengeResponseAuthentication yes