Просмотр исходного кода

Newebe hasn't been updated in over a year. Removing it.

Alex Payne 9 лет назад
Родитель
Сommit
65bc7da608

+ 0
- 1
README.md Просмотреть файл

@@ -41,7 +41,6 @@ What do you get if you point Sovereign at a server? All kinds of good stuff!
41 41
 -   [RFC6238](http://tools.ietf.org/html/rfc6238) two-factor authentication compatible with [Google Authenticator](http://en.wikipedia.org/wiki/Google_Authenticator) and various hardware tokens
42 42
 -   Nightly backups to [Tarsnap](https://www.tarsnap.com/).
43 43
 -   Git hosting via [cgit](http://git.zx2c4.com/cgit/about/) and [gitolite](https://github.com/sitaramc/gitolite).
44
--   [Newebe](http://newebe.org), a social network.
45 44
 -   Read-it-later via [Wallabag](https://www.wallabag.org/)
46 45
 -   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.
47 46
 

+ 0
- 5
roles/newebe/files/newebe.conf Просмотреть файл

@@ -1,5 +0,0 @@
1
-[program:newebe]
2
-autorestart=false
3
-command=newebe_server.py --configfile=/usr/local/etc/newebe/config.yaml
4
-redirect_stderr=true
5
-user=newebe

+ 0
- 7
roles/newebe/files/supervisor.conf Просмотреть файл

@@ -1,7 +0,0 @@
1
-; supervisor config file
2
-
3
-[supervisord]
4
-nodaemon=true
5
-
6
-[include]
7
-files = /etc/supervisor/conf.d/*.conf

+ 0
- 3
roles/newebe/handlers/main.yml Просмотреть файл

@@ -1,3 +0,0 @@
1
----
2
-- name: restart supervisor
3
-  service: name=supervisor state=restarted

+ 0
- 1
roles/newebe/tasks/main.yml Просмотреть файл

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

+ 0
- 87
roles/newebe/tasks/newebe.yml Просмотреть файл

@@ -1,87 +0,0 @@
1
-- name: Install Dependencies
2
-  apt: pkg={{ item }}
3
-  with_items:
4
-    - build-essential
5
-    - couchdb
6
-    - git
7
-    - libxml2-dev
8
-    - libxslt-dev
9
-    - python
10
-    - python-dev
11
-    - python-imaging
12
-    - python-imaging
13
-    - python-pip
14
-    - python-pycurl
15
-    - python-setuptools
16
-    - python-lxml
17
-    - supervisor
18
-  tags:
19
-    - dependencies
20
-
21
-- name: Install Newebe
22
-  pip: name='git+https://github.com/gelnior/newebe.git#egg=newebe'
23
-
24
-- name: Add group Newebe
25
-  group: name=newebe
26
-
27
-- name: Add user Newebe
28
-  user: name=newebe groups=newebe shell=/usr/sbin/nologin
29
-
30
-- name: Create Newebe Config folder
31
-  file: path=/usr/local/etc/newebe/
32
-        owner=newebe
33
-        group=newebe
34
-        state=directory
35
-
36
-- name: Create Newebe folder
37
-  file: path=/usr/local/var/newebe/
38
-        owner=newebe
39
-        group=newebe
40
-        state=directory
41
-
42
-- name: Create Newebe log folder
43
-  file: path=/usr/local/var/log/newebe/
44
-        owner=newebe
45
-        group=newebe
46
-        state=directory
47
-
48
-- name: Set Newebe config file
49
-  template: src=usr_local_etc_newebe_config.j2
50
-            dest=/usr/local/etc/newebe/config.yaml
51
-            owner=newebe
52
-            group=newebe
53
-
54
-- name: Set Supervisor config file
55
-  copy: src=newebe.conf dest=/etc/supervisor/conf.d/newebe.conf
56
-
57
-- name: Set Newebe Supervisor config file
58
-  copy: src=supervisor.conf dest=/etc/supervisor/supervisor.conf
59
-  notify: restart supervisor
60
-
61
-- name: Ensure Supervisor is running
62
-  service: name=supervisor state=running
63
-
64
-- name: Ensure that newebe is started
65
-  supervisorctl: name=newebe state=started
66
-
67
-- name: Add mod_proxy module to Apache
68
-  apache2_module: state=present name=proxy
69
-
70
-- name: Add proxy_http module to Apache
71
-  apache2_module: state=present name=proxy_http
72
-
73
-- name: Rename existing Apache newebe virtualhost
74
-  command: mv /etc/apache2/sites-available/newebe /etc/apache2/sites-available/newebe.conf removes=/etc/apache2/sites-available/newebe
75
-
76
-- name: Remove old sites-enabled/newebe symlink (new one will be created by a2ensite)
77
-  file: path=/etc/apache2/sites-enabled/newebe state=absent
78
-
79
-- name: Configure the Apache HTTP server for Newebe
80
-  template: src=etc_apache2_sites-available_newebe.j2
81
-            dest=/etc/apache2/sites-available/newebe.conf
82
-            group=root
83
-            owner=root
84
-
85
-- name: Enable the site
86
-  command: a2ensite newebe.conf creates=/etc/apache2/sites-enabled/newebe.conf
87
-  notify: restart apache

+ 0
- 20
roles/newebe/templates/etc_apache2_sites-available_newebe.j2 Просмотреть файл

@@ -1,20 +0,0 @@
1
-<VirtualHost *:80>
2
-    ServerName {{ newebe_domain }}
3
-
4
-    Redirect permanent / https://{{ newebe_domain }}/
5
-</VirtualHost>
6
-
7
-<VirtualHost *:443>
8
-
9
-    ServerName {{ newebe_domain }}
10
-
11
-    Include /etc/apache2/ssl.conf
12
-
13
-    ErrorLog /var/log/apache2/newebe.info-error_log
14
-    CustomLog /var/log/apache2/newebe.info-access_log common
15
-
16
-
17
-    ProxyPass / http://127.0.0.1:8282/
18
-    ProxyPassReverse / http://127.0.0.1:8282/
19
-
20
-</VirtualHost>

+ 0
- 7
roles/newebe/templates/usr_local_etc_newebe_config.j2 Просмотреть файл

@@ -1,7 +0,0 @@
1
-main:
2
-    port: 8282
3
-    debug: False
4
-    ssl: False
5
-    path: "/usr/local/var/newebe/"
6
-    logpath: "/usr/local/var/log/newebe"
7
-    timezone: {{ zpush_timezone }}

+ 0
- 1
site.yml Просмотреть файл

@@ -21,6 +21,5 @@
21 21
     - tarsnap
22 22
     - news
23 23
     - git
24
-    - newebe
25 24
     - readlater
26 25
     - monitoring  # Monitoring role should be last. See roles/monitoring/README.md

+ 0
- 15
tests.py Просмотреть файл

@@ -137,21 +137,6 @@ class WebTests(unittest.TestCase):
137 137
             r.content
138 138
         )
139 139
 
140
-    def test_newebe_http(self):
141
-        """Newebe is displaying home page"""
142
-        r = requests.get('http://newebe.' + TEST_SERVER, verify=False)
143
-
144
-        # We should be redirected to https
145
-        self.assertEquals(r.history[0].status_code, 301)
146
-        self.assertEquals(r.url, 'https://newebe.' + TEST_SERVER + '/')
147
-
148
-        # 200 - We should be at the repository page
149
-        self.assertEquals(r.status_code, 200)
150
-        self.assertIn(
151
-            'Newebe, Freedom to Share',
152
-            r.content
153
-        )
154
-
155 140
 
156 141
 class IRCTests(unittest.TestCase):
157 142
     def test_irc_auth(self):

+ 0
- 3
vars/defaults.yml Просмотреть файл

@@ -122,9 +122,6 @@ cgit_version: 0.10.1
122 122
 cgit_domain: "git.{{ domain }}"
123 123
 gitolite_version: 3.5.3.1
124 124
 
125
-# newebe
126
-newebe_domain: "newebe.{{ domain }}"
127
-
128 125
 # wallabag
129 126
 wallabag_version: 1.9.1
130 127
 wallabag_domain: "read.{{ domain }}"

Загрузка…
Отмена
Сохранить