From 6e5fce00e76e3305149bb11dc8b1112a3ceda007 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Wed, 1 Sep 2021 11:06:02 +0200 Subject: [PATCH] Drop Backuppc support --- doc/freebsd.md | 5 --- doc/site.md | 1 - .../etc/nginx/sites-available/_backuppc.j2 | 33 ------------------- tests/includes/post_Debian.yml | 17 ---------- tests/includes/post_FreeBSD.yml | 21 ------------ tests/test.yml | 17 ---------- vars/main.yml | 1 - 7 files changed, 95 deletions(-) delete mode 100644 templates/etc/nginx/sites-available/_backuppc.j2 diff --git a/doc/freebsd.md b/doc/freebsd.md index b493cb3..8a1c40d 100644 --- a/doc/freebsd.md +++ b/doc/freebsd.md @@ -10,8 +10,3 @@ About modules ------------- Dynamic modules must be set with full path (see `nginx_load_modules` path). - -Sites not tested ----------------- - -- BackupPC diff --git a/doc/site.md b/doc/site.md index a3201c8..c3fb834 100644 --- a/doc/site.md +++ b/doc/site.md @@ -41,7 +41,6 @@ Templates --------- - `_base`: static template -- `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/stretch/fcgiwrap)) - `_dokuwiki` - `_redirect`: should not be called explicitly - `_phalcon`: Phalcon PHP Framework diff --git a/templates/etc/nginx/sites-available/_backuppc.j2 b/templates/etc/nginx/sites-available/_backuppc.j2 deleted file mode 100644 index 3ead87d..0000000 --- a/templates/etc/nginx/sites-available/_backuppc.j2 +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "_base.j2" %} - -{% block root %} - root /usr/share/backuppc/cgi-bin; -{% endblock %} - -{% block template_try_files %} -{% endblock %} - -{% block template_index %} - index index.cgi; -{% endblock %} - -{% block template_local_content %} - location ~ /\.ht { - deny all; - } - - location /backuppc/image { - alias /usr/share/backuppc/image; - expires 60d; - } -{% endblock %} - -{% block template_upstream_location %} - location ~ \.cgi$ { - gzip off; - include fastcgi.conf; - fastcgi_pass unix:/var/run/fcgiwrap.socket; - fastcgi_index BackupPC_Admin; - fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name; - } -{% endblock %} diff --git a/tests/includes/post_Debian.yml b/tests/includes/post_Debian.yml index 027a424..cd21505 100644 --- a/tests/includes/post_Debian.yml +++ b/tests/includes/post_Debian.yml @@ -1,19 +1,2 @@ --- -- name: APT | Install webapps and related tools - apt: - pkg: "{{ packages }}" - state: present - install_recommends: no - vars: - packages: - - backuppc - - samba-common-bin - - smbclient - -- name: SERVICE | Ensure backuppc is started - service: - name: backuppc - state: started - register: b - failed_when: b.failed and 'Another BackupPC is running' not in b.msg diff --git a/tests/includes/post_FreeBSD.yml b/tests/includes/post_FreeBSD.yml index dae3e9d..cd21505 100644 --- a/tests/includes/post_FreeBSD.yml +++ b/tests/includes/post_FreeBSD.yml @@ -1,23 +1,2 @@ --- -#- name: APT | Install web apps -# pkgng: -# name: "backuppc" -# state: present -# -#- name: COMMAND | Activate backuppc config -# command: > -# cp /usr/local/etc/backuppc/config.pl.sample /usr/local/etc/backuppc/config.pl -# creates=/usr/local/etc/backuppc/config.pl -# -#- name: FILE | Fix backuppc permissions -# file: -# path: /usr/local/etc/backuppc/config.pl -# owner: backuppc -# group: backuppc -# -# -# We don't manage BackupPC on FreeBSD... too dirty. :/ -# -#- name: SERVICE | Ensure backuppc is started -# service: name=backuppc state=started enabled=yes diff --git a/tests/test.yml b/tests/test.yml index a2315bd..39ae35b 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -229,9 +229,6 @@ state: 'absent' - name: 'redirect-to.local' redirect_to: 'http://test.local' - - name: 'backuppc.local' - template: '_backuppc' - htpasswd: 'hello' - name: 'test-ssl.local' proto: ['http', 'https'] template: '_base' @@ -429,20 +426,6 @@ password: "qwerty" force_basic_auth: yes -# -------------------------------- -# BackupPC -# -------------------------------- - - name: -- VERIFY BACKUPPC -- - uri: - url: "http://backuppc.local/" - user: "hanx" - password: "qwerty" - force_basic_auth: yes - return_content: yes - register: authbpc - when: ansible_distribution != 'FreeBSD' - failed_when: authbpc.content.find('BackupPC Server Status') == -1 - # -------------------------------- # SSL # -------------------------------- diff --git a/vars/main.yml b/vars/main.yml index 3d7a7aa..0c1c288 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -40,7 +40,6 @@ nginx_dirs: owner: "root" nginx_templates_no_dir: - - '_backuppc' - '_proxy' nginx_servers_default_headers: