Moinmoin backup config
							parent
							
								
									5c8ac3685d
								
							
						
					
					
						commit
						13f9b9b15e
					
				| 
						 | 
					@ -30,3 +30,6 @@ to_backup:
 | 
				
			||||||
  hosts_allow: ["soyouz.adm.crans.org", "10.231.136.108"],
 | 
					  hosts_allow: ["soyouz.adm.crans.org", "10.231.136.108"],
 | 
				
			||||||
  read_only: "yes",
 | 
					  read_only: "yes",
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					moinmoin:
 | 
				
			||||||
 | 
					  main: true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,3 +22,6 @@ to_backup:
 | 
				
			||||||
  secrets_file: "/etc/rsyncd.secrets",
 | 
					  secrets_file: "/etc/rsyncd.secrets",
 | 
				
			||||||
  hosts_allow: ["zephir.adm.crans.org", "10.231.136.6", "172.31.0.1"],
 | 
					  hosts_allow: ["zephir.adm.crans.org", "10.231.136.6", "172.31.0.1"],
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					moinmoin:
 | 
				
			||||||
 | 
					  main: false
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,13 +1,13 @@
 | 
				
			||||||
{{ ansible_header | comment }}
 | 
					{{ ansible_header | comment }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Generate calendars
 | 
					 | 
				
			||||||
0 * * * *  /usr/bin/python /var/local/wiki/data/plugin/action/EventsBDE.py > /var/local/calendrier/bde.ics
 | 
					 | 
				
			||||||
0 * * * *  /usr/bin/python /var/local/wiki/data/plugin/action/EventsCrans.py > /var/local/calendrier/crans.ics
 | 
					 | 
				
			||||||
0 * * * *  /usr/bin/python /var/local/wiki/data/plugin/action/Sports.py > /var/local/calendrier/sports.ics
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Generate sitemap
 | 
					# Generate sitemap
 | 
				
			||||||
5 5 * * *  /usr/bin/wget "http://wiki.adm.crans.org/PageAccueil?action=sitemap" -O /var/local/moin_htdocs_crans/www-sitemap.xml 
 | 
					5 5 * * *  /usr/bin/wget "http://wiki.adm.crans.org/PageAccueil?action=sitemap" -O /var/local/moin_htdocs_crans/www-sitemap.xml 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Cleanup
 | 
					# Cleanup
 | 
				
			||||||
17 3 * * * www-data /usr/bin/find /var/local/wiki/data/cache/__session__ -mtime +30 -delete
 | 
					17 3 * * * www-data /usr/bin/find /var/local/wiki/data/cache/__session__ -mtime +30 -delete
 | 
				
			||||||
27 3 * * * www-data /usr/bin/find /var/local/wiki/tickets -mtime +30 -delete
 | 
					27 3 * * * www-data /usr/bin/find /var/local/wiki/tickets -mtime +30 -delete
 | 
				
			||||||
 | 
					{% if not moinmoin.main %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Sync main wiki to backup
 | 
				
			||||||
 | 
					02 02 * * * root  rsync -a4 --exclude "attachments" rsync://kiwi.adm.crans.org/wiki /var/local/wiki
 | 
				
			||||||
 | 
					{% endif %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -140,6 +140,7 @@ class Config(FarmConfig):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    auth = [
 | 
					    auth = [
 | 
				
			||||||
        moin.MoinAuth(),
 | 
					        moin.MoinAuth(),
 | 
				
			||||||
 | 
					{% if moinmoin.main %}
 | 
				
			||||||
        cas.CASAuth("https://cas.crans.org",
 | 
					        cas.CASAuth("https://cas.crans.org",
 | 
				
			||||||
            fallback_url='https://wiki.crans.org/',
 | 
					            fallback_url='https://wiki.crans.org/',
 | 
				
			||||||
            ticket_path='/var/local/wiki/tickets/',
 | 
					            ticket_path='/var/local/wiki/tickets/',
 | 
				
			||||||
| 
						 | 
					@ -159,11 +160,22 @@ class Config(FarmConfig):
 | 
				
			||||||
            actions_msg={'newaccount':"La création de comptes n'est autorisée que depuis le réseau du Cr@ns ou sur zamok."},
 | 
					            actions_msg={'newaccount':"La création de comptes n'est autorisée que depuis le réseau du Cr@ns ou sur zamok."},
 | 
				
			||||||
        ), 
 | 
					        ), 
 | 
				
			||||||
        categorie_public.PublicCategories(pub_cats=[u'Cat\xe9goriePagePublique']), # Avec trusted à False, les acl de Known s'appliquent
 | 
					        categorie_public.PublicCategories(pub_cats=[u'Cat\xe9goriePagePublique']), # Avec trusted à False, les acl de Known s'appliquent
 | 
				
			||||||
 | 
					{% endif %}
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Force text editor as CKEditor is broken
 | 
					    # Force text editor as CKEditor is broken
 | 
				
			||||||
    editor_force = True
 | 
					    editor_force = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def ip_autorised_create_account(self,ip):
 | 
					    def ip_autorised_create_account(self,ip):
 | 
				
			||||||
 | 
					{% if moinmoin.main %}
 | 
				
			||||||
        return ip.startswith('185.230.76.') or ip.startswith('185.230.77.') or ip.startswith('185.230.78.') or ip.startswith('185.230.79.') or ip.startswith('10.') or ip.startswith('2a0c:700:0:')
 | 
					        return ip.startswith('185.230.76.') or ip.startswith('185.230.77.') or ip.startswith('185.230.78.') or ip.startswith('185.230.79.') or ip.startswith('10.') or ip.startswith('2a0c:700:0:')
 | 
				
			||||||
 | 
					{% else %}
 | 
				
			||||||
 | 
					        return False
 | 
				
			||||||
 | 
					{% endif %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% if not moinmoin.main %}
 | 
				
			||||||
 | 
					    # Stop new accounts being created
 | 
				
			||||||
 | 
					    actions_excluded = config.multiconfig.DefaultConfig.actions_excluded + [
 | 
				
			||||||
 | 
					        'newaccount', 'recoverpass'
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
 | 
					{% endif %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue