diff --git a/defaults/main.yml b/defaults/main.yml index 689e6ae..08124ac 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,2 @@ --- -server_scripts_version: v0.2.9 \ No newline at end of file +server_scripts_version: v0.2.18 \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index ce738a8..20af10f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,12 +4,14 @@ repo=https://github.com/popstas/server-scripts.git dest=/usr/local/src/server-scripts version={{ server_scripts_version }} + force=yes + register: server_scripts_sync tags: server-scripts - name: Install server-scripts command: /usr/local/src/server-scripts/install.sh -y - creates=/usr/share/server-scripts + when: server_scripts_sync.changed tags: server-scripts - name: server-scripts config diff --git a/templates/server-scripts.conf.j2 b/templates/server-scripts.conf.j2 index 48f5d6c..bbf406c 100644 --- a/templates/server-scripts.conf.j2 +++ b/templates/server-scripts.conf.j2 @@ -5,7 +5,6 @@ MAILTO="{{ mailto }}" # dbdump, dbundump DB_BACKUPS_ROOT="{{ backups_mysql_dir }}" DB_BACKUPS_LOG="/var/log/mysql/mysql_backup.log" -DB_BACKUPS_SEND_HOUR="{{ backups_mysql_send_hour }}" DB_BACKUPS_REMOTE_USER="{{ backups_mysql_remote_user }}" DB_BACKUPS_REMOTE_HOST="{{ backups_mysql_remote_host }}" @@ -23,14 +22,22 @@ DB_SIZE_NAMES_FILE="{{ private_log_dir }}/drupal_dbs.log" DB_SIZE_SIZES_FILE="{{ private_log_dir }}/drupal_dbs_sizes.log" DB_SIZE_CACHE_MINS=30 +# domains-check +DOMAINS_CHECK_DNS="8.8.8.8" +DOMAINS_CHECK_ASSERT_IP="your_server_ip" + # detect-viruses VIRUSES_LOG="/var/log/viruses.log" -VIRUSES_PHP_SIGNATURES="eval(base64_decode\|'base'.(32*2\|eval(stripslashes\|FilesMan\|WSO_VERSION\|$sF=\"PCT4BA6ODSE_\"\|$qV=\"stop_\"" +VIRUSES_PHP_SIGNATURES="eval(base64_decode\|'base'.(32*2\|eval(stripslashes\|FilesMan\|WSO_VERSION\|\$sF=\"PCT4BA6ODSE_\"\|\$qV=\"stop_\"" VIRUSES_JS_SIGNATURES="document.write(unescape" +# drupal-build-archives +DRUPAL_PROJECTS_ROOT="/usr/local/drupal" +DRUPAL_PROJECTS_BUILD_ROOT="$DRUPAL_PROJECTS_ROOT/build" + # drupal-enable-caches -DRUPAL_CACHE_LIFETIME=300 -DRUPAL_PAGE_CACHE_MAXIMUM_AGE=1800 +DRUPAL_CACHE_LIFETIME=43200 +DRUPAL_PAGE_CACHE_MAXIMUM_AGE=300 # drupal-get-drupals DRUPAL_ROOT_LEVEL=4 # for /home/user/www/example.com @@ -40,5 +47,19 @@ SITE_INFO_FILE=".info" # get-password PASSWORD_LENGTH=12 +# influxdb-annotate +INFLUXDB_HOST="{{ influxdb_host }}" +INFLUXDB_PORT="{{ influxdb_port }}" +INFLUXDB_USER="{{ telegraf_influxdb_username }}" +INFLUXDB_PASSWORD="{{ telegraf_influxdb_password }}" +INFLUXDB_DATABASE="{{ telegraf_influxdb_database }}" + +# influxdb-clientstat +INFLUXDB_CLIENTSTAT_NGINX_LOG_FILE="{{ influxdb_clientstat_logfile }}" + +# sites-load +SITES_LOAD_TIME_ENABLED="0" +SITES_LOAD_LOG_FILE="{{ sites_load_log_file }}" + # ssh-add-keys -SSH_PUBLIC_KEYS_DIR="{{ ssh_public_keys_dir }}" +SSH_PUBLIC_KEYS_DIR="/root/{{ ssh_public_keys_dir }}"