resolve conflict
Showing
- roles/enable_root/templates/authorized_keys.j2 1 addition, 0 deletionsroles/enable_root/templates/authorized_keys.j2
- roles/karaage3.1.17/tasks/karaage.yml 18 additions, 7 deletionsroles/karaage3.1.17/tasks/karaage.yml
- roles/karaage3.1.17/tasks/main.yml 10 additions, 0 deletionsroles/karaage3.1.17/tasks/main.yml
- roles/karaage3.1.17/templates/default-ssl.j2 5 additions, 4 deletionsroles/karaage3.1.17/templates/default-ssl.j2
- roles/karaage3.1.17/templates/settings.py.j2 2 additions, 1 deletionroles/karaage3.1.17/templates/settings.py.j2
- roles/karaage3.1.17/vars/readme.txt 4 additions, 0 deletionsroles/karaage3.1.17/vars/readme.txt
- roles/ldapserver/meta/main.yml 0 additions, 3 deletionsroles/ldapserver/meta/main.yml
- roles/ldapserver/tasks/main.yml 71 additions, 18 deletionsroles/ldapserver/tasks/main.yml
- roles/ldapserver/templates/load_modules_ldif.j2 1 addition, 1 deletionroles/ldapserver/templates/load_modules_ldif.j2
- roles/ldapserver/vars/CentOS.yml 1 addition, 1 deletionroles/ldapserver/vars/CentOS.yml
- roles/ldapserver/vars/Debian.yml 5 additions, 0 deletionsroles/ldapserver/vars/Debian.yml
- roles/mysql/tasks/mysql_server.yml 1 addition, 1 deletionroles/mysql/tasks/mysql_server.yml
- roles/mysql/vars/readme.txt 0 additions, 1 deletionroles/mysql/vars/readme.txt
- roles/shibboleth-sp/tasks/shibbolethConfig.yml 33 additions, 17 deletionsroles/shibboleth-sp/tasks/shibbolethConfig.yml
- roles/shibboleth-sp/templates/shib.conf 5 additions, 0 deletionsroles/shibboleth-sp/templates/shib.conf
Loading
Please register or sign in to comment