Merge branch 'php73'

Author: ReinerNippes

README.md

@@ -5,7 +5,7 @@ Ansible Playbook to install
 
 * Nextcloud 15 - https://nextcloud.com/
 * nginx 1.15 - https://nginx.org/
-* PHP 7.2 - http://www.php.net/
+* PHP 7.x - http://www.php.net/
 * MariaDB 10 - https://mariadb.org/ or PostgreSQL 10 https://www.postgresql.org/ (only Ubuntu right now)
 * redis - https://redis.io/
 * restic backup - https://restic.readthedocs.io
@@ -53,46 +53,51 @@ ansible-playbook nextcloud.yml
 Login to your nextcloud web site https://\<fqdn\> 
 
 
-User and password have been set according to the entries in the inventory.
+Users and passwords have been set according to the entries in the inventory if defiend there. Otherwise the admin password will be displayed at the end of playbook. Additional you can find the credential_store = /etc/nextcloud 
 
 Role Variables
 --------------
 All variables are defined in inventory file.
 ```
+# Server domain name
+# Default is the fqdn of the machine 
+# fqdn       = nc.example.org
+
+# selfsigned certificate as default
+ssl_certificate_type  = 'selfsigned'
+
 # Letsencrypt or selfsigned certificate
-ssl_certificate_type  = 'letsencrypt'
-#ssl_certificate_type = 'selfsigned'
+# ssl_certificate_type  = 'letsencrypt'
 
-# Your domain name to get a letsencrypt certificate
-fqdn       = nc.example.org
 
 # Your email adresse for letsencrypt
-cert_email = [email protected]
+# cert_email = [email protected]
 
-# receive a certificate from from staging
+# receive a certificate from staging
 # uncomment if you want to use letsencrypt staging environment
 # cert_stage = '--staging'
 
 # Your dns resolver (nginx reverse ip lookup)
 # e.g. your fritz.box ; default ist google dns server 8.8.8.8
 nginx_resolver = '8.8.8.8'
 
+#
 # Nextcloud varibales
 
 # data dir
 nc_datadir           = /var/nc-data
 
 # admin user
 nc_admin             = 'admin'
-nc_passwd            = ''              # leave empty to generate random password
+nc_passwd            = ''             # leave empty to generate random password
 
 # database settings
 #nc_db_type          = 'mysql'        # (MariaDB)
 nc_db_type           = 'pgsql'        # (PostgreSQL)
 nc_db_host           = 'localhost'
 nc_db                = 'nextcloud'
 nc_db_user           = 'nextcloud'
-nc_db_passwd         = ''              # leave empty to generate random password
+nc_db_passwd         = ''             # leave empty to generate random password
 nc_db_prefix         = 'oc_'
 
 # Nextcloud mail setup
@@ -109,8 +114,11 @@ nc_mail_smtpport     = 587
 nc_mail_smtpname     =
 nc_mail_smtppwd      = 
 
+# php Version
+php_version          = '7.2'
+
 # Install turn server for Nextcloud Talk
-talk_install         = true
+talk_install         = false
 
 # Allways get the latest version of Nextcloud
 next_archive         = https://download.nextcloud.com/server/releases/latest.tar.bz2
@@ -129,11 +137,11 @@ install_collabora     = false
 
 # Install Online Office
 # more info about onlyoffice office: https://www.onlyoffice.com
-install_onlyoffice    = true
+install_onlyoffice    = false
 
 # 
 # change dhparam numbits if generating takes to long
-# dhparam_numbits = 1024
+#dhparam_numbits = 1024
 
 # 
 # defaults path of your generated credentials (e.g. database, talk, onlyoffice)

inventory

@@ -59,6 +59,9 @@ nc_mail_smtpport     = 587
 nc_mail_smtpname     =
 nc_mail_smtppwd      = 
 
+# php Version
+php_version          = '7.2'
+
 # Install turn server for Nextcloud Talk
 talk_install         = false
 

roles/prep_nextcloud/tasks/main.yml

@@ -116,7 +116,12 @@
     shell: sudo -u {{ web_user[ansible_distribution] }} php occ background:cron
     args:
       chdir: /var/www/nextcloud/
-
+      
+  - name: convert filecache bigint
+    shell: sudo -u {{ web_user[ansible_distribution] }} php occ db:convert-filecache-bigint
+    args:
+      chdir: /var/www/nextcloud/
+      
   - name: upgrade nextcloud
     shell: sudo -u {{ web_user[ansible_distribution] }} php occ upgrade
     args:

roles/prep_nginx/vars/main.yml

@@ -2,6 +2,6 @@
 # vars file for prep_nginx
 
 php_socket:
-  'CentOS': '/run/php-fpm/php7.2-fpm.sock'
-  'Ubuntu': '/run/php/php7.2-fpm.sock'
-  'Debian': '/run/php/php7.2-fpm.sock'
+  'CentOS': '/run/php-fpm/php{{ php_version }}-fpm.sock'
+  'Ubuntu': '/run/php/php{{ php_version }}-fpm.sock'
+  'Debian': '/run/php/php{{ php_version }}-fpm.sock'

roles/prep_php/meta/main.yml

@@ -1,6 +1,6 @@
 galaxy_info:
   author: Reiner Nippes
-  description: Basic setup of php 7.2 for nextcloud 
+  description: Basic setup of php 7.x for nextcloud 
   company: nippes.it
 
   # If the issue tracker for your role is not on github, uncomment the

roles/prep_php/tasks/CentOS.yml

@@ -1,9 +1,9 @@
 ---
-- name: add php72 repo
+- name: add php{{ php_version | replace(".","") }} repo
   yum_repository:
-    name: remi-php72
-    description: Remi's PHP 7.2 RPM repository for Enterprise Linux {{ ansible_distribution_major_version|int }} - $basearch
-    mirrorlist: https://rpms.remirepo.net/enterprise/{{ ansible_distribution_major_version|int }}/php72/httpsmirror
+    name: remi-php{{ php_version | replace(".","") }}
+    description: Remi's PHP {{ php_version | replace(".","") }} RPM repository for Enterprise Linux {{ ansible_distribution_major_version|int }} - $basearch
+    mirrorlist: https://rpms.remirepo.net/enterprise/{{ ansible_distribution_major_version|int }}/php{{ php_version | replace(".","") }}/httpsmirror
     gpgkey: http://rpms.remirepo.net/RPM-GPG-KEY-remi
     gpgcheck: yes
     enabled: 1

roles/prep_php/tasks/Debian.yml

@@ -22,17 +22,17 @@
 - name: install additional packages
   apt:
     name:
-      - php7.2-fpm
-      - php7.2-gd
+      - php{{ php_version }}-fpm
+      - php{{ php_version }}-gd
       - "{{ php_db_extension[nc_db_type] }}"
-      - php7.2-curl
-      - php7.2-xml
-      - php7.2-zip
-      - php7.2-intl
-      - php7.2-mbstring
-      - php7.2-json
-      - php7.2-bz2
-      - php7.2-ldap
+      - php{{ php_version }}-curl
+      - php{{ php_version }}-xml
+      - php{{ php_version }}-zip
+      - php{{ php_version }}-intl
+      - php{{ php_version }}-mbstring
+      - php{{ php_version }}-json
+      - php{{ php_version }}-bz2
+      - php{{ php_version }}-ldap
       - php-apcu
       - php-imagick
       - php-smbclient

roles/prep_php/tasks/Ubuntu.yml

@@ -24,17 +24,17 @@
 - name: install additional packages
   apt:
     name:
-      - php7.2-fpm
-      - php7.2-gd
+      - php{{ php_version }}-fpm
+      - php{{ php_version }}-gd
       - "{{ php_db_extension[nc_db_type] }}"
-      - php7.2-curl
-      - php7.2-xml
-      - php7.2-zip
-      - php7.2-intl
-      - php7.2-mbstring
-      - php7.2-json
-      - php7.2-bz2
-      - php7.2-ldap
+      - php{{ php_version }}-curl
+      - php{{ php_version }}-xml
+      - php{{ php_version }}-zip
+      - php{{ php_version }}-intl
+      - php{{ php_version }}-mbstring
+      - php{{ php_version }}-json
+      - php{{ php_version }}-bz2
+      - php{{ php_version }}-ldap
       - php-apcu
       - php-imagick
       - php-smbclient
@@ -56,7 +56,7 @@
 
 - name: configure php postgres module
   copy:
-    dest: /etc/php/7.2/mods-available/pgsql.ini
+    dest: /etc/php/{{ php_version }}/mods-available/pgsql.ini
     content: |
       # configuration for PHP PostgreSQL module
       extension=pgsql.so
@@ -76,7 +76,7 @@
 
 - name: configure php mysql module
   copy:
-    dest: /etc/php/7.2/mods-available/pdo_mysql.ini
+    dest: /etc/php/{{ php_version }}/mods-available/pdo_mysql.ini
     content: |
       # configuration for PHP MySQL module
       extension=pdo_mysql.so

roles/prep_php/tasks/main.yml

@@ -14,10 +14,22 @@
     force: true
   with_items:
     - { file: '{{ ansible_distribution }}/fpm.php.ini',  dest: '{{ php_fpm_conf_dir[ansible_distribution] }}/php.ini' }
+  notify: restart php-fpm
+
+- name: configure php
+  template:
+    src: "{{ item.file }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: 0644
+    force: true
+  with_items:
     - { file: '{{ ansible_distribution }}/www.conf',     dest: '{{ php_www_conf_dir[ansible_distribution] }}/www.conf' }
     - { file: '{{ ansible_distribution }}/php-fpm.conf', dest: '{{ php_fpm_conf_dir[ansible_distribution] }}/php-fpm.conf' }
   notify: restart php-fpm
 
+
 - name: enable php-fpm
   systemd:
     name: "{{ php_service_name[ansible_distribution] }}"

roles/prep_php/files/CentOS/php-fpm.conf renamed to roles/prep_php/templates/CentOS/php-fpm.conf

@@ -33,7 +33,7 @@ group = nginx
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php-fpm/php7.2-fpm.sock
+listen = /run/php-fpm/php{{ php_version }}-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -223,7 +223,7 @@ pm.max_requests = 500
 ;   last request memory:  0
 ;
 ; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: /usr/share/php/7.2/fpm/status.html
+;       It's available in: /usr/share/php/{{ php_version }}/fpm/status.html
 ;
 ; Note: The value must start with a leading slash (/). The value can be
 ;       anything, but it may not be a good idea to use the .php extension or it
@@ -300,12 +300,12 @@ pm.max_requests = 500
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %T: time the log has been written (the request has finished)
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %u: remote user
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"

roles/prep_php/files/CentOS/www.conf renamed to roles/prep_php/templates/CentOS/www.conf

@@ -14,14 +14,14 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-pid = /run/php/php7.2-fpm.pid
+pid = /run/php/php{{ php_version }}-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
 ; into a local file.
 ; Note: the default prefix is /var
 ; Default Value: log/php-fpm.log
-error_log = /var/log/php7.2-fpm.log
+error_log = /var/log/php{{ php_version }}-fpm.log
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities
@@ -122,4 +122,4 @@ process_control_timeout = 10s
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php/7.2/fpm/pool.d/*.conf
+include=/etc/php/{{ php_version }}/fpm/pool.d/*.conf

roles/prep_php/files/Debian/php-fpm.conf renamed to roles/prep_php/templates/Debian/php-fpm.conf

@@ -33,7 +33,7 @@ group = www-data
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php/php7.2-fpm.sock
+listen = /run/php/php{{ php_version }}-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -223,7 +223,7 @@ pm.max_requests = 500
 ;   last request memory:  0
 ;
 ; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: /usr/share/php/7.2/fpm/status.html
+;       It's available in: /usr/share/php/{{ php_version }}/fpm/status.html
 ;
 ; Note: The value must start with a leading slash (/). The value can be
 ;       anything, but it may not be a good idea to use the .php extension or it
@@ -300,12 +300,12 @@ pm.max_requests = 500
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %T: time the log has been written (the request has finished)
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %u: remote user
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"

roles/prep_php/files/Ubuntu/www.conf renamed to roles/prep_php/templates/Debian/www.conf

@@ -14,14 +14,14 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-pid = /run/php/php7.2-fpm.pid
+pid = /run/php/php{{ php_version }}-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
 ; into a local file.
 ; Note: the default prefix is /var
 ; Default Value: log/php-fpm.log
-error_log = /var/log/php7.2-fpm.log
+error_log = /var/log/php{{ php_version }}-fpm.log
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities
@@ -122,4 +122,4 @@ process_control_timeout = 10s
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php/7.2/fpm/pool.d/*.conf
+include=/etc/php/{{ php_version }}/fpm/pool.d/*.conf

roles/prep_php/files/Ubuntu/php-fpm.conf renamed to roles/prep_php/templates/Ubuntu/php-fpm.conf

@@ -33,7 +33,7 @@ group = www-data
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php/php7.2-fpm.sock
+listen = /run/php/php{{ php_version }}-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -223,7 +223,7 @@ pm.max_requests = 500
 ;   last request memory:  0
 ;
 ; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: /usr/share/php/7.2/fpm/status.html
+;       It's available in: /usr/share/php/{{ php_version }}/fpm/status.html
 ;
 ; Note: The value must start with a leading slash (/). The value can be
 ;       anything, but it may not be a good idea to use the .php extension or it
@@ -300,12 +300,12 @@ pm.max_requests = 500
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %T: time the log has been written (the request has finished)
 ;      it can accept a strftime(3) format:
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;      e.g. for a ISO8601 formatted timestring, use: %{ %Y-%m-%dT%H:%M:%S%z}t
 ;  %u: remote user
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"