Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3743934
D2400.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D2400.diff
View Options
diff --git a/pillar/certificates/certificates.sls b/pillar/certificates/certificates.sls
--- a/pillar/certificates/certificates.sls
+++ b/pillar/certificates/certificates.sls
@@ -13,4 +13,3 @@
certificates_letsencrypt:
eglide:
- www.eglide.org
- - robot.paysannerebelle.com
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -155,9 +155,6 @@
# Eglide
#
shellserver:
- # Third party sites hosted to Eglide
- - .com/paysannerebelle
-
# Directly managed by Eglide project
- .org/eglide
diff --git a/roles/shellserver/bonjour-chaton/account.sls b/roles/shellserver/bonjour-chaton/account.sls
deleted file mode 100644
--- a/roles/shellserver/bonjour-chaton/account.sls
+++ /dev/null
@@ -1,32 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Deploy Bonjour chaton
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Created: 2017-01-24
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% from "map.jinja" import dirs with context %}
-
-# -------------------------------------------------------------
-# Service account
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-bonjour_chaton_account:
- user.present:
- - name: chaton
- - fullname: Bonjour chaton bot
- - uid: 832
- - gid: 827
- - home: /opt/bonjour-chaton
-
-# -------------------------------------------------------------
-# Sudo capabilities
-#
-# Members of bonjour-chaton-dev should be able to sudo -u bonjour_chaton …
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-bonjour_chaton_sudo_capabilities_file:
- file.managed:
- - name: {{ dirs.etc }}/sudoers.d/bonjour_chaton
- - source: salt://roles/shellserver/bonjour-chaton/files/bonjour_chaton.sudoers
- - template: jinja
diff --git a/roles/shellserver/bonjour-chaton/certificates.sls b/roles/shellserver/bonjour-chaton/certificates.sls
deleted file mode 100644
--- a/roles/shellserver/bonjour-chaton/certificates.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Deploy Bonjour chaton
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Created: 2017-04-27
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% from "map.jinja" import dirs with context %}
-
-/opt/bonjour-chaton/certs:
- file.directory:
- - user: chaton
- - group: chaton-dev
- - dir_mode: 750
-
-bonjour_chaton_certificates_private:
- cmd.run:
- - name: cp {{ dirs.etc }}/letsencrypt/live/robot.paysannerebelle.com/privkey.pem /opt/bonjour-chaton/certs/private.pem
- - creates: /opt/bonjour-chaton/certs/private.pem
- file.managed:
- - name: /opt/bonjour-chaton/certs/private.pem
- - user: chaton
- - group: chaton-dev
- - mode: 0600
- - replace: False
- - show_changes: False
-
-bonjour_chaton_certificates_public:
- cmd.run:
- - name: cp {{ dirs.etc }}/letsencrypt/live/robot.paysannerebelle.com/fullchain.pem /opt/bonjour-chaton/certs/cert.pem
- file.managed:
- - name: /opt/bonjour-chaton/certs/cert.pem
- - user: chaton
- - group: chaton-dev
- - mode: 0644
diff --git a/roles/shellserver/bonjour-chaton/files/bonjour_chaton.sudoers b/roles/shellserver/bonjour-chaton/files/bonjour_chaton.sudoers
deleted file mode 100644
--- a/roles/shellserver/bonjour-chaton/files/bonjour_chaton.sudoers
+++ /dev/null
@@ -1,21 +0,0 @@
-# -------------------------------------------------------------
-# Bonjour chaton
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Created: 2017-01-24
-# License: Trivial work, not eligible to copyright
-# Source file: roles/shellserver/bonjour_chaton/files/bonjour_chaton.sudoers
-# -------------------------------------------------------------
-#
-# <auto-generated>
-# This file is managed by our rOPS SaltStack repository.
-#
-# Changes to this file may cause incorrect behavior
-# and will be lost if the state is redeployed.
-# </auto-generated>
-
-%chaton-dev ALL=(chaton) NOPASSWD: ALL
-
-# Service management
-{% for command in ["start", "stop", "restart", "reload"] %}
-%chaton-dev ALL= NOPASSWD: /bin/systemctl {{ command }} chaton
-{% endfor %}
diff --git a/roles/shellserver/bonjour-chaton/init.sls b/roles/shellserver/bonjour-chaton/init.sls
deleted file mode 100644
--- a/roles/shellserver/bonjour-chaton/init.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Deploy Bonjour chaton
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Created: 2017-04-27
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-include:
- - .account
- - .certificates
diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
deleted file mode 100644
--- a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# -------------------------------------------------------------
-# Eglide — nginx configuration
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
-# Created: 2016-07-26
-# License: Trivial work, not eligible to copyright
-# Source file: roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
-# -------------------------------------------------------------
-#
-# <auto-generated>
-# This file is managed by our rOPS SaltStack repository.
-#
-# Changes to this file may cause incorrect behavior
-# and will be lost if the state is redeployed.
-# </auto-generated>
-
-# -------------------------------------------------------------
-# Main vhost receives special responsibilities like serving
-# user directories.
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- server {
-
- listen 80;
- listen [::]:80;
- server_name robot.paysannerebelle.com;
- root /var/wwwroot/paysannerebelle.com/robot/;
-
- access_log /var/log/www/paysannerebelle.com/robot-access.log main;
- error_log /var/log/www/paysannerebelle.com/robot-error.log;
-
- ###
- ### SSL
- ###
-
- include includes/letsencrypt.conf;
-
- include ssl_params;
- ssl_certificate /etc/letsencrypt/live/robot.paysannerebelle.com/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/robot.paysannerebelle.com/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/robot.paysannerebelle.com/chain.pem;
- }
diff --git a/roles/shellserver/web-hosting/init.sls b/roles/shellserver/web-hosting/init.sls
--- a/roles/shellserver/web-hosting/init.sls
+++ b/roles/shellserver/web-hosting/init.sls
@@ -42,12 +42,6 @@
- group: {{ wwwgroup }}
- dir_mode: 750
-/var/log/www/paysannerebelle.com:
- file.directory:
- - user: hlp
- - group: {{ wwwgroup }}
- - dir_mode: 750
-
# -------------------------------------------------------------
# Site to serve when Host: header doesn't match a known vhost
#
diff --git a/roles/webserver-content/com/paysannerebelle/init.sls b/roles/webserver-content/com/paysannerebelle/init.sls
deleted file mode 100644
--- a/roles/webserver-content/com/paysannerebelle/init.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Provision *.paysannerebelle.com sites
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Collectif des paysannes et paysans rebelles
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-include:
- - .robot
diff --git a/roles/webserver-content/com/paysannerebelle/robot.sls b/roles/webserver-content/com/paysannerebelle/robot.sls
deleted file mode 100644
--- a/roles/webserver-content/com/paysannerebelle/robot.sls
+++ /dev/null
@@ -1,24 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Provision robot.paysannerebelle.com website
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Collectif des paysannes et paysans rebelles
-# Created: 2017-04-16
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% if salt['node.has_web_content'](".com/paysannerebelle") %}
-
-{% set wwwgroup = "www-data" %}
-
-# -------------------------------------------------------------
-# Site directory
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/var/wwwroot/paysannerebelle.com/robot:
- file.directory:
- - user: hlp
- - group: {{ wwwgroup }}
- - dir_mode: 711
- - makedirs: True
-
-{% endif %}
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -8,7 +8,6 @@
include:
- .be/dereckson
- - .com/paysannerebelle
- .org/eglide
- .org/nasqueron/api
- .org/nasqueron/docs
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 16, 01:51 (18 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2246269
Default Alt Text
D2400.diff (9 KB)
Attached To
Mode
D2400: Decommission robot.paysannerebelle.com
Attached
Detach File
Event Timeline
Log In to Comment