Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
  • devel
  • hruska-feature-clients-api
  • malostik-#5066-deduplicate-idea-ids
  • warden-postgresql-port
  • hruska-feature-#6799-filter-keys
  • hruska-feature-5066-duplicateIdeaID
  • warden-client-1.1.0
  • warden-client-1.2.0
  • warden-client-2.0
  • warden-client-2.0.0-beta1
  • warden-client-2.0.0-beta2
  • warden-client-2.1
  • warden-client-2.1-beta
  • warden-client-2.2
  • warden-client-2.2-final
  • warden-client-3.0-beta0
  • warden-client-3.0-beta1
  • warden-client-3.0-beta2
  • warden-client-3.0-beta3
  • warden-server-0.1.0
  • warden-server-2.0
  • warden-server-2.0.0-beta1
  • warden-server-2.1
  • warden-server-2.1-aplha1
  • warden-server-2.1-beta1
  • warden-server-2.1-beta2
  • warden-server-2.1-beta3
  • warden-server-2.1-beta4
  • warden-server-2.1-beta5
  • warden-server-2.1-beta6
  • warden-server-2.1-patch1
  • warden-server-2.2
  • warden-server-2.2-final
  • warden-server-2.2-patch1
  • warden-server-2.2-patch3
  • warden-server-3.0-beta0
  • warden-server-3.0-beta1
  • warden-server-3.0-beta2
  • warden-server-3.0-beta3
40 results

Target

Select target project
No results found
Select Git revision
  • master
  • devel
  • hruska-feature-clients-api
  • malostik-#5066-deduplicate-idea-ids
  • warden-postgresql-port
  • hruska-feature-#6799-filter-keys
  • hruska-feature-5066-duplicateIdeaID
  • warden-client-1.1.0
  • warden-client-1.2.0
  • warden-client-2.0
  • warden-client-2.0.0-beta1
  • warden-client-2.0.0-beta2
  • warden-client-2.1
  • warden-client-2.1-beta
  • warden-client-2.2
  • warden-client-2.2-final
  • warden-client-3.0-beta0
  • warden-client-3.0-beta1
  • warden-client-3.0-beta2
  • warden-client-3.0-beta3
  • warden-server-0.1.0
  • warden-server-2.0
  • warden-server-2.0.0-beta1
  • warden-server-2.1
  • warden-server-2.1-aplha1
  • warden-server-2.1-beta1
  • warden-server-2.1-beta2
  • warden-server-2.1-beta3
  • warden-server-2.1-beta4
  • warden-server-2.1-beta5
  • warden-server-2.1-beta6
  • warden-server-2.1-patch1
  • warden-server-2.2
  • warden-server-2.2-final
  • warden-server-2.2-patch1
  • warden-server-2.2-patch3
  • warden-server-3.0-beta0
  • warden-server-3.0-beta1
  • warden-server-3.0-beta2
  • warden-server-3.0-beta3
40 results
Show changes

Commits on Source 5

5 files
+ 58
− 7
Compare changes
  • Side-by-side
  • Inline

Files

contrib/ansible/warden-filer-receiver/defaults/main.yml

+2 −0
Original line number Original line Diff line number Diff line 
---

---

server_admin: "{{ root@inventory_hostname }}"

server_admin: "{{ root@inventory_hostname }}"

warden_filer_bin_path: /opt/warden-filer

warden_filer_bin_path: /opt/warden-filer

warden_filer_lib_path: /var/lib/warden_filer

warden_filer_run_path: /run/warden_filer

warden_client_cert_path: /etc/ssl/certs/warden.cert.pem

warden_client_cert_path: /etc/ssl/certs/warden.cert.pem

warden_client_key_path: /etc/ssl/private/warden.key.pem

warden_client_key_path: /etc/ssl/private/warden.key.pem

warden_client_id_store: /var/lib/warden_filer/warden_filer.id

warden_client_id_store: /var/lib/warden_filer/warden_filer.id

contrib/ansible/warden-filer-receiver/tasks/main.yml

+36 −4
Original line number Original line Diff line number Diff line 
---

---

- name: Checkout Warden repository

- name: Checkout Warden repository

  git:

  git:

    repo: https://homeproj.cesnet.cz/git/warden.git/

    repo: https://gitlab.cesnet.cz/713/warden/warden.git

    version: warden-client-3.0-beta3

    version: warden-client-3.0-beta3

    dest: /tmp/warden_client_repository

    dest: /tmp/warden_client_repository





- name: Create bin dir for warden_filer

  file:

    path: "{{ warden_filer_bin_path }}"

    state: directory

    owner: root

    group: root

    mode: "755"



- name: Create lib and run dir for warden_filer

  file:

    path: "{{ item }}"

    state: directory

    owner: "{{ warden_filer_uid }}"

    group: "{{ warden_filer_gid }}"

    mode: "755"

  with_items: 

    - "{{ warden_filer_lib_path }}"

    - "{{ warden_filer_run_path }}"



- name: Install Filer binaries

- name: Install Filer binaries

  copy:

  copy:

    src: "/tmp/warden_client_repository/{{ src }}"

    remote_src: true

    dest: "{{ warden_filer_bin_path }}/{{ dest }}"

    src: "/tmp/warden_client_repository/{{ item.src }}"

    dest: "{{ warden_filer_bin_path }}/{{ item.dest }}"

    mode: "755"

  with_items:

  with_items:

    - src: warden_client/warden_client.py

    - src: warden_client/warden_client.py

      dest: warden_client.py

      dest: warden_client.py
@@ -17,15 +38,26 @@ 
    - src: warden_filer/check_file_count

    - src: warden_filer/check_file_count

      dest: check_file_count

      dest: check_file_count





- name: Link Filer binary to /usr/local/bin

  file:

    src: "{{ warden_filer_bin_path }}/warden_filer.py"

    dest: "/usr/local/bin/warden_filer.py"

    state: link

    owner: root

    group: root

    mode: "755"



- name: Install Warden Filer config

- name: Install Warden Filer config

  template:

  template:

    src: "{{ item }}"

    src: "{{ item }}"

    dest: "/{{ item }}"

    dest: "/{{ item }}"

  with_items:

  with_items:

    - etc/warden_filer.cfg

    - etc/warden_filer.cfg

    - etc/defaults/warden_filer_receiver

    - etc/default/warden_filer_receiver





- name: Install Warden Filer init script

- name: Install Warden Filer init script

  copy:

  copy:

    remote_src: true

    src: /tmp/warden_client_repository/warden_filer/warden_filer_receiver

    src: /tmp/warden_client_repository/warden_filer/warden_filer_receiver

    dest: /etc/init.d/warden_filer_receiver

    dest: /etc/init.d/warden_filer_receiver

    mode: "755"

contrib/ansible/warden-server/tasks/main.yml

+1 −1
Original line number Original line Diff line number Diff line 
---

---

- name: Checkout Warden repository

- name: Checkout Warden repository

  git:

  git:

    repo: https://homeproj.cesnet.cz/git/warden.git/

    repo: https://gitlab.cesnet.cz/713/warden/warden.git

    version: warden-server-3.0-beta3

    version: warden-server-3.0-beta3

    dest: /tmp/warden_server_repository

    dest: /tmp/warden_server_repository

warden_filer/warden_filer.py

+19 −2
Original line number Original line Diff line number Diff line
@@ -470,6 +470,18 @@ def get_configs(): 












def get_uid_gid(str_id, get_nam_func):

    if str_id:

        try:

            id = int(str_id)

        except ValueError:

            id = get_nam_func(str_id)[2]

    else:

        id = None

    return id







if __name__ == "__main__":

if __name__ == "__main__":





    args = get_args()

    args = get_args()
@@ -482,12 +494,17 @@ if __name__ == "__main__": 




    try:

    try:

        if args.daemon:

        if args.daemon:

            from pwd import getpwnam

            from grp import getgrnam

            uid = get_uid_gid(fconfig.get("uid"), getpwnam)

            gid = get_uid_gid(fconfig.get("gid"), getgrnam)



            daemonize(

            daemonize(

                work_dir = fconfig.get("work_dir", "."),

                work_dir = fconfig.get("work_dir", "."),

                chroot_dir = fconfig.get("chroot_dir"),

                chroot_dir = fconfig.get("chroot_dir"),

                umask = fconfig.get("umask"),

                umask = fconfig.get("umask"),

                uid = fconfig.get("uid"),

                uid = uid,

                gid = fconfig.get("gid"),

                gid = gid,

                pidfile = args.pid_file,

                pidfile = args.pid_file,

                files_preserve = get_logger_files(wclient.logger),

                files_preserve = get_logger_files(wclient.logger),

                signals = {

                signals = {