it-team/lmn-client
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Integrate firewalld, minor fixes/improvements.

Browse source
This commit is contained in:
Andreas B. Mundt 2020-01-23 16:01:15 +01:00
parent 29fb8f9420
commit 456f5c9870
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/backup/defaults/main.yml
View file

@ -1,4 +1,4 @@
borg_pwd: "{{ lookup('password', '/tmp/borg.pwd length=24') }}" borg_pwd: "{{ lookup('password', '/tmp/borg.pwd length=32') }}"
borg_pwd_file: "/root/borg.pwd" borg_pwd_file: "/root/borg.pwd"
borg_key_backup: "/root/borg-key.backup" borg_key_backup: "/root/borg-key.backup"

3
roles/backup/templates/backup
View file

@ -6,6 +6,7 @@ OPTIONS=({{ backup_opts }} {{ backup_opts_extra }})
export BORG_REPO="{{ backup_repo }}" export BORG_REPO="{{ backup_repo }}"
export BORG_PASSCOMMAND="cat {{ borg_pwd_file }}" export BORG_PASSCOMMAND="cat {{ borg_pwd_file }}"
KEY_BACKUP="{{ borg_key_backup }}"
MOUNTED="" MOUNTED=""
@ -17,7 +18,7 @@ fi
if [ ! -d "$BORG_REPO" ] ; then if [ ! -d "$BORG_REPO" ] ; then
mkdir -vp --mode=0750 "$BORG_REPO" mkdir -vp --mode=0750 "$BORG_REPO"
borg init --encryption=repokey borg init --encryption=repokey
borg key export "{{ borg_key_backup }}" borg key export "$BORG_REPO" "$KEY_BACKUP"
fi fi
if [ -e "{{ nc_dir }}/config/config.php" ] ; then if [ -e "{{ nc_dir }}/config/config.php" ] ; then

14
roles/nextcloud/tasks/main.yml
View file

@ -20,10 +20,11 @@
## We can start with the installation now: ## We can start with the installation now:
- name: install apache, php- and db-packages - name: install apache, firewalld, php- and db-packages
apt: apt:
name: name:
- apache2 - apache2
- firewalld
- mariadb-server - mariadb-server
- python3-pymysql - python3-pymysql
- php-apcu - php-apcu
@ -38,6 +39,7 @@
- php-mysql - php-mysql
- php-xml - php-xml
- php-zip - php-zip
- unzip
state: latest state: latest
- name: disable apache modules - name: disable apache modules
@ -212,7 +214,7 @@
changed_when: cmd_result.stdout is not search('Nothing to do.') changed_when: cmd_result.stdout is not search('Nothing to do.')
when: allow_download when: allow_download
### app installations: ## app installations:
- name: install extra apps - name: install extra apps
command: "sudo -u www-data php ./occ app:install {{ item }}" command: "sudo -u www-data php ./occ app:install {{ item }}"
args: args:
@ -224,6 +226,14 @@
failed_when: cmd_result.stdout is not search('already installed') and cmd_result.rc != 0 failed_when: cmd_result.stdout is not search('already installed') and cmd_result.rc != 0
when: allow_download when: allow_download
- name: allow https in firewalld
firewalld:
service: https
permanent: Yes
immediate: Yes
state: enabled
## ToDo kerberox integration: ## ToDo kerberox integration:
# sudo -u www-data php ./occ app:enable user_ldap # sudo -u www-data php ./occ app:enable user_ldap
# sudo -u www-data php ./occ app:install user_saml # sudo -u www-data php ./occ app:install user_saml