Quellcode durchsuchen

Remove Wallabag Readlater

Thomas Buck vor 5 Jahren
Ursprung
Commit
dc38b87889

+ 0
- 1
.vagrant/provisioners/ansible/inventory/secret/encfs_password Datei anzeigen

@@ -1 +0,0 @@
1
-testPassword

+ 0
- 1
.vagrant/provisioners/ansible/inventory/secret/wallabag_db_password Datei anzeigen

@@ -1 +0,0 @@
1
-testPassword

+ 0
- 1
.vagrant/provisioners/ansible/inventory/secret/wallabag_salt Datei anzeigen

@@ -1 +0,0 @@
1
-testing

+ 0
- 2
README.md Datei anzeigen

@@ -38,7 +38,6 @@ What do you get if you point Sovereign at a server? All kinds of good stuff!
38 38
 -   Firewall management via [Uncomplicated Firewall (ufw)](https://wiki.ubuntu.com/UncomplicatedFirewall).
39 39
 -   Intrusion prevention via [fail2ban](http://www.fail2ban.org/) and rootkit detection via [rkhunter](http://rkhunter.sourceforge.net).
40 40
 -   SSH configuration preventing root login and insecure password authentication
41
--   Read-it-later via [Wallabag](https://www.wallabag.org/)
42 41
 -   A bunch of nice-to-have tools like [mosh](http://mosh.mit.edu) and [htop](http://htop.sourceforge.net) that make life with a server a little easier.
43 42
 
44 43
 Don’t want one or more of the above services? Comment out the relevant role in `site.yml`. Or get more granular and comment out the associated `include:` directive in one of the playbooks.
@@ -114,7 +113,6 @@ Create `A` or `CNAME` records which point to your server's IP address:
114 113
 * `mail.example.com`
115 114
 * `www.example.com` (for Web hosting)
116 115
 * `autoconfig.example.com` (for email client automatic configuration)
117
-* `read.example.com` (for Wallabag)
118 116
 * `news.example.com` (for Selfoss)
119 117
 * `cloud.example.com` (for ownCloud)
120 118
 

+ 0
- 10
roles/readlater/defaults/main.yml Datei anzeigen

@@ -1,10 +0,0 @@
1
-secret_root: '{{ inventory_dir | realpath }}'
2
-secret_name: 'secret'
3
-secret: '{{ secret_root + "/" + secret_name }}'
4
-
5
-wallabag_version: 1.9.1
6
-wallabag_domain: "read.{{ domain }}"
7
-wallabag_salt: "{{ lookup('password', secret + '/' + 'wallabag_salt', length=32) }}"
8
-wallabag_db_username: wallabag
9
-wallabag_db_password: "{{ lookup('password', secret + '/' + 'wallabag_db_password', length=32) }}"
10
-wallabag_db_database: wallabag

+ 0
- 6
roles/readlater/handlers/main.yml Datei anzeigen

@@ -1,6 +0,0 @@
1
-- name: import wallabag sql
2
-  shell: PGPASSWORD='{{ wallabag_db_password }}' psql -h localhost -d {{ wallabag_db_database }} -U {{ wallabag_db_username }} -f /var/www/wallabag/install/postgres.sql --set ON_ERROR_STOP=1
3
-  notify: remove install folder
4
-
5
-- name: remove install folder
6
-  file: path=/var/www/wallabag/install state=absent

+ 0
- 1
roles/readlater/tasks/main.yml Datei anzeigen

@@ -1 +0,0 @@
1
-- include: wallabag.yml tags=wallabag

+ 0
- 108
roles/readlater/tasks/wallabag.yml Datei anzeigen

@@ -1,108 +0,0 @@
1
-- name: Determine whether wallabag is configured
2
-  stat: path=/var/www/wallabag/inc/poche/config.inc.php
3
-  register: wallabag_config
4
-
5
-- name: Clone wallabag
6
-  git: repo=https://github.com/wallabag/wallabag.git
7
-       dest=/var/www/wallabag
8
-       version={{ wallabag_version }}
9
-       accept_hostkey=yes
10
-
11
-- name: Remove wallabag 'install' directory if its configuration file is there
12
-  file: name=/var/www/wallabag/install state=absent
13
-  when: wallabag_config.stat.exists == True
14
-
15
-- name: Install wallabag dependencies (PHP5 variant)
16
-  apt: pkg={{ item }} state=present
17
-  with_items:
18
-    - php5
19
-    - php5-curl
20
-    - php5-mcrypt
21
-    - php5-pgsql
22
-    - php5-tidy
23
-  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
24
-  tags:
25
-    - dependencies
26
-
27
-- name: Install wallabag dependencies
28
-  apt: pkg={{ item }} state=present
29
-  with_items:
30
-    - php
31
-    - php-curl
32
-    - php-mcrypt
33
-    - php-pgsql
34
-    - php-tidy
35
-  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
36
-  tags:
37
-    - dependencies
38
-
39
-- name: Create database user for wallabag
40
-  postgresql_user: login_host=localhost
41
-                   login_user={{ db_admin_username }}
42
-                   login_password="{{ db_admin_password }}"
43
-                   name={{ wallabag_db_username }}
44
-                   password="{{ wallabag_db_password }}"
45
-                   state=present
46
-
47
-- name: Create database for wallabag
48
-  postgresql_db: login_host=localhost
49
-                 login_user={{ db_admin_username }}
50
-                 login_password="{{ db_admin_password }}"
51
-                 name={{ wallabag_db_database }}
52
-                 state=present
53
-                 owner={{ wallabag_db_username }}
54
-  notify: import wallabag sql
55
-
56
-- name: Get Composer installer
57
-  get_url: url=https://getcomposer.org/installer
58
-           dest=/tmp/composer-installer
59
-
60
-- name: Install Composer
61
-  command: php /tmp/composer-installer
62
-           chdir=/root
63
-           creates=/root/composer.phar
64
-
65
-- name: Initialize composer
66
-  command: php /root/composer.phar install
67
-           chdir=/var/www/wallabag
68
-           creates=/var/www/wallabag/vendor/autoload.php
69
-
70
-- name: Set wallabag ownership
71
-  file: owner=root
72
-        group=www-data
73
-        path=/var/www/wallabag
74
-        recurse=yes
75
-        state=directory
76
-
77
-# the httpd only needs write access to the wallabag assets, cache and db directories
78
-- name: Set wallabag assets, cache and db permissions
79
-  file: path=/var/www/wallabag/{{ item }}
80
-        mode=0775
81
-        state=directory
82
-  with_items:
83
-    - assets
84
-    - cache
85
-    - db
86
-
87
-- name: Create the configuration file
88
-  template: src=var_www_wallabag_inc_poche_config.inc.php.j2
89
-            dest=/var/www/wallabag/inc/poche/config.inc.php
90
-            owner=root
91
-            group=www-data
92
-
93
-- name: Rename existing Apache wallabag virtualhost
94
-  command: mv /etc/apache2/sites-available/wallabag /etc/apache2/sites-available/wallabag.conf removes=/etc/apache2/sites-available/wallabag
95
-
96
-- name: Remove old sites-enabled/wallabag symlink (new one will be created by a2ensite)
97
-  file: path=/etc/apache2/sites-enabled/wallabag state=absent
98
-
99
-- name: Configure the Apache HTTP server for wallabag
100
-  template: src=etc_apache2_sites-available_wallabag.j2
101
-            dest=/etc/apache2/sites-available/wallabag.conf
102
-            owner=root
103
-            group=root
104
-
105
-- name: Enable the wallabag site
106
-  command: a2ensite wallabag.conf
107
-           creates=/etc/apache2/sites-enabled/wallabag.conf
108
-  notify: restart apache

+ 0
- 22
roles/readlater/templates/etc_apache2_sites-available_wallabag.j2 Datei anzeigen

@@ -1,22 +0,0 @@
1
-<VirtualHost *:80>
2
-    ServerName {{ wallabag_domain }}
3
-
4
-    Redirect permanent / https://{{ wallabag_domain }}/
5
-</VirtualHost>
6
-
7
-<VirtualHost *:443>
8
-    ServerName {{ wallabag_domain }}
9
-    SSLEngine On
10
-
11
-    DocumentRoot            /var/www/wallabag
12
-    Options                 -Indexes
13
-
14
-    ErrorLog                /var/log/apache2/wallabag.info-error_log
15
-    CustomLog               /var/log/apache2/wallabag.info-access_log common
16
-
17
-    <Directory /var/www/wallabag>
18
-        AllowOverride All
19
-        Require all granted
20
-        DirectoryIndex index.php
21
-    </Directory>
22
-</VirtualHost>

+ 0
- 58
roles/readlater/templates/var_www_wallabag_inc_poche_config.inc.php.j2 Datei anzeigen

@@ -1,58 +0,0 @@
1
-<?php
2
-/**
3
- * wallabag, self hostable application allowing you to not miss any content anymore
4
- *
5
- * @category   wallabag
6
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
7
- * @copyright  2013
8
- * @license    http://www.wtfpl.net/ see COPYING file
9
- */
10
-
11
-define ('SALT', '{{ wallabag_salt }}'); # put a strong string here
12
-define ('LANG', 'en_EN.utf8');
13
-
14
-define ('STORAGE', 'postgres'); # postgres, mysql or sqlite
15
-
16
-define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located
17
-
18
-# only for postgres & mysql
19
-define ('STORAGE_SERVER', 'localhost');
20
-define ('STORAGE_DB', '{{ wallabag_db_database }}');
21
-define ('STORAGE_USER', '{{ wallabag_db_username }}');
22
-define ('STORAGE_PASSWORD', '{{ wallabag_db_password }}');
23
-
24
-#################################################################################
25
-# Do not trespass unless you know what you are doing
26
-#################################################################################
27
-
28
-// Change this if not using the standart port for SSL - i.e you server is behind sslh
29
-define ('SSL_PORT', 443);
30
-
31
-define ('MODE_DEMO', FALSE);
32
-define ('DEBUG_POCHE', FALSE);
33
-define ('DOWNLOAD_PICTURES', FALSE);
34
-define ('CONVERT_LINKS_FOOTNOTES', FALSE);
35
-define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
36
-define ('SHARE_TWITTER', TRUE);
37
-define ('SHARE_MAIL', TRUE);
38
-define ('SHARE_SHAARLI', FALSE);
39
-define ('SHAARLI_URL', 'http://myshaarliurl.com');
40
-define ('FLATTR', TRUE);
41
-define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
42
-define ('NOT_FLATTRABLE', '0');
43
-define ('FLATTRABLE', '1');
44
-define ('FLATTRED', '2');
45
-define ('ABS_PATH', 'assets/');
46
-
47
-define ('DEFAULT_THEME', 'baggy');
48
-
49
-define ('THEME', ROOT . '/themes');
50
-define ('LOCALE', ROOT . '/locale');
51
-define ('CACHE', ROOT . '/cache');
52
-
53
-define ('PAGINATION', '10');
54
-
55
-//limit for download of articles during import
56
-define ('IMPORT_LIMIT', 5);
57
-//delay between downloads (in sec)
58
-define ('IMPORT_DELAY', 5);

+ 0
- 1
site.yml Datei anzeigen

@@ -16,5 +16,4 @@
16 16
     - owncloud
17 17
     - vpn
18 18
     - news
19
-    - readlater
20 19
     - monitoring  # Monitoring role should be last. See roles/monitoring/README.md

Laden…
Abbrechen
Speichern